2392 files changed, 0 insertions, 249930 deletions

diff --git a/discovery/org.eclipse.rse.discovery/.classpath b/discovery/org.eclipse.rse.discovery/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.rse.discovery/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.rse.discovery/.cvsignore b/discovery/org.eclipse.rse.discovery/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.rse.discovery/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.rse.discovery/.project b/discovery/org.eclipse.rse.discovery/.project
deleted file mode 100644
index 26cf0633c..000000000
--- a/discovery/org.eclipse.rse.discovery/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.discovery</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.rse.discovery/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
deleted file mode 100644
index cfa4c846e..000000000
--- a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.internal.discovery.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.rse.ui,
- org.eclipse.rse.core,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.tm.discovery.wizard,
- org.eclipse.tm.discovery.model
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.rse.internal.discovery;x-internal:=true
diff --git a/discovery/org.eclipse.rse.discovery/about.html b/discovery/org.eclipse.rse.discovery/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.rse.discovery/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 2, 2006</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/discovery/org.eclipse.rse.discovery/build.properties b/discovery/org.eclipse.rse.discovery/build.properties
deleted file mode 100644
index 1b3591564..000000000
--- a/discovery/org.eclipse.rse.discovery/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .,\
-               plugin.xml
\ No newline at end of file
diff --git a/discovery/org.eclipse.rse.discovery/plugin.properties b/discovery/org.eclipse.rse.discovery/plugin.properties
deleted file mode 100644
index 56fcf0790..000000000
--- a/discovery/org.eclipse.rse.discovery/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery RSE Plug-in
-providerName = Eclipse.org
-
-NewConnectionWizard.discovery.name=Service Discovery Wizard
diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml
deleted file mode 100644
index 7bae16055..000000000
--- a/discovery/org.eclipse.rse.discovery/plugin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-
-    <extension
-          point="org.eclipse.rse.ui.newConnectionWizards">
-       <newConnectionWizard
-             canFinishEarly="false"
-             categoryId="org.eclipse.rse.ui.wizards.newconnection.default.category"
-             class="org.eclipse.rse.internal.discovery.ServiceDiscoveryWizard"
-             hasPages="true"
-             id="org.eclipse.rse.discovery.ServiceDiscoveryWizard"
-             name="%NewConnectionWizard.discovery.name"
-             systemTypeIds="org.eclipse.rse.systemtype.discovery">
-       </newConnectionWizard>
-    </extension>
-  
-   <extension
-         point="org.eclipse.rse.core.systemTypes">
-	   <systemType id="org.eclipse.rse.systemtype.discovery"
-            name="Discovery"
-			description="Discovery"
-			iconLive=""/>
-	</extension>
-    
-    <!-- extension
-         point="org.eclipse.rse.ui.subsystemConfigurations">
-      <configuration
-            systemTypeIds="org.eclipse.rse.systemtype.discovery"
-            name="Discovery"
-            description="Service Discovery Wizard"
-            iconlive=""
-            icon=""
-            class="org.eclipse.rse.discovery.ServiceDiscoverySubSystemConfiguration"
-            vendor="%providerName"
-            priority="100"
-            id="Discovery">
-      </configuration>
-      </extension -->
-    
-</plugin>
-
-
-
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java
deleted file mode 100644
index b923cef08..000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.rse.discovery"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
deleted file mode 100644
index 503381a25..000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.rse.internal.discovery.messages"; //$NON-NLS-1$
-
-	public static String ServiceDiscoveryWizard_DiscoveryPropertySet;
-
-	public static String ServiceDiscoveryWizard_Port;
-
-	public static String ServiceDiscoveryWizard_SavingMessage;
-
-	public static String ServiceDiscoveryWizard_StatusId;
-
-	public static String ServiceDiscoveryWizard_StatusMessage;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java
deleted file mode 100644
index ae86d1af0..000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoverySubSystemConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-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.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-
-/**
- * Configuration for an empty Discovery SubSystemConfiguration
- * to allow listing discovery in the RSE Wizard
- * 
- */
-public class ServiceDiscoverySubSystemConfiguration extends SubSystemConfiguration {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createDefaultFilterPool(org.eclipse.rse.core.filters.ISystemFilterPoolManager)
-	 */
-	protected ISystemFilterPool createDefaultFilterPool(
-			ISystemFilterPoolManager mgr) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.core.model.IHost)
-	 */
-	public ISubSystem createSubSystemInternal(IHost conn) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
-	 */
-	public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		return null;
-	}
-
-}
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
deleted file mode 100644
index 4b6fea233..000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.rse.internal.discovery;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IPropertySet;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemRefreshAllAction;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardDisplayPage;
-import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
-
-/**
- * Service Discovery Wizard
- */
-
-public class ServiceDiscoveryWizard extends Wizard {
-	private ServiceDiscoveryWizardMainPage serviceDiscoveryMainPage;
-
-	private ServiceDiscoveryWizardDisplayPage serviceDiscoveryPage = null;
-
-	/**
-	 * Service Discovery Wizard constructor
-	 */
-	public ServiceDiscoveryWizard() {
-		super();
-		setNeedsProgressMonitor(false);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-
-		serviceDiscoveryMainPage = new ServiceDiscoveryWizardMainPage();
-		addPage(serviceDiscoveryMainPage);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-	 */
-	public IWizardPage getNextPage(IWizardPage page) {
-
-		if (page instanceof ServiceDiscoveryWizardMainPage) {
-			if (serviceDiscoveryPage == null) {
-				serviceDiscoveryPage = new ServiceDiscoveryWizardDisplayPage(serviceDiscoveryMainPage.getQuery(), serviceDiscoveryMainPage.getAddress(), serviceDiscoveryMainPage.getTransport(), serviceDiscoveryMainPage.getProtocol(), serviceDiscoveryMainPage.getTimeOut());
-				addPage(serviceDiscoveryPage);
-			} else {
-				serviceDiscoveryPage.update(serviceDiscoveryMainPage.getQuery(), serviceDiscoveryMainPage.getAddress(), serviceDiscoveryMainPage.getTransport(), serviceDiscoveryMainPage.getProtocol(), serviceDiscoveryMainPage.getTimeOut());
-			}
-		}
-		return super.getNextPage(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-
-		SystemRefreshAllAction systemRefreshAllAction = new SystemRefreshAllAction(null);
-		
-		String[] addresses = serviceDiscoveryPage.getAddresses();
-		for (int i = 0; i < addresses.length; i++) {
-
-			String hostName = addresses[i];
-			Vector discoveredServices = serviceDiscoveryPage.getSelectedServices(addresses[i]);
-
-			Enumeration serviceEnumeration = discoveredServices.elements();
-
-			while (serviceEnumeration.hasMoreElements()) {
-				IHost conn = null;
-
-				Service service = (Service) serviceEnumeration.nextElement();
-				String sysTypeString = ((ServiceType) service.eContainer()).getName();
-
-				try {
-					conn = RSEUIPlugin.getDefault().getSystemRegistry().createHost(sysTypeString, service.getName() + "@" + hostName, hostName, "Discovered "+sysTypeString+" server in "+hostName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				
-					if (conn != null) {
-						//copy discovered properties to RSE models
-						
-						Iterator pairIterator = service.getPair().iterator();
-						IConnectorService[] services = conn.getConnectorServices();
-						IPropertySet ps;
-						
-						while (pairIterator.hasNext()) {
-							
-							Pair pair = (Pair) pairIterator.next();
-							
-							for(int j=0; j<services.length; j++)
-							{
-									if((ps = services[j].getPropertySet(sysTypeString))==null)
-									{
-										ps = services[j].createPropertySet(sysTypeString);
-									}
-									ps.addProperty(pair.getKey(), pair.getValue());
-									
-									if (pair.getKey().equalsIgnoreCase(Messages.ServiceDiscoveryWizard_Port)) {
-										int port = Integer.parseInt(pair.getValue());
-										services[j].setPort(port);
-									}
-							}
-						}
-						
-						RSEUIPlugin.getDefault().getSystemRegistry().expandHost(conn);
-					}
-				} catch (Exception e) {
-						RSEUIPlugin.getDefault().getSystemRegistry().deleteHost(conn);
-				} finally {
-					systemRefreshAllAction.run();
-				}
-			}
-		}
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
deleted file mode 100644
index 12852ba84..000000000
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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
-##################################################################################
-
-ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery
-ServiceDiscoveryWizard_Port=port
-ServiceDiscoveryWizard_SavingMessage=Saving RSE model
-ServiceDiscoveryWizard_StatusId=org.eclipse.tm.internal.discovery.wizard
-ServiceDiscoveryWizard_StatusMessage=RSE model saved
diff --git a/discovery/org.eclipse.tm.discovery-feature/.project b/discovery/org.eclipse.tm.discovery-feature/.project
deleted file mode 100644
index da807b818..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery-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/discovery/org.eclipse.tm.discovery-feature/build.properties b/discovery/org.eclipse.tm.discovery-feature/build.properties
deleted file mode 100644
index b76171109..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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
-generate.plugin@org.eclipse.tm.discovery.source=org.eclipse.tm.discovery
diff --git a/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg b/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery-feature/epl-v10.html b/discovery/org.eclipse.tm.discovery-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.properties b/discovery/org.eclipse.tm.discovery-feature/feature.properties
deleted file mode 100644
index de3419d56..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/feature.properties
+++ /dev/null
@@ -1,145 +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: 
-# Martin Oberhuber - 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=TM Service Discovery End-User and Extender SDK
-
-# "description" property - description of the feature
-description=A framework and Zeroconf / DNS-SD based implementation for \
-detecting remote network services. Includes Source.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2007 Symbian Software Ltd. and others. All rights reserved.\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\
-\n\
-Contributors:\n\
-Javier Montalvo Orús (Symbian) - initial API and implementation\n\
-Martin Oberhuber (Wind River) - externalized strings, fixed build.properties, feature.xml\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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
deleted file mode 100644
index d187c90a3..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tm.discovery"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.tm.discovery.engine"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.emf" version="2.2.0" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common.ui" version="2.2.0" match="compatible"/>
-      -->
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.ide"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.discovery"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.engine"
-         download-size="9"
-         install-size="16"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.model"
-         download-size="17"
-         install-size="55"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.model.edit"
-         download-size="7"
-         install-size="21"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.protocol.dnssd"
-         download-size="6"
-         install-size="13"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.transport.udp"
-         download-size="3"
-         install-size="6"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.view"
-         download-size="6"
-         install-size="17"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.wizard"
-         download-size="8"
-         install-size="25"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tm.discovery.source"
-         download-size="73"
-         install-size="212"
-         version="0.0.0"/>
-
-</feature>
diff --git a/discovery/org.eclipse.tm.discovery-feature/license.html b/discovery/org.eclipse.tm.discovery-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/license.html
+++ /dev/null
@@ -1,79 +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/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/discovery/org.eclipse.tm.discovery-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 2, 2006</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/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/discovery/org.eclipse.tm.discovery-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=eclipse32.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/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/discovery/org.eclipse.tm.discovery-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/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index f1daa65e1..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-# 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=TM Service Discovery Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Symbian Software Ltd. and others 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 89c807a28..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/eclipse32.png b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e79b9e891..000000000
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-pluginName=TM Service Discovery Source
-providerName=Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.engine/.classpath b/discovery/org.eclipse.tm.discovery.engine/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.engine/.cvsignore b/discovery/org.eclipse.tm.discovery.engine/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.engine/.options b/discovery/org.eclipse.tm.discovery.engine/.options
deleted file mode 100644
index 8b1378917..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.options
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/discovery/org.eclipse.tm.discovery.engine/.project b/discovery/org.eclipse.tm.discovery.engine/.project
deleted file mode 100644
index 45895d5a6..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.engine</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.ui.prefs b/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 56c39c946..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Jul 27 13:27:17 BST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
deleted file mode 100644
index 70d76ca4d..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.engine;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.engine.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.tm.discovery.model
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.discovery.protocol,
- org.eclipse.tm.discovery.transport,
- org.eclipse.tm.internal.discovery.engine;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.engine/about.html b/discovery/org.eclipse.tm.discovery.engine/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/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 2, 2006</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/discovery/org.eclipse.tm.discovery.engine/about.ini b/discovery/org.eclipse.tm.discovery.engine/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/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=eclipse32.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/discovery/org.eclipse.tm.discovery.engine/about.mappings b/discovery/org.eclipse.tm.discovery.engine/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/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/discovery/org.eclipse.tm.discovery.engine/about.properties b/discovery/org.eclipse.tm.discovery.engine/about.properties
deleted file mode 100644
index 2848a3e9c..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-# 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=TM Service Discovery\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Symbian Software Ltd. and others 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/discovery/org.eclipse.tm.discovery.engine/build.properties b/discovery/org.eclipse.tm.discovery.engine/build.properties
deleted file mode 100644
index 64f9ab21e..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               .,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png
-src.includes = schema/
diff --git a/discovery/org.eclipse.tm.discovery.engine/eclipse32.png b/discovery/org.eclipse.tm.discovery.engine/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/eclipse32.png
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.properties b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
deleted file mode 100644
index cd7637942..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery Engine
-providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.xml b/discovery/org.eclipse.tm.discovery.engine/plugin.xml
deleted file mode 100644
index b5f161deb..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-	<extension-point id="discoveryTransport" name="discoveryTransport" schema="schema/discoveryTransport.exsd"/>
-	<extension-point id="discoveryProtocol" name="discoveryProtocol" schema="schema/discoveryProtocol.exsd"/>
-</plugin>
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd b/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd
deleted file mode 100644
index 476c62d77..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.discovery.engine">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.tm.discovery.engine" id="discoveryProtocol" name="Service Discovery protocol"/>
-      </appInfo>
-      <documentation>
-         Extension point providing implementations of protocols for service discovery.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="protocol" 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="protocol">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tm.discovery.protocol.IServiceDiscoveryProtocol"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd b/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd
deleted file mode 100644
index d1d499994..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/schema/discoveryTransport.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tm.discovery.engine">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.tm.discovery.engine" id="discoveryTransport" name="Service Discovery Transport"/>
-      </appInfo>
-      <documentation>
-         Extension point providing implementations of transports for service discovery.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="transport" 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="transport">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tm.discovery.transport.ITransport"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java
deleted file mode 100644
index 22956cb1f..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.protocol;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.tm.discovery.transport.ITransport;
-
-/**
- * Interface for service discovery protocol implementations.</br>
- * Standard protocols that can be implementated from this interface are:
- * <ul>
- * <li>DNS-SD (Zeroconf)
- * <li>Simple Service Discovery Protocol (SSDP)
- * <li>Service Location Protocol (SPL)
- * </ul>
- * As well as propietary/customised protocols
- *
- */
-public interface IProtocol {
-
-	
-	/**
-	 * Instantiates a Job to populate a model given an initial query, a resource containing the model to be populated and an ITranport implementation.
-	 * 
-	 * @param query 
-	 * Initial query to be sent to the target. This initial query can be obtained from the getQueries() method.
-	 * 
-	 * @param resource
-	 * Resource containing the model to be populated with the results of the service discovery action.
-	 * 
-	 * @param transport
-	 * ITransport implementation of the transport to be used for the discovery action. 
-	 * 
-	 * @return
-	 * Job containing the service discovery action.
-	 * 
-	 * @see Job
-	 * @see Resource
-	 * @see ITransport
-	 * 
-	 */
-	public abstract Job getDiscoveryJob(String query, Resource resource, ITransport transport);
-	
-	
-	/**
-	 * Gets the list of recommended queries to start the service discovery process. This queries can be used in getDiscoveryJob().
-	 * 
-	 * @return
-	 * An array containing the recommended queries.
-	 */
-	public abstract String[] getQueries();
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java
deleted file mode 100644
index 10f93fd2d..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.protocol;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Static factory to handle the protocol implementations.</br> 
- */
-
-public class ProtocolFactory {
-
-	
-	/*
-	 * Extension point containing the protocol implementations available in the workbench  
-	 */
-	private static IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.discovery.engine","discoveryProtocol"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	
-	/**
-	 * Returns the available protocol names. This protocol names are registered in the field <b>name</b> of the extension point <b>discoveryProtocol</b> 
-	 * 
-	 * @return
-	 * Array of available protocol names 
-	 */
-	public static String[] getProtocolList()
-	{
-		Vector protocols = new Vector();
-		
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String name = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(name!=null)
-				protocols.add(name);
-		}
-		
-		String[] protocolsList = new String[protocols.size()];
-		protocols.copyInto(protocolsList);
-		return protocolsList;
-	}
-	
-	/**
-	 * Returns the recommended queries for the specified protocol 
-	 * 
-	 * @param protocolName
-	 * Name of the protocol 
-	 * @return
-	 * Array of recommended queries to be send using this protocol.
-	 * @throws CoreException
-	 */
-	public static String[] getQueryList(String protocolName) throws CoreException
-	{
-		IProtocol protocol = null;
-		String[] queries = null;
-		
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String name = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(name!=null)
-				if(name.equalsIgnoreCase(protocolName))
-				{
-					protocol = (IProtocol)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
-				}
-		}
-		
-		if(protocol != null)
-		{	
-			queries = protocol.getQueries();
-			if(queries==null)
-				queries = new String[]{};
-		}
-		return queries;
-		
-	}
-	
-	/**
-	 * Gets the IProtocol implementation of a protocol given its name
-	 * 
-	 * @param protocolName
-	 * Name of the protocolo 
-	 * @return
-	 * IProtocol implementation of the protocol matching the given name. Null if the protocol cannot be found.
-	 * @throws CoreException
-	 * 
-	 * @see IProtocol
-	 */
-	public static IProtocol getProtocol(String protocolName) throws CoreException {
-		
-		IProtocol protocol = null;
-		
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String name = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(name!=null)
-				if(name.equalsIgnoreCase(protocolName))
-				{
-					protocol = (IProtocol)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
-				}
-		}
-		return protocol;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java
deleted file mode 100644
index 7f1c48662..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/ITransport.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- * Martin Oberhuber (Wind River) - fix javadoc errors
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.transport;
-
-import java.io.IOException;
-
-
-/**
- * Interface for service discovery transports
- * 
- */
-public interface ITransport {
-
-	/**
-	 * Handles sending data
-	 * 
-	 * @param packet Data packet to be sent.
-	 * @throws IOException
-	 */
-	public abstract void send(byte[] packet) throws IOException;
-
-	/**
-	 * Handles receiving data
-	 * 
-	 * @param packet
-	 * Packet to be filled with the reply data.
-	 * @return 
-	 * Address of the replying device.
-	 * @throws IOException
-	 */
-	public abstract String receive(byte[] packet) throws IOException;
-	
-	
-	/**
-	 * Sets the address of the target, depending on the implementation (IP, port...)
-	 * @param address
-	 * Address or identifier of the target.
-	 * @throws Exception
-	 * 
-	 */
-	public abstract void setTargetAddress(String address) throws Exception;
-	
-	/**
-	 * Sets the timeout for the transport implementation.
-	 * @param timeOut
-	 * The timeout in milliseconds
-	 * @throws Exception
-	 */
-	public abstract void setTimeOut(int timeOut) throws Exception;
-
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java
deleted file mode 100644
index 87cab8fc0..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/transport/TransportFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.transport;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Factory for the remoste system connection.
- */
-
-public class TransportFactory {
-
-	/*
-	 * Extension point containing the transport implementations available in the workbench  
-	 */
-	private static IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.tm.discovery.engine","discoveryTransport"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	
-	/**
-	 * Returns the available transport names. The transport names are registered in the field <b>name</b> of the extension point <b>discoveryTransport</b> 
-	 * 
-	 * @return
-	 * Array of available transport names 
-	 */
-	public static String[] getTransportList()
-	{
-		Vector transports = new Vector();
-		
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String name = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(name!=null)
-				transports.add(name);
-		}
-		
-		String[] transportsList = new String[transports.size()];
-		transports.copyInto(transportsList);
-		return transportsList;
-	}
-	
-	/**
-	 * Gets the ITransport implementation of a transport given its name
-	 * 
-	 * @param transportName
-	 * Name of the transport 
-	 * @param address
-	 * Address of the target device
-	 * @param timeOut
-	 * Timeout in milliseconds
-	 * @return
-	 * ITranport implementation of the transport matching the given name. Null if the transport cannot be found.
-	 * @throws Exception
-	 */
-	public static ITransport getTransport(String transportName, String address, int timeOut) throws Exception {
-		
-		ITransport transport = null;
-		
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String name = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(name!=null)
-				if(name.equalsIgnoreCase(transportName))
-				{
-					transport = (ITransport)ce[i].createExecutableExtension("class"); //$NON-NLS-1$
-					transport.setTargetAddress(address);
-					transport.setTimeOut(timeOut);
-					
-				}
-		}
-		return transport;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java
deleted file mode 100644
index 1338457fd..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.engine;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.rse.discovery.engine"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java
deleted file mode 100644
index 3e2867763..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.engine;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.engine.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java
deleted file mode 100644
index 5cab69811..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/ServiceDiscoveryEngine.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.engine;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.protocol.IProtocol;
-import org.eclipse.tm.discovery.transport.ITransport;
-import org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl;
-
-/**
- * Engine for service discovery. 
- * Instantiates the model that contains the discovered services information.
- * Provides methods to launch a discovery job given an implementation of ITransport and IProtocol to populate the model.
- * 
- * @see ITransport
- * @see IProtocol
- * 
- */
-
-public class ServiceDiscoveryEngine {
-
-	private static ServiceDiscoveryEngine SERVICE_DISCOVERY_ENGINE = null;
-	
-	private final URI SERVICE_DISCOVERY_URI = URI.createFileURI(Messages.getString("ServiceDiscoveryEngine.DiscoveryModelFileURI")); //$NON-NLS-1$
-
-	private Resource resource;
-
-	/**
-	 * Gets an instance of the service discovery engine
-	 */
-	public static ServiceDiscoveryEngine getServiceDiscoveryEngine() {
-		if (SERVICE_DISCOVERY_ENGINE == null)
-			SERVICE_DISCOVERY_ENGINE = new ServiceDiscoveryEngine();
-
-		return SERVICE_DISCOVERY_ENGINE;
-	}
-	
-	/*
-	 * Private constructor of the ServiceDiscoveryEngine
-	 */
-	private ServiceDiscoveryEngine() {
-	
-		// get model
-		ResourceSet resourceSet = new ResourceSetImpl();
-
-		// Register the appropriate resource factory to handle all file
-		// extentions.
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new ModelResourceFactoryImpl());
-
-		// Register the package to ensure it is available during loading.
-		resourceSet.getPackageRegistry().put(ModelPackage.eNS_URI,ModelPackage.eINSTANCE);
-
-		try {
-			resource = resourceSet.getResource(SERVICE_DISCOVERY_URI, true);
-		} catch (WrappedException e) {
-			resource = resourceSet.createResource(SERVICE_DISCOVERY_URI);
-		}
-	}
-
-	/**
-	 * Gets the resource
-	 * 
-	 * @return the static reference to the resource model
-	 */
-	
-	public Resource getResource() {
-		return resource;
-	}
-	
-	/**
-	 * Starts a service discovery job given an implementation of IProtocol and ITransport
-	 * 
-	 * @param transport
-	 * 			the selected transport
-	 * @see ITransport
-	 * @see IProtocol
-	 */
-	
-	public void doServiceDiscovery(String query, IProtocol protocol, ITransport transport)
-	{
-		protocol.getDiscoveryJob(query, resource,transport).schedule();
-	}
-	
-
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties
deleted file mode 100644
index 454c8ffb0..000000000
--- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/internal/discovery/engine/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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
-##################################################################################
-
-ServiceDiscoveryEngine.DiscoveryModelFileURI=discoveryModel.xml
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.classpath b/discovery/org.eclipse.tm.discovery.model.edit/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore b/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.project b/discovery/org.eclipse.tm.discovery.model.edit/.project
deleted file mode 100644
index f165aed12..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.model.edit</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index aed5988ba..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.model.edit;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.tm.internal.discovery.model.provider.DiscoveryModelEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.tm.discovery.model
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/about.html b/discovery/org.eclipse.tm.discovery.model.edit/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/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 2, 2006</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/discovery/org.eclipse.tm.discovery.model.edit/build.properties b/discovery/org.eclipse.tm.discovery.model.edit/build.properties
deleted file mode 100644
index eb22b2add..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif
deleted file mode 100644
index 94c953e01..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif
deleted file mode 100644
index a871b0d7a..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif
deleted file mode 100644
index ec3bb95a6..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif
deleted file mode 100644
index e07b81aa6..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif b/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif
deleted file mode 100644
index 5ae555a34..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
deleted file mode 100644
index f6c95b273..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = TM Service Discovery Edit Support
-providerName = Eclipse.org
-
-
-
-
-
-
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml b/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml
deleted file mode 100644
index 0c1041049..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
--->
-
-<plugin>
-    
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/tm/discovery" 
-       class = "org.eclipse.tm.discovery.provider.ModelItemProviderAdapterFactory" 
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-
-</plugin>
-
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java
deleted file mode 100644
index 7a17210b9..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DeviceItemProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Device;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Device} object.
- * 
- * @generated
- */
-public class DeviceItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * @param adapterFactory 
-	 * 
-	 * @generated
-	 */
-	public DeviceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAddressPropertyDescriptor(object);
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Address feature.
-	 * 
-	 * @generated
-	 */
-	protected void addAddressPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Device_address_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Device_address_feature", "_UI_Device_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.DEVICE__ADDRESS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Device_name_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Device_name_feature", "_UI_Device_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.DEVICE__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ModelPackage.Literals.DEVICE__SERVICE_TYPE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Device.gif.
-	 * 
-	 * @generated NOT
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/device"); //$NON-NLS-1$
-		//return null;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * 
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		String name = ((Device)object).getName();
-		String address = ((Device)object).getAddress();
-		
-		StringBuffer result = new StringBuffer(); 
-		
-		if(address != null)
-			result.append(address);
-		
-		if(name != null)
-			result.append(" ("+name+")"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		return result.toString();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Device.class)) {
-			case ModelPackage.DEVICE__ADDRESS:
-			case ModelPackage.DEVICE__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ModelPackage.Literals.DEVICE__SERVICE_TYPE,
-				 ModelFactory.eINSTANCE.createServiceType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return DiscoveryModelEditPlugin.INSTANCE;
-	}
-
-	/**
-	 * @generated not
-	 * 
-	 */
-	
-	public Collection getChildren(Object object) {
-		Collection collect = super.getChildren(object);
-		
-		return collect;
-	
-    }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java
deleted file mode 100644
index f97831199..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/DiscoveryModelEditPlugin.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the DiscoveryModel edit plugin.
- * 
- * @generated
- */
-public final class DiscoveryModelEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * 
-	 * @generated
-	 */
-	public static final DiscoveryModelEditPlugin INSTANCE = new DiscoveryModelEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * 
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * 
-	 * @generated
-	 */
-	public DiscoveryModelEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		   });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * 
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * 
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java
deleted file mode 100644
index f8a963b6c..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ModelItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.tm.internal.discovery.model.util.ModelAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * 
- * @generated
- */
-public class ModelItemProviderAdapterFactory extends ModelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * 
-	 * @generated
-	 */
-	protected Collection supportedTypes = new ArrayList();
-
-	/**
-	 * This constructs an instance.
-	 * 
-	 * @generated not
-	 */
-	public ModelItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);	
-		supportedTypes.add(ITableItemLabelProvider.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Device} instances.
-	 * 
-	 * @generated
-	 */
-	protected DeviceItemProvider deviceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Device}.
-	 * 
-	 * @generated
-	 */
-	public Adapter createDeviceAdapter() {
-		if (deviceItemProvider == null) {
-			deviceItemProvider = new DeviceItemProvider(this);
-		}
-
-		return deviceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Network} instances.
-	 * 
-	 * @generated
-	 */
-	protected NetworkItemProvider networkItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Network}.
-	 * 
-	 * @generated
-	 */
-	public Adapter createNetworkAdapter() {
-		if (networkItemProvider == null) {
-			networkItemProvider = new NetworkItemProvider(this);
-		}
-
-		return networkItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Pair} instances.
-	 * 
-	 * @generated
-	 */
-	protected PairItemProvider pairItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Pair}.
-	 * 
-	 * @generated
-	 */
-	public Adapter createPairAdapter() {
-		if (pairItemProvider == null) {
-			pairItemProvider = new PairItemProvider(this);
-		}
-
-		return pairItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.Service} instances.
-	 *
-	 * @generated
-	 */
-	protected ServiceItemProvider serviceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.tm.discovery.model.Service}.
-	 *
-	 * @generated
-	 */
-	public Adapter createServiceAdapter() {
-		if (serviceItemProvider == null) {
-			serviceItemProvider = new ServiceItemProvider(this);
-		}
-
-		return serviceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.tm.discovery.model.ServiceType} instances.
-	 * 
-	 * @generated
-	 */
-	protected ServiceTypeItemProvider serviceTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.tm.discovery.model.ServiceType}.
-	 * 
-	 * @generated
-	 */
-	public Adapter createServiceTypeAdapter() {
-		if (serviceTypeItemProvider == null) {
-			serviceTypeItemProvider = new ServiceTypeItemProvider(this);
-		}
-
-		return serviceTypeItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * 
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * 
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * 
-	 * @generated
-	 */
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * 
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 *
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * 
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * 
-	 * @generated
-	 */
-	public void dispose() {
-		if (deviceItemProvider != null) deviceItemProvider.dispose();
-		if (networkItemProvider != null) networkItemProvider.dispose();
-		if (pairItemProvider != null) pairItemProvider.dispose();
-		if (serviceItemProvider != null) serviceItemProvider.dispose();
-		if (serviceTypeItemProvider != null) serviceTypeItemProvider.dispose();
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java
deleted file mode 100644
index 99c137468..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/NetworkItemProvider.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Network;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Network} object.
- * 
- * @generated
- */
-public class NetworkItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * @param adapterFactory 
-	 * 
-	 * @generated
-	 */
-	public NetworkItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ModelPackage.Literals.NETWORK__DEVICE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Network.gif.
-	 * 
-	 * @generated NOT
-	 */
-	public Object getImage(Object object) {
-		return getResourceLocator().getImage("full/obj16/network"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 *
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		return "Network"; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Network.class)) {
-			case ModelPackage.NETWORK__DEVICE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ModelPackage.Literals.NETWORK__DEVICE,
-				 ModelFactory.eINSTANCE.createDevice()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 *
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return DiscoveryModelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java
deleted file mode 100644
index 07083c5c0..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/PairItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Pair;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Pair} object.
- * 
- * @generated not
- */
-public class PairItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider, 
-		IStructuredItemContentProvider, 
-		ITreeItemContentProvider, 
-		IItemLabelProvider, 
-		IItemPropertySource, 
-		ITableItemLabelProvider
-		{
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * @param adapterFactory 
-	 * 
-	 * @generated
-	 */
-	public PairItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * 
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Pair_key_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Pair_key_feature", "_UI_Pair_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.PAIR__KEY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * 
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Pair_value_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Pair_value_feature", "_UI_Pair_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.PAIR__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Pair.gif.
-	 * 
-	 * @generated NOT
-	 */
-	public Object getImage(Object object) {
-		return null;
-	}
-	
-	/**
-	 * This returns the label text for the adapted class.
-	 * 
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		return null;
-	}
-	
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Pair.class)) {
-			case ModelPackage.PAIR__KEY:
-			case ModelPackage.PAIR__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return DiscoveryModelEditPlugin.INSTANCE;
-	}
-
-	/**
-	 *  @generated NOT
-	 */
-	
-	public Object getColumnImage(Object object, int columnIndex) {
-		return null;
-	}
-	
-	/**
-	 *  @generated NOT
-	 */
-	
-	
-	public String getColumnText(Object object, int columnIndex) {
-		
-		String returnString = null;
-		
-		if(columnIndex == 0)
-		{
-			returnString = ((Pair)object).getKey();
-		}
-		else if(columnIndex == 1)
-		{
-			returnString = ((Pair)object).getValue();
-		}
-		return returnString;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java
deleted file mode 100644
index 29fec2bfd..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Service;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.Service} object.
- * 
- * @generated
- */
-public class ServiceItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource{
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * @param adapterFactory 
-	 * 
-	 * @generated
-	 */
-	public ServiceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Service_name_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Service_name_feature", "_UI_Service_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.SERVICE__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ModelPackage.Literals.SERVICE__PAIR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Service.gif.
-	 *
-	 * @generated not
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/service")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * 
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		
-		return ((Service)object).getName();
-				
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Service.class)) {
-			case ModelPackage.SERVICE__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ModelPackage.SERVICE__PAIR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ModelPackage.Literals.SERVICE__PAIR,
-				 ModelFactory.eINSTANCE.createPair()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return DiscoveryModelEditPlugin.INSTANCE;
-	}
-
-	/* NO CHILDREN IN TREE */
-	public boolean hasChildren(Object object) {
-		return false;
-    }
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java
deleted file mode 100644
index 5002338ac..000000000
--- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/internal/discovery/model/provider/ServiceTypeItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.tm.discovery.model.ServiceType} object.
- *
- * @generated
- */
-public class ServiceTypeItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource
-		{
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * @param adapterFactory 
-	 * 
-	 * @generated
-	 */
-	public ServiceTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * 
-	 * @generated
-	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ServiceType_name_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceType_name_feature", "_UI_ServiceType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 ModelPackage.Literals.SERVICE_TYPE__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ModelPackage.Literals.SERVICE_TYPE__SERVICE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns ServiceType.gif.
-	 * 
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/serviceType")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * 
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		String label = ((ServiceType)object).getName();
-		return label == null || label.length() == 0 ? "": label; //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ServiceType.class)) {
-			case ModelPackage.SERVICE_TYPE__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ModelPackage.Literals.SERVICE_TYPE__SERVICE,
-				 ModelFactory.eINSTANCE.createService()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * 
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return DiscoveryModelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model/.classpath b/discovery/org.eclipse.tm.discovery.model/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.model/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.model/.cvsignore b/discovery/org.eclipse.tm.discovery.model/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.model/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.model/.project b/discovery/org.eclipse.tm.discovery.model/.project
deleted file mode 100644
index e86668568..000000000
--- a/discovery/org.eclipse.tm.discovery.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.model</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b7bca3063..000000000
--- a/discovery/org.eclipse.tm.discovery.model/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Wed Feb 21 21:44:06 CET 2007
-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=ignore
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
deleted file mode 100644
index d3966466a..000000000
--- a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.model;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.discovery.model.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.discovery.model,
- org.eclipse.tm.internal.discovery.model.impl;x-internal:=true,
- org.eclipse.tm.internal.discovery.model.util;x-friends:="org.eclipse.tm.discovery.engine,org.eclipse.tm.discovery.model.edit"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.model/about.html b/discovery/org.eclipse.tm.discovery.model/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.model/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 2, 2006</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/discovery/org.eclipse.tm.discovery.model/build.properties b/discovery/org.eclipse.tm.discovery.model/build.properties
deleted file mode 100644
index eea357b24..000000000
--- a/discovery/org.eclipse.tm.discovery.model/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               src/,\
-               .,\
-               plugin.xml
-src.includes = ecore/
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel b/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel
deleted file mode 100644
index f163d6375..000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tm.discovery.model/src"
-    modelPluginID="org.eclipse.tm.discovery.model" modelName="DiscoveryModel" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>discoveryModel.xsd</foreignModel>
-  <genPackages prefix="Model" basePackage="org.eclipse.tm.discovery" resource="XML"
-      disposableProviderFactory="true" ecorePackage="model.ecore#/">
-    <genClasses ecoreClass="model.ecore#//Device">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//Device/serviceType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Device/address"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Device/name"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//Network">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//Network/device"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//Pair">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Pair/key"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Pair/value"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//Service">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//Service/pair"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Service/name"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//ServiceType">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//ServiceType/service"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//ServiceType/name"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd b/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd
deleted file mode 100644
index 0ef4b84fb..000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/discoveryModel.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 
- Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
- This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
- -->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/tm/discovery/model"
-	xmlns:discovery="http://www.eclipse.org/tm/discovery/model">
-
-	<xs:complexType name="Network">
-		<xs:sequence>
-			<xs:element name="Device" type="discovery:Device" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="Device">
-		<xs:sequence>
-			<xs:element name="ServiceType" type="discovery:ServiceType" minOccurs="1" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="address" type="xs:string" />
-		<xs:attribute name="name" type="xs:string" />
-	</xs:complexType>
-
-	<xs:complexType name="ServiceType">
-		<xs:sequence>
-			<xs:element name="Service" type="discovery:Service" minOccurs="1" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" />
-	</xs:complexType>
-
-	<xs:complexType name="Service">
-		<xs:sequence minOccurs="1" maxOccurs="1">
-			<xs:element name="Pair" type="discovery:Pair" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" />
-	</xs:complexType>
-
-	<xs:complexType name="Pair">
-		<xs:attribute name="key" type="xs:string" />
-		<xs:attribute name="value" type="xs:string" />
-	</xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore b/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore
deleted file mode 100644
index 0c7608fc8..000000000
--- a/discovery/org.eclipse.tm.discovery.model/ecore/model.ecore
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http://www.eclipse.org/tm/discovery/model" nsPrefix="model">
-  <eClassifiers xsi:type="ecore:EClass" name="Device">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Device"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serviceType" lowerBound="1"
-        upperBound="-1" eType="#//ServiceType" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="ServiceType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" unique="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="address"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Network">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Network"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="device" lowerBound="1"
-        upperBound="-1" eType="#//Device" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Device"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Pair">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Pair"/>
-      <details key="kind" value="empty"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="key"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="value"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Service">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="Service"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pair" upperBound="-1" eType="#//Pair"
-        containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Pair"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ServiceType">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ServiceType"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="service" lowerBound="1"
-        upperBound="-1" eType="#//Service" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="Service"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="name"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.properties b/discovery/org.eclipse.tm.discovery.model/plugin.properties
deleted file mode 100644
index f7f3b3115..000000000
--- a/discovery/org.eclipse.tm.discovery.model/plugin.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = TM Service Discovery Model
-providerName = Eclipse.org
-
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.xml b/discovery/org.eclipse.tm.discovery.model/plugin.xml
deleted file mode 100644
index 7ca408544..000000000
--- a/discovery/org.eclipse.tm.discovery.model/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/tm/discovery" 
-       class = "org.eclipse.tm.discovery.model.ModelPackage" />
-  </extension>
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser 
-       type="discovery" 
-       class="org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl" />
-  </extension>
-
-</plugin>
-
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java
deleted file mode 100644
index c8ad9accd..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.discovery"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java
deleted file mode 100644
index 691f67f9b..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Device.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 
- * A representation of the model object '<em><b>Device</b></em>'.
- * 
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tm.discovery.model.Device#getServiceType <em>Service Type</em>}</li>
- *   <li>{@link org.eclipse.tm.discovery.model.Device#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.tm.discovery.model.Device#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice()
- * @model extendedMetaData="name='Device' kind='elementOnly'"
- * @generated
- */
-public interface Device extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Service Type</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tm.discovery.model.ServiceType}.
-	 * 
-	 * @return the value of the '<em>Service Type</em>' containment reference list.
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_ServiceType()
-	 * @model type="org.eclipse.tm.discovery.model.ServiceType" containment="true" required="true"
-	 *        extendedMetaData="kind='element' name='ServiceType'"
-	 * @generated
-	 */
-	EList getServiceType();
-
-	/**
-	 * Returns the value of the '<em><b>Address</b></em>' attribute.
-	 *
-	 * @return the value of the '<em>Address</em>' attribute.
-	 * @see #setAddress(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_Address()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='address'"
-	 * @generated
-	 */
-	String getAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.Device#getAddress <em>Address</em>}' attribute.
-	 * 
-	 * @param value the new value of the '<em>Address</em>' attribute.
-	 * @see #getAddress()
-	 * @generated
-	 */
-	void setAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getDevice_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='name'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.Device#getName <em>Name</em>}' attribute.
-	 * 
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // Device
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java
deleted file mode 100644
index 820c190e8..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * 
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public interface ModelFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * 
-	 * @generated
-	 */
-	ModelFactory eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Device</em>'.
-	 * 
-	 * @return a new object of class '<em>Device</em>'.
-	 * @generated
-	 */
-	Device createDevice();
-
-	/**
-	 * Returns a new object of class '<em>Network</em>'.
-	 * 
-	 * @return a new object of class '<em>Network</em>'.
-	 * @generated
-	 */
-	Network createNetwork();
-
-	/**
-	 * Returns a new object of class '<em>Pair</em>'.
-	 * 
-	 * @return a new object of class '<em>Pair</em>'.
-	 * @generated
-	 */
-	Pair createPair();
-
-	/**
-	 * Returns a new object of class '<em>Service</em>'.
-	 * 
-	 * @return a new object of class '<em>Service</em>'.
-	 * @generated
-	 */
-	Service createService();
-
-	/**
-	 * Returns a new object of class '<em>Service Type</em>'.
-	 * 
-	 * @return a new object of class '<em>Service Type</em>'.
-	 * @generated
-	 */
-	ServiceType createServiceType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * 
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ModelPackage getModelPackage();
-
-} //ModelFactory
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java
deleted file mode 100644
index 087602be9..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * 
- * @see org.eclipse.tm.discovery.model.ModelFactory
- * @model kind="package"
- * @generated
- */
-public interface ModelPackage extends EPackage {
-	/**
-	 * The package name.
-	 * 
-	 * @generated
-	 */
-	String eNAME = "model"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * 
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/tm/discovery/model"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * 
-	 * @generated
-	 */
-	String eNS_PREFIX = "model"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * 
-	 * @generated
-	 */
-	ModelPackage eINSTANCE = org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl <em>Device</em>}' class.
-	 * 
-	 * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
-	 * @generated
-	 */
-	int DEVICE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Type</b></em>' containment reference list.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__SERVICE_TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Address</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__ADDRESS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__NAME = 2;
-
-	/**
-	 * The number of structural features of the '<em>Device</em>' class.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl <em>Network</em>}' class.
-	 * 
-	 * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
-	 * @generated
-	 */
-	int NETWORK = 1;
-
-	/**
-	 * The feature id for the '<em><b>Device</b></em>' containment reference list.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int NETWORK__DEVICE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Network</em>' class.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int NETWORK_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl <em>Pair</em>}' class.
-	 * 
-	 * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
-	 * @generated
-	 */
-	int PAIR = 2;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int PAIR__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int PAIR__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Pair</em>' class.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int PAIR_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl <em>Service</em>}' class.
-	 * 
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
-	 * @generated
-	 */
-	int SERVICE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Pair</b></em>' containment reference list.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE__PAIR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE__NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Service</em>' class.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class.
-	 * 
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl
-	 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType()
-	 * @generated
-	 */
-	int SERVICE_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Service</b></em>' containment reference list.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_TYPE__SERVICE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_TYPE__NAME = 1;
-
-	/**
-	 * The number of structural features of the '<em>Service Type</em>' class.
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_TYPE_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Device <em>Device</em>}'.
-	 * 
-	 * @return the meta object for class '<em>Device</em>'.
-	 * @see org.eclipse.tm.discovery.model.Device
-	 * @generated
-	 */
-	EClass getDevice();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Device#getServiceType <em>Service Type</em>}'.
-	 * 
-	 * @return the meta object for the containment reference list '<em>Service Type</em>'.
-	 * @see org.eclipse.tm.discovery.model.Device#getServiceType()
-	 * @see #getDevice()
-	 * @generated
-	 */
-	EReference getDevice_ServiceType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Device#getAddress <em>Address</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Address</em>'.
-	 * @see org.eclipse.tm.discovery.model.Device#getAddress()
-	 * @see #getDevice()
-	 * @generated
-	 */
-	EAttribute getDevice_Address();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Device#getName <em>Name</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.tm.discovery.model.Device#getName()
-	 * @see #getDevice()
-	 * @generated
-	 */
-	EAttribute getDevice_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Network <em>Network</em>}'.
-	 * 
-	 * @return the meta object for class '<em>Network</em>'.
-	 * @see org.eclipse.tm.discovery.model.Network
-	 * @generated
-	 */
-	EClass getNetwork();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Network#getDevice <em>Device</em>}'.
-	 * 
-	 * @return the meta object for the containment reference list '<em>Device</em>'.
-	 * @see org.eclipse.tm.discovery.model.Network#getDevice()
-	 * @see #getNetwork()
-	 * @generated
-	 */
-	EReference getNetwork_Device();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Pair <em>Pair</em>}'.
-	 * 
-	 * @return the meta object for class '<em>Pair</em>'.
-	 * @see org.eclipse.tm.discovery.model.Pair
-	 * @generated
-	 */
-	EClass getPair();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Pair#getKey <em>Key</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see org.eclipse.tm.discovery.model.Pair#getKey()
-	 * @see #getPair()
-	 * @generated
-	 */
-	EAttribute getPair_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Pair#getValue <em>Value</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.tm.discovery.model.Pair#getValue()
-	 * @see #getPair()
-	 * @generated
-	 */
-	EAttribute getPair_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.Service <em>Service</em>}'.
-	 * 
-	 * @return the meta object for class '<em>Service</em>'.
-	 * @see org.eclipse.tm.discovery.model.Service
-	 * @generated
-	 */
-	EClass getService();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.Service#getPair <em>Pair</em>}'.
-	 * 
-	 * @return the meta object for the containment reference list '<em>Pair</em>'.
-	 * @see org.eclipse.tm.discovery.model.Service#getPair()
-	 * @see #getService()
-	 * @generated
-	 */
-	EReference getService_Pair();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.Service#getName <em>Name</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.tm.discovery.model.Service#getName()
-	 * @see #getService()
-	 * @generated
-	 */
-	EAttribute getService_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tm.discovery.model.ServiceType <em>Service Type</em>}'.
-	 * 
-	 * @return the meta object for class '<em>Service Type</em>'.
-	 * @see org.eclipse.tm.discovery.model.ServiceType
-	 * @generated
-	 */
-	EClass getServiceType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.tm.discovery.model.ServiceType#getService <em>Service</em>}'.
-	 * 
-	 * @return the meta object for the containment reference list '<em>Service</em>'.
-	 * @see org.eclipse.tm.discovery.model.ServiceType#getService()
-	 * @see #getServiceType()
-	 * @generated
-	 */
-	EReference getServiceType_Service();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tm.discovery.model.ServiceType#getName <em>Name</em>}'.
-	 * 
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.tm.discovery.model.ServiceType#getName()
-	 * @see #getServiceType()
-	 * @generated
-	 */
-	EAttribute getServiceType_Name();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * 
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ModelFactory getModelFactory();
-
-	/**
-	 * 
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * 
-	 * @generated
-	 */
-	
-	
-	
-	
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl <em>Device</em>}' class.
-		 * 
-		 * @see org.eclipse.tm.internal.discovery.model.impl.DeviceImpl
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getDevice()
-		 * @generated
-		 */
-		
-		EClass DEVICE = eINSTANCE.getDevice();
-
-		/**
-		 * The meta object literal for the '<em><b>Service Type</b></em>' containment reference list feature.
-		 * 
-		 * @generated
-		 */
-		EReference DEVICE__SERVICE_TYPE = eINSTANCE.getDevice_ServiceType();
-
-		/**
-		 * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute DEVICE__ADDRESS = eINSTANCE.getDevice_Address();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute DEVICE__NAME = eINSTANCE.getDevice_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl <em>Network</em>}' class.
-		 * 
-		 * @see org.eclipse.tm.internal.discovery.model.impl.NetworkImpl
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getNetwork()
-		 * @generated
-		 */
-		EClass NETWORK = eINSTANCE.getNetwork();
-
-		/**
-		 * The meta object literal for the '<em><b>Device</b></em>' containment reference list feature.
-		 * 
-		 * @generated
-		 */
-		EReference NETWORK__DEVICE = eINSTANCE.getNetwork_Device();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl <em>Pair</em>}' class.
-		 * 
-		 * @see org.eclipse.tm.internal.discovery.model.impl.PairImpl
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getPair()
-		 * @generated
-		 */
-		EClass PAIR = eINSTANCE.getPair();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute PAIR__KEY = eINSTANCE.getPair_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute PAIR__VALUE = eINSTANCE.getPair_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl <em>Service</em>}' class.
-		 * 
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ServiceImpl
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getService()
-		 * @generated
-		 */
-		EClass SERVICE = eINSTANCE.getService();
-
-		/**
-		 * The meta object literal for the '<em><b>Pair</b></em>' containment reference list feature.
-		 * 
-		 * @generated
-		 */
-		EReference SERVICE__PAIR = eINSTANCE.getService_Pair();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute SERVICE__NAME = eINSTANCE.getService_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl <em>Service Type</em>}' class.
-		 * 
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl
-		 * @see org.eclipse.tm.internal.discovery.model.impl.ModelPackageImpl#getServiceType()
-		 * @generated
-		 */
-		EClass SERVICE_TYPE = eINSTANCE.getServiceType();
-
-		/**
-		 * The meta object literal for the '<em><b>Service</b></em>' containment reference list feature.
-		 * 
-		 * @generated
-		 */
-		EReference SERVICE_TYPE__SERVICE = eINSTANCE.getServiceType_Service();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * 
-		 * @generated
-		 */
-		EAttribute SERVICE_TYPE__NAME = eINSTANCE.getServiceType_Name();
-
-	}
-
-} //ModelPackage
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java
deleted file mode 100644
index 2fc8cd1a4..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Network.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 
- * A representation of the model object '<em><b>Network</b></em>'.
- * 
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tm.discovery.model.Network#getDevice <em>Device</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getNetwork()
- * @model extendedMetaData="name='Network' kind='elementOnly'"
- * @generated
- */
-public interface Network extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Device</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tm.discovery.model.Device}.
-	 * 
-	 * @return the value of the '<em>Device</em>' containment reference list.
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getNetwork_Device()
-	 * @model type="org.eclipse.tm.discovery.model.Device" containment="true" required="true"
-	 *        extendedMetaData="kind='element' name='Device'"
-	 * @generated
-	 */
-	EList getDevice();
-
-} // Network
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java
deleted file mode 100644
index b085eec75..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Pair.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 
- * A representation of the model object '<em><b>Pair</b></em>'.
- * 
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tm.discovery.model.Pair#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.tm.discovery.model.Pair#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getPair()
- * @model extendedMetaData="name='Pair' kind='empty'"
- * @generated
- */
-public interface Pair extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute.
-	 * 
-	 * @return the value of the '<em>Key</em>' attribute.
-	 * @see #setKey(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getPair_Key()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='key'"
-	 * @generated
-	 */
-	String getKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.Pair#getKey <em>Key</em>}' attribute.
-	 * 	 
-	 * @param value the new value of the '<em>Key</em>' attribute.
-	 * @see #getKey()
-	 * @generated
-	 */
-	void setKey(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * 
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getPair_Value()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='value'"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.Pair#getValue <em>Value</em>}' attribute.
-	 * 
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // Pair
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java
deleted file mode 100644
index 108dbe214..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/Service.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 
- * A representation of the model object '<em><b>Service</b></em>'.
- * 
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tm.discovery.model.Service#getPair <em>Pair</em>}</li>
- *   <li>{@link org.eclipse.tm.discovery.model.Service#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getService()
- * @model extendedMetaData="name='Service' kind='elementOnly'"
- * @generated
- */
-public interface Service extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Pair</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tm.discovery.model.Pair}.
-	 * 
-	 * @return the value of the '<em>Pair</em>' containment reference list.
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getService_Pair()
-	 * @model type="org.eclipse.tm.discovery.model.Pair" containment="true"
-	 *        extendedMetaData="kind='element' name='Pair'"
-	 * @generated
-	 */
-	EList getPair();
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getService_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='name'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.Service#getName <em>Name</em>}' attribute.
-	 * 
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // Service
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java
deleted file mode 100644
index 3ec0b8c69..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ServiceType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.discovery.model;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 
- * A representation of the model object '<em><b>Service Type</b></em>'.
- * 
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tm.discovery.model.ServiceType#getService <em>Service</em>}</li>
- *   <li>{@link org.eclipse.tm.discovery.model.ServiceType#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage#getServiceType()
- * @model extendedMetaData="name='ServiceType' kind='elementOnly'"
- * @generated
- */
-public interface ServiceType extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Service</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tm.discovery.model.Service}.
-	 * 
-	 * @return the value of the '<em>Service</em>' containment reference list.
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getServiceType_Service()
-	 * @model type="org.eclipse.tm.discovery.model.Service" containment="true" required="true"
-	 *        extendedMetaData="kind='element' name='Service'"
-	 * @generated
-	 */
-	EList getService();
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * 
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#getServiceType_Name()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 *        extendedMetaData="kind='attribute' name='name'"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tm.discovery.model.ServiceType#getName <em>Name</em>}' attribute.
-	 * 
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // ServiceType
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java
deleted file mode 100644
index 39a159659..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/DeviceImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- * 
- * An implementation of the model object '<em><b>Device</b></em>'.
- * 
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getServiceType <em>Service Type</em>}</li>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.DeviceImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeviceImpl extends EObjectImpl implements Device {
-	/**
-	 * The cached value of the '{@link #getServiceType() <em>Service Type</em>}' containment reference list.
-	 * 
-	 * @see #getServiceType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceType = null;
-
-	/**
-	 * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * 
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * 
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String address = ADDRESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected DeviceImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.DEVICE;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EList getServiceType() {
-		if (serviceType == null) {
-			serviceType = new EObjectContainmentEList(ServiceType.class, this, ModelPackage.DEVICE__SERVICE_TYPE);
-		}
-		return serviceType;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setAddress(String newAddress) {
-		String oldAddress = address;
-		address = newAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.DEVICE__ADDRESS, oldAddress, address));
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.DEVICE__NAME, oldName, name));
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				return ((InternalEList)getServiceType()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				return getServiceType();
-			case ModelPackage.DEVICE__ADDRESS:
-				return getAddress();
-			case ModelPackage.DEVICE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				getServiceType().clear();
-				getServiceType().addAll((Collection)newValue);
-				return;
-			case ModelPackage.DEVICE__ADDRESS:
-				setAddress((String)newValue);
-				return;
-			case ModelPackage.DEVICE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				getServiceType().clear();
-				return;
-			case ModelPackage.DEVICE__ADDRESS:
-				setAddress(ADDRESS_EDEFAULT);
-				return;
-			case ModelPackage.DEVICE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.DEVICE__SERVICE_TYPE:
-				return serviceType != null && !serviceType.isEmpty();
-			case ModelPackage.DEVICE__ADDRESS:
-				return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
-			case ModelPackage.DEVICE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (address: "); //$NON-NLS-1$
-		result.append(address);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DeviceImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java
deleted file mode 100644
index 791eabafb..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- * 
- * An implementation of the model <b>Factory</b>.
- * 
- * @generated
- */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * @return model factory
-	 * 
-	 * @generated
-	 */
-	public static ModelFactory init() {
-		try {
-			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/tm/discovery/model");  //$NON-NLS-1$
-			if (theModelFactory != null) {
-				return theModelFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ModelFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * 
-	 * @generated
-	 */
-	public ModelFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ModelPackage.DEVICE: return createDevice();
-			case ModelPackage.NETWORK: return createNetwork();
-			case ModelPackage.PAIR: return createPair();
-			case ModelPackage.SERVICE: return createService();
-			case ModelPackage.SERVICE_TYPE: return createServiceType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Device createDevice() {
-		DeviceImpl device = new DeviceImpl();
-		return device;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Network createNetwork() {
-		NetworkImpl network = new NetworkImpl();
-		return network;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Pair createPair() {
-		PairImpl pair = new PairImpl();
-		return pair;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Service createService() {
-		ServiceImpl service = new ServiceImpl();
-		return service;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public ServiceType createServiceType() {
-		ServiceTypeImpl serviceType = new ServiceTypeImpl();
-		return serviceType;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public ModelPackage getModelPackage() {
-		return (ModelPackage)getEPackage();
-	}
-
-	/**
-	 * 
-	 * @return model package
-	 * @deprecated
-	 * @generated
-	 */
-	public static ModelPackage getPackage() {
-		return ModelPackage.eINSTANCE;
-	}
-
-} //ModelFactoryImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java
deleted file mode 100644
index 4e4a542a3..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ModelPackageImpl.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Network;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
-	/**
-	 * 
-	 * @generated
-	 */
-	private EClass deviceEClass = null;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	private EClass networkEClass = null;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	private EClass pairEClass = null;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	private EClass serviceEClass = null;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	private EClass serviceTypeEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * 
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.tm.discovery.model.ModelPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ModelPackageImpl() {
-		super(eNS_URI, ModelFactory.eINSTANCE);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * @return the model package
-	 * 	 
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ModelPackage init() {
-		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ModelPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theModelPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theModelPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theModelPackage.freeze();
-
-		return theModelPackage;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EClass getDevice() {
-		return deviceEClass;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EReference getDevice_ServiceType() {
-		return (EReference)deviceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDevice_Address() {
-		return (EAttribute)deviceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getDevice_Name() {
-		return (EAttribute)deviceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public EClass getNetwork() {
-		return networkEClass;
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public EReference getNetwork_Device() {
-		return (EReference)networkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EClass getPair() {
-		return pairEClass;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getPair_Key() {
-		return (EAttribute)pairEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getPair_Value() {
-		return (EAttribute)pairEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EClass getService() {
-		return serviceEClass;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EReference getService_Pair() {
-		return (EReference)serviceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getService_Name() {
-		return (EAttribute)serviceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EClass getServiceType() {
-		return serviceTypeEClass;
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public EReference getServiceType_Service() {
-		return (EReference)serviceTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EAttribute getServiceType_Name() {
-		return (EAttribute)serviceTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public ModelFactory getModelFactory() {
-		return (ModelFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * 
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		deviceEClass = createEClass(DEVICE);
-		createEReference(deviceEClass, DEVICE__SERVICE_TYPE);
-		createEAttribute(deviceEClass, DEVICE__ADDRESS);
-		createEAttribute(deviceEClass, DEVICE__NAME);
-
-		networkEClass = createEClass(NETWORK);
-		createEReference(networkEClass, NETWORK__DEVICE);
-
-		pairEClass = createEClass(PAIR);
-		createEAttribute(pairEClass, PAIR__KEY);
-		createEAttribute(pairEClass, PAIR__VALUE);
-
-		serviceEClass = createEClass(SERVICE);
-		createEReference(serviceEClass, SERVICE__PAIR);
-		createEAttribute(serviceEClass, SERVICE__NAME);
-
-		serviceTypeEClass = createEClass(SERVICE_TYPE);
-		createEReference(serviceTypeEClass, SERVICE_TYPE__SERVICE);
-		createEAttribute(serviceTypeEClass, SERVICE_TYPE__NAME);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * 
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getDevice_ServiceType(), this.getServiceType(), null, "serviceType", null, 1, -1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDevice_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDevice_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(networkEClass, Network.class, "Network", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getNetwork_Device(), this.getDevice(), null, "device", null, 1, -1, Network.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(pairEClass, Pair.class, "Pair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPair_Key(), theXMLTypePackage.getString(), "key", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getPair_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getService_Pair(), this.getPair(), null, "pair", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getService_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(serviceTypeEClass, ServiceType.class, "ServiceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getServiceType_Service(), this.getService(), null, "service", null, 1, -1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getServiceType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 *
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		 //$NON-NLS-1$
-		addAnnotation
-		  (deviceEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Device", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDevice_ServiceType(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ServiceType" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDevice_Address(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "address" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDevice_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (networkEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Network", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getNetwork_Device(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "Device" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (pairEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Pair", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPair_Key(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "key" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getPair_Value(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (serviceEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Service", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getService_Pair(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "Pair" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getService_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (serviceTypeEClass, 
-		   source, 
-		   new String[] {
-			 "name", "ServiceType", //$NON-NLS-1$ //$NON-NLS-2$
-			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceType_Service(), 
-		   source, 
-		   new String[] {
-			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "Service" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getServiceType_Name(), 
-		   source, 
-		   new String[] {
-			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //ModelPackageImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java
deleted file mode 100644
index 8b06e0a8f..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Network;
-
-/**
- * 
- * An implementation of the model object '<em><b>Network</b></em>'.
- * 
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.NetworkImpl#getDevice <em>Device</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NetworkImpl extends EObjectImpl implements Network {
-	/**
-	 * The cached value of the '{@link #getDevice() <em>Device</em>}' containment reference list.
-	 * 
-	 * @see #getDevice()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList device = null;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected NetworkImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.NETWORK;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EList getDevice() {
-		if (device == null) {
-			device = new EObjectContainmentEList(Device.class, this, ModelPackage.NETWORK__DEVICE);
-		}
-		return device;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.NETWORK__DEVICE:
-				return ((InternalEList)getDevice()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.NETWORK__DEVICE:
-				return getDevice();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.NETWORK__DEVICE:
-				getDevice().clear();
-				getDevice().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NETWORK__DEVICE:
-				getDevice().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.NETWORK__DEVICE:
-				return device != null && !device.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //NetworkImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java
deleted file mode 100644
index 17810b4c4..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/PairImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Pair;
-
-/**
- * 
- * An implementation of the model object '<em><b>Pair</b></em>'.
- *
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.PairImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PairImpl extends EObjectImpl implements Pair {
-	/**
-	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * 
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * 
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 *
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected PairImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.PAIR;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PAIR__KEY, oldKey, key));
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PAIR__VALUE, oldValue, value));
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.PAIR__KEY:
-				return getKey();
-			case ModelPackage.PAIR__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.PAIR__KEY:
-				setKey((String)newValue);
-				return;
-			case ModelPackage.PAIR__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.PAIR__KEY:
-				setKey(KEY_EDEFAULT);
-				return;
-			case ModelPackage.PAIR__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.PAIR__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case ModelPackage.PAIR__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: "); //$NON-NLS-1$
-		result.append(key);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PairImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java
deleted file mode 100644
index 90c8cc24c..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-
-/**
- *
- * An implementation of the model object '<em><b>Service</b></em>'.
- * 
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getPair <em>Pair</em>}</li>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImpl extends EObjectImpl implements Service {
-	/**
-	 * The cached value of the '{@link #getPair() <em>Pair</em>}' containment reference list.
-	 * 
-	 * @see #getPair()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList pair = null;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected ServiceImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.SERVICE;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EList getPair() {
-		if (pair == null) {
-			pair = new EObjectContainmentEList(Pair.class, this, ModelPackage.SERVICE__PAIR);
-		}
-		return pair;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVICE__NAME, oldName, name));
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.SERVICE__PAIR:
-				return ((InternalEList)getPair()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.SERVICE__PAIR:
-				return getPair();
-			case ModelPackage.SERVICE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.SERVICE__PAIR:
-				getPair().clear();
-				getPair().addAll((Collection)newValue);
-				return;
-			case ModelPackage.SERVICE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SERVICE__PAIR:
-				getPair().clear();
-				return;
-			case ModelPackage.SERVICE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SERVICE__PAIR:
-				return pair != null && !pair.isEmpty();
-			case ModelPackage.SERVICE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 *
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java
deleted file mode 100644
index 5b27ddfe0..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/ServiceTypeImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-
-/**
- * 
- * An implementation of the model object '<em><b>Service Type</b></em>'.
- * 
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getService <em>Service</em>}</li>
- *   <li>{@link org.eclipse.tm.internal.discovery.model.impl.ServiceTypeImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceTypeImpl extends EObjectImpl implements ServiceType {
-	/**
-	 * The cached value of the '{@link #getService() <em>Service</em>}' containment reference list.
-	 * 
-	 * @see #getService()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList service = null;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 *
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected ServiceTypeImpl() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.SERVICE_TYPE;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public EList getService() {
-		if (service == null) {
-			service = new EObjectContainmentEList(Service.class, this, ModelPackage.SERVICE_TYPE__SERVICE);
-		}
-		return service;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVICE_TYPE__NAME, oldName, name));
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				return ((InternalEList)getService()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				return getService();
-			case ModelPackage.SERVICE_TYPE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				getService().clear();
-				getService().addAll((Collection)newValue);
-				return;
-			case ModelPackage.SERVICE_TYPE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				getService().clear();
-				return;
-			case ModelPackage.SERVICE_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SERVICE_TYPE__SERVICE:
-				return service != null && !service.isEmpty();
-			case ModelPackage.SERVICE_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * 
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceTypeImpl
\ No newline at end of file
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java
deleted file mode 100644
index 7b6544736..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelAdapterFactory.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- * 
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * 
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * 
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * 
-	 * @generated
-	 */
-	public ModelAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * 
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * 
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * 
-	 * @generated
-	 */
-	protected ModelSwitch modelSwitch =
-		new ModelSwitch() {
-			public Object caseDevice(Device object) {
-				return createDeviceAdapter();
-			}
-			public Object caseNetwork(Network object) {
-				return createNetworkAdapter();
-			}
-			public Object casePair(Pair object) {
-				return createPairAdapter();
-			}
-			public Object caseService(Service object) {
-				return createServiceAdapter();
-			}
-			public Object caseServiceType(ServiceType object) {
-				return createServiceTypeAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * 
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Device <em>Device</em>}'.
-	 * 
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.tm.discovery.model.Device
-	 * @generated
-	 */
-	public Adapter createDeviceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Network <em>Network</em>}'.
-	 * 
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.tm.discovery.model.Network
-	 * @generated
-	 */
-	public Adapter createNetworkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Pair <em>Pair</em>}'.
-	 *
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.tm.discovery.model.Pair
-	 * @generated
-	 */
-	public Adapter createPairAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Service <em>Service</em>}'.
-	 * 
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.tm.discovery.model.Service
-	 * @generated
-	 */
-	public Adapter createServiceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.ServiceType <em>Service Type</em>}'.
-	 * 
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * 
-	 * @return the new adapter.
-	 * @see org.eclipse.tm.discovery.model.ServiceType
-	 * @generated
-	 */
-	public Adapter createServiceTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * 
-	 * This default implementation returns null.
-	 * 
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ModelAdapterFactory
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
deleted file mode 100644
index 1e32b69b1..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * 
- * The <b>Resource Factory</b> associated with the package.
- * 
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceImpl
- * @generated
- */
-public class ModelResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * 
-	 * @generated
-	 */
-	public ModelResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * 
-	 * @generated
-	 */
-	public Resource createResource(URI uri) {
-		XMLResource result = new ModelResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} //ModelResourceFactoryImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
deleted file mode 100644
index 3275b0e99..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * 
- * The <b>Resource </b> associated with the package.
- * 
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl
- * @generated
- */
-public class ModelResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 *
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public ModelResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //ModelResourceImpl
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
deleted file mode 100644
index 9da418db2..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- * 
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * 
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelSwitch {
-	/**
-	 * The cached model package
-	 * 
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * 
-	 * @generated
-	 */
-	public ModelSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * @param theEObject 
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected Object doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ModelPackage.DEVICE: {
-				Device device = (Device)theEObject;
-				Object result = caseDevice(device);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.NETWORK: {
-				Network network = (Network)theEObject;
-				Object result = caseNetwork(network);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.PAIR: {
-				Pair pair = (Pair)theEObject;
-				Object result = casePair(pair);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.SERVICE: {
-				Service service = (Service)theEObject;
-				Object result = caseService(service);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.SERVICE_TYPE: {
-				ServiceType serviceType = (ServiceType)theEObject;
-				Object result = caseServiceType(serviceType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Device</em>'.
-	 *
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Device</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDevice(Device object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Network</em>'.
-	 * 
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Network</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseNetwork(Network object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Pair</em>'.
-	 * 
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Pair</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePair(Pair object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service</em>'.
-	 * 
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseService(Service object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Type</em>'.
-	 * 
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceType(ServiceType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * 
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * 
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //ModelSwitch
diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
deleted file mode 100644
index 38f0bfeab..000000000
--- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * 
- * @generated
- */
-public class ModelXMLProcessor extends XMLProcessor {
-	/**
-	 * Public constructor to instantiate the helper.
-	 * 
-	 * @generated
-	 */
-	public ModelXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		ModelPackage.eINSTANCE.eClass();
-	}
-	
-	/**
-	 * Register for "*" and "xml" file extensions the ModelResourceFactoryImpl factory.
-	 * 
-	 * @generated
-	 */
-	protected Map getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new ModelResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new ModelResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} //ModelXMLProcessor
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project
deleted file mode 100644
index fea92ff80..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.protocol.dnssd</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
deleted file mode 100644
index 3cb115145..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.protocol.dnssd.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine,
- org.eclipse.tm.discovery.model,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/about.html b/discovery/org.eclipse.tm.discovery.protocol.dnssd/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/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 2, 2006</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/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
deleted file mode 100644
index e4c000c4c..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .,\
-               plugin.xml
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
deleted file mode 100644
index c4e4ec55f..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery DNS-SD Protocol
-providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml
deleted file mode 100644
index a02e39666..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-   <extension  point="org.eclipse.tm.discovery.engine.discoveryProtocol">
-   <protocol
-            class="org.eclipse.tm.internal.discovery.protocol.dnssd.DNSSDProtocol"
-            name="DNS-SD"/>
-   </extension>
-</plugin>
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java
deleted file mode 100644
index c695ffeec..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.protocol.dnssd;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.discovery.protocol.dnssd"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java
deleted file mode 100644
index 4de1b56db..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/DNSSDProtocol.java
+++ /dev/null
@@ -1,716 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.protocol.dnssd;
-
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.ModelFactory;
-import org.eclipse.tm.discovery.model.Network;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-import org.eclipse.tm.discovery.protocol.IProtocol;
-import org.eclipse.tm.discovery.transport.ITransport;
-
-
-
-/**
- * DNS-based Service Discovery implementation based on <a
- * href="http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt">DNS-Based
- * Service Discovery</a> <br/><br/> The DNS packets supported by the implementation are:
- * 
- * <ul>
- * <li> DNS Pointer resource record (PTR) <br/> <table border="1">
- * <tr>
- * <td>Name</td>
- * <td>Type</td>
- * <td>Class</td>
- * <td>TTL</td>
- * <td>Data Size</td>
- * <td>Domain Name</td>
- * </tr>
- * </table> <br/>
- * <li> DNS Service resource record (SRV)<br/> <table border="1">
- * <tr>
- * <td>Name</td>
- * <td>Type</td>
- * <td>Class</td>
- * <td>TTL</td>
- * <td>Data Size</td>
- * <td>Priority</td>
- * <td>Weight</td>
- * <td>Port</td>
- * <td>Target</td>
- * </tr>
- * </table> <br/>
- * <li> DNS Text resource record (TXT) <br/> <table border="1">
- * <tr>
- * <td>Name</td>
- * <td>Type</td>
- * <td>Class</td>
- * <td>TTL</td>
- * <td>Data Size</td>
- * <td>Data Pairs</td>
- * </tr>
- * </table> <br/>
- * <li> DNS Address resource record (A) <br/> <table border="1">
- * <tr>
- * <td>Name</td>
- * <td>Type</td>
- * <td>Class</td>
- * <td>TTL</td>
- * <td>Data Size</td>
- * <td>Address</td>
- * </tr>
- * </table>
- * </ul>
- * <br/>
- * 
- * 
- */
-public class DNSSDProtocol implements IProtocol {
-
-	// DNS Pointer resource record	identifier 
-	private final static int PTR = 0x0C;
-
-	// DNS Service resource record identifier 
-	private final static int SRV = 0x21;
-
-	// DNS Text resource record identifier 
-	private final static int TXT = 0x10;
-
-	// DNS Address resource record	identifier 
-	private final static int A = 0x01;
-	
-	// DNS packet reference.
-	private byte[] packet;
-	
-	// provide 64k for the received packet 
-	private final int MAX_PACKET_SIZE = 65535;
-	private byte[] buffer = new byte[MAX_PACKET_SIZE];
-	
-	//IP address identifying the target
-	private String address;
-	
-	// Queries for services and legacy services 
-	private final String SERVICE_DISCOVERY_COMMAND = Messages.getString("DNSSDProtocol.ServiceDiscoveryCommand"); //$NON-NLS-1$
-	private final  String LEGACY_SERVICE_DISCOVERY_COMMAND = Messages.getString("DNSSDProtocol.legacyServiceDiscoveryCommand"); //$NON-NLS-1$
-
-	// Patterns to parse service name and service type
-	
-	private final Pattern srvPattern = Pattern.compile("^(.+)\\._(.+)._.+\\.local."); //$NON-NLS-1$
-	private final Pattern ptrPattern = Pattern.compile("^_(.+)._.+\\.local."); //$NON-NLS-1$
-	
-	private Resource resource = null;
-	private ITransport transport = null;
-	private String query = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.protocol.IProtocol#getQueries()
-	 */
-	public String[] getQueries()
-	{
-		return new String[]{
-				SERVICE_DISCOVERY_COMMAND,
-				LEGACY_SERVICE_DISCOVERY_COMMAND
-		};
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.protocol.IProtocol#getDiscoveryJob(java.lang.String, org.eclipse.emf.ecore.resource.Resource, org.eclipse.tm.discovery.transport.ITransport)
-	 */
-	public Job getDiscoveryJob(String aQuery, Resource aResource, ITransport aTransport){
-		
-		resource = aResource;
-		transport = aTransport;
-		query = aQuery;
-		
-		return new Job(Messages.getString("DNSSDProtocol.JobName")) { //$NON-NLS-1$
-			protected IStatus run(IProgressMonitor monitor) {
-				if (transport != null) {
-					sendQuery(transport, query, PTR);
-
-					Vector discoveredServices = new Vector();
-
-					if (!resource.getContents().isEmpty()) {
-
-						Iterator deviceIterator = ((Network) resource.getContents().get(0)).getDevice().iterator();
-						while (deviceIterator.hasNext()) {
-							Device device = (Device) deviceIterator.next();
-							Iterator serviceTypeIterator = device.getServiceType().iterator();
-							while (serviceTypeIterator.hasNext()) {
-								ServiceType serviceType = (ServiceType) serviceTypeIterator.next();
-								if (serviceType.getName().equals(SERVICE_DISCOVERY_COMMAND) || 
-									serviceType.getName().equals(LEGACY_SERVICE_DISCOVERY_COMMAND)) {
-									Iterator serviceIterator = serviceType.getService().iterator();
-									while (serviceIterator.hasNext()) {
-										Service service = (Service) serviceIterator.next();
-
-										if (!discoveredServices.contains(service.getName())) {
-											discoveredServices.add(service.getName());
-										}
-
-									}
-									serviceTypeIterator.remove();
-								}
-							}
-						}
-
-						for (int i = 0; i < discoveredServices.size(); i++) {
-							sendQuery(transport,(String) discoveredServices.elementAt(i),	PTR);
-						}
-					}
-				}
-				return new Status(IStatus.OK,
-						"org.eclipse.rse.discovery.engine", IStatus.OK, //$NON-NLS-1$
-						Messages.getString("DNSSDProtocol.FinishedJobName"), null); //$NON-NLS-1$
-			}
-		};
-	}
-	
-	/*
-	 * Creates and sends the specified query in a DNS-SD packet and call the function to populate the model with the received data
-	 */
-	private void sendQuery(ITransport transport, String query, int type) {
-		try {
-			
-			//clean buffer
-			for (int i = 0; i < buffer.length; i++) {
-				buffer[i]=0;
-			}
-			
-			// number of queries (1) 
-			buffer[4] = (byte) 0x00;
-			buffer[5] = (byte) 0x01;
-			
-			//jump to the data section of the packet letting the other fields as 0s
-			int index = 12;
-			
-			StringTokenizer tokenizer = new StringTokenizer(query, "."); //$NON-NLS-1$
-
-			while (tokenizer.hasMoreTokens()) {
-				String token = tokenizer.nextToken();
-
-				buffer[index] = (byte) token.length();
-				index++;
-
-				for (int subIndex = 0; subIndex < token.getBytes().length; subIndex++) {
-					buffer[index + subIndex] = token.getBytes()[subIndex];
-				}
-				index += token.getBytes().length;
-			}
-
-			//end of data section
-			buffer[index++] = 0x00;
-			
-			// type TXT-SRV-PTR
-			buffer[index++] = 0x00;
-			buffer[index++] = (byte) (type & 0xFF);
-
-			//inet
-			buffer[index++] = 0x00;
-			buffer[index++] = 0x01;
-			
-			packet = new byte[index];
-			for (int position = 0; position < index; position++)
-				packet[position] = buffer[position];
-			
-			//send the packet using the provided ITransport implementation
-			transport.send(packet);
-			
-			// wait to receive data until timeout
-			while (true) {
-				address = transport.receive(buffer);
-				packet = buffer;
-				populateModel(resource);
-			}
-			
-		} catch (Exception e) {
-			// timeout, no more services to discover
-		}
-	}
-	
-
-	/*
-	 * Populates the provided model with the contents of the received packet
-	 */
-	private void populateModel(Resource resource) {
-		Network network = null;
-		Device device = null;
-		boolean found = false;
-
-		Iterator deviceIterator = null;
-		
-		if (resource.getContents().isEmpty()) {
-			network = ModelFactory.eINSTANCE.createNetwork();
-			resource.getContents().add(network);
-		} else {
-			network = (Network) resource.getContents().get(0);
-		}
-
-		deviceIterator = network.getDevice().iterator();
-		while (deviceIterator.hasNext()) {
-			Device aDevice = (Device) deviceIterator.next();
-			if (aDevice.getAddress().equals(address)) {
-				device = aDevice;
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			device = ModelFactory.eINSTANCE.createDevice();
-			device.setAddress(address);
-
-			network.getDevice().add(device);
-		}
-
-		ByteArrayInputStream packetInputStream = new ByteArrayInputStream(packet);
-
-		//skip transactionID+flags
-		packetInputStream.skip(4);
-
-		int queriesNumber = packetInputStream.read() << 8 | packetInputStream.read();
-		int answersNumber = packetInputStream.read() << 8 | packetInputStream.read();
-
-		//skip authority RRs
-		packetInputStream.skip(2);
-
-		int additionalRecordsNumber = packetInputStream.read() << 8 | packetInputStream.read();
-
-		// read queries
-		for (int i = 0; i < queriesNumber; i++) {
-			getName(packetInputStream, packet);
-			//skip type
-			packetInputStream.skip(2);
-			//skip class
-			packetInputStream.skip(2);
-		}
-
-		//read answers
-		for (int i = 0; i < answersNumber + additionalRecordsNumber; i++) {
-			found = false;
-
-			String name = getName(packetInputStream, packet);
-
-			//packet type
-			int type = packetInputStream.read() << 8 | packetInputStream.read();
-
-			//skip class
-			packetInputStream.skip(2);
-
-			//skip TTL
-			packetInputStream.skip(4);
-
-			switch (type) {
-
-			/*
-			 *  A PACKET (DNS Address resource record identifier)
-			 */
-			case DNSSDProtocol.A:
-				handleARecord(packetInputStream, device, name);
-				break;
-
-			/*
-			 *  PTR PACKET (DNS Pointer resource record	identifier)
-			 */
-			case DNSSDProtocol.PTR:
-				handlePTRRecord(packetInputStream, device, name);
-				break;
-
-			/*
-			 *  SRV PACKET (DNS Service resource record	identifier)
-			 */
-			case DNSSDProtocol.SRV:
-				handleSRVRecord(packetInputStream, device, name);
-				break;
-
-			/*
-			 *  TXT PACKET (DNS Text resource record identifier)
-			 */
-			case DNSSDProtocol.TXT:
-				handleTXTRecord(packetInputStream, device, name);
-				break;
-			}
-		}
-	}
-	
-	private void handleARecord(ByteArrayInputStream packetInputStream, Device device, String name) {
-		int dataLength = packetInputStream.read() << 8 | packetInputStream.read();
-		
-		//skip address
-		packetInputStream.skip(dataLength);
-		
-		if (device != null) {
-			device.setName(name.substring(0, name.indexOf('.') ));
-		}	
-	}
-	
-	
-	
-	private void handlePTRRecord(ByteArrayInputStream packetInputStream, Device device, String name) {
-		
-		Service service = ModelFactory.eINSTANCE.createService();
-		ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
-		
-		//skip dataLength
-		packetInputStream.skip(2);
-	
-		String ptrDataName = getName(packetInputStream, packet);
-		
-		String serviceTypeName = name;
-
-		//parse the service type name
-		if(!(serviceTypeName.equals(SERVICE_DISCOVERY_COMMAND) || serviceTypeName.equals(LEGACY_SERVICE_DISCOVERY_COMMAND)))
-		{
-			Matcher matcher = ptrPattern.matcher(name);
-		  		if (matcher.matches())
-		  			serviceTypeName = matcher.group(1);
-		}
-		
-		//find if we have a serviceType with this name...
-		Iterator serviceTypeIterator = device.getServiceType().iterator();
-		boolean found = false;
-		while (serviceTypeIterator.hasNext()) {
-			ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
-			if (aServiceType.getName().equals(serviceTypeName)) {
-				serviceType = aServiceType;
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			serviceType = ModelFactory.eINSTANCE.createServiceType();
-			serviceType.setName(serviceTypeName);
-			device.getServiceType().add(serviceType);
-		}
-	
-		if (!ptrDataName.equals("")) { //$NON-NLS-1$
-			//find if we have a service with this name...
-			
-			String serviceName = null;
-
-			if(serviceTypeName.equals(SERVICE_DISCOVERY_COMMAND) || serviceTypeName.equals(LEGACY_SERVICE_DISCOVERY_COMMAND))
-			{
-				serviceName = ptrDataName;
-			}
-			else
-			{
-				//parse the service type name
-				Matcher matcher = srvPattern.matcher(ptrDataName);
-		  			if (matcher.matches()) 
-		  				serviceName = matcher.group(1);
-			}
-			
-			Iterator serviceIterator = serviceType.getService().iterator();
-			found = false;
-			while (serviceIterator.hasNext()) {
-				Service aService = (Service) serviceIterator.next();
-				if (aService.getName().equals(serviceName)) {
-					service = aService;
-					found = true;
-					break;
-				}
-			}
-	
-			if (!found) {
-				service = ModelFactory.eINSTANCE.createService();
-				service.setName(serviceName);
-				serviceType.getService().add(service);
-			}
-		}
-	}
-	
-	private void handleSRVRecord(ByteArrayInputStream packetInputStream, Device device, String name) {
-
-		Service service = ModelFactory.eINSTANCE.createService();
-		ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
-		
-		//data of the packet, without bytes for priority-weight-port
-		int dataLength = (packetInputStream.read() << 8 | packetInputStream.read()) - 6;
-
-		int priority = packetInputStream.read() << 8 | packetInputStream.read();
-		int weight = packetInputStream.read() << 8 | packetInputStream.read();
-		int port = packetInputStream.read() << 8 | packetInputStream.read();
-
-		byte[] data = new byte[dataLength];
-		try {
-			packetInputStream.read(data);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		String serviceTypeName = null;
-		String serviceName = null;
-
-		//parse the service type name and the service name
-		Matcher matcher = srvPattern.matcher(name);
-		if (matcher.matches()) 
-		{
-			serviceTypeName = matcher.group(2);
-			serviceName = matcher.group(1);
-		}
-	  	
-		//	find if we have a serviceType with this name...
-		
-		Iterator serviceTypeIterator = device.getServiceType().iterator();
-		boolean found = false;
-		while (serviceTypeIterator.hasNext()) {
-			ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
-			if (aServiceType.getName().equals(serviceTypeName)) {
-				serviceType = aServiceType;
-				found = true;
-				break;
-			}
-		}
-
-		if (!found) {
-			serviceType = ModelFactory.eINSTANCE.createServiceType();
-			serviceType.setName(serviceTypeName);
-			device.getServiceType().add(serviceType);
-		}
-
-		//find if we have a service with this name...
-		Iterator serviceIterator = serviceType.getService().iterator();
-		found = false;
-		while (serviceIterator.hasNext()) {
-			Service temp = (Service) serviceIterator.next();
-			if (temp.getName().equals(serviceName)) {
-				service = temp;
-				found = true;
-				break;
-			}
-		}
-
-		if (!found) {
-			service = ModelFactory.eINSTANCE.createService();
-			service.setName(serviceName);
-			serviceType.getService().add(service);
-		}
-
-		service.setName(serviceName);
-		
-		String[] keys = new String[]{"port","priority","weight"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String[] values = new String[]{port+"",priority+"",weight+""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		for (int i = 0; i < keys.length; i++) {
-		
-			Pair text = null;
-			Iterator pairIterator = service.getPair().iterator();
-			found = false;
-			while (pairIterator.hasNext()) {
-				Pair aPair = (Pair) pairIterator.next();
-				if (aPair != null)
-				{
-					if (aPair.getKey().equals(keys[i])) {
-						String current = aPair.getValue();
-						if (!current.equals(values[i]))
-							aPair.setValue(values[i]);
-						found = true;
-						break;
-					}
-				}
-			}
-
-			if (!found) {
-				text = ModelFactory.eINSTANCE.createPair();
-				text.setKey(keys[i]);
-				text.setValue(values[i]);
-				service.getPair().add(text);
-			}
-		}
-	}
-	
-	private void handleTXTRecord(ByteArrayInputStream packetInputStream, Device device, String recordName) {
-		ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType();
-		Service service = ModelFactory.eINSTANCE.createService();
-		int dataLength = packetInputStream.read() << 8 | packetInputStream.read();
-
-		byte [] data = new byte[dataLength];
-		try {
-			packetInputStream.read(data);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		String serviceName = null;
-		String serviceTypeName = null;
-		
-		// Find if we have a serviceType with this name...
-		
-		Matcher matcher = srvPattern.matcher(recordName);
-			if (matcher.matches())
-			{
-				serviceName = matcher.group(1);
-				serviceTypeName = matcher.group(2);
-			}
-	
-		
-	  	Iterator serviceTypeIterator = device.getServiceType().iterator();
-		boolean found = false;
-		while (serviceTypeIterator.hasNext()) {
-			ServiceType aServiceType = (ServiceType) serviceTypeIterator.next();
-			if (aServiceType != null) {
-				if (aServiceType.getName().equals(serviceTypeName)) {
-					serviceType = aServiceType;
-					found = true;
-					break;
-				}
-			}
-		}
-
-		if (!found) {
-			serviceType = ModelFactory.eINSTANCE.createServiceType();
-			serviceType.setName(serviceTypeName);
-			device.getServiceType().add(serviceType);
-		}
-
-		// Find if we have a service with this name...
-			
-		Iterator serviceIterator = serviceType.getService().iterator();
-		found = false;
-		while (serviceIterator.hasNext()) {
-			Service aService = (Service) serviceIterator.next();
-			if (aService != null) {
-				if (aService.getName().equals(serviceName)) {
-					service = aService;
-					found = true;
-					break;
-				}
-			}
-		}
-
-		if (!found) {
-			service = ModelFactory.eINSTANCE.createService();
-			service.setName(recordName);
-			serviceType.getService().add(service);
-		}
-		
-		//process "key=value" pairs
-		
-		StringBuffer dataBuffer = new StringBuffer();
-		int entryLength = 0;
-		
-		for (int j = 0; j < dataLength; j += entryLength + 1) {
-
-			dataBuffer.setLength(0);
-
-			entryLength = data[j];
-
-			for (int k = 1; k <= entryLength; k++)
-				dataBuffer.append((char) data[j + k]);
-
-			StringTokenizer stk = new StringTokenizer(dataBuffer.toString(),"="); //$NON-NLS-1$
-
-			String key = stk.nextToken();
-
-			// DNS-Based Service Discovery
-			// 6.4 Rules for Names in DNS-SD Name/Value Pairs
-			// If a key has no value, assume "true"
-			String value = "true"; //$NON-NLS-1$
-
-			try {
-				value = stk.nextToken();
-			} catch (Exception e) {
-				// no value, assume "true"
-			}
-
-			// find if we are updating the value of a key...
-			Pair text = null;
-			Iterator pairIterator = service.getPair().iterator();
-			found = false;
-			while (pairIterator.hasNext()) {
-				Pair aPair = (Pair) pairIterator.next();
-				if (aPair != null) {
-					if (aPair.getKey().equals(key)) {
-						String current = aPair.getValue();
-						if (!current.equals(value))
-							aPair.setValue(value);
-						found = true;
-						break;
-					}
-				}
-			}
-
-			if (!found) {
-				text = ModelFactory.eINSTANCE.createPair();
-				text.setKey(key);
-				text.setValue(value);
-				service.getPair().add(text);
-			}
-		}
-	}
-
-	// returns the name, that can be compressed using DNS compression
-	// For more information about DNS compression: RFC 1035 (4.1.4. Message compression)
-	private String getName(ByteArrayInputStream packetInputStream, byte[] packet) {
-		StringBuffer buffer = new StringBuffer();
-		int nextByte = 0;
-
-		while (true) {
-			nextByte = packetInputStream.read();
-
-			//check if it's a pointer
-			//pointer: |11xxxxxx|-|xxxxxxxx| where xxx...x is the pointer in the packet
-			if ((nextByte & 0xC0) == 0xC0) {
-				int upperByte = (nextByte & (byte) 0x3F) << 8;
-				int offset = packetInputStream.read() | upperByte;
-				buffer.append(getReference(packet, offset));
-				break;
-			} else if (nextByte == 0x00) {
-				break;
-			} else {
-				for (int i = 0; i < nextByte; i++) {
-					buffer.append((char)packetInputStream.read());
-				}
-				buffer.append('.');
-			}
-		}
-		return buffer.toString();
-	}
-
-	private String getReference(byte[] packet, int offset) {
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; packet[offset + i] != 0x00;) {
-			int numReads = packet[offset + i];
-			
-			//check if it's a pointer
-			//pointer: |11xxxxxx|-|xxxxxxxx| where xxx...x is the pointer in the packet
-			if ((numReads & 0xC0) == 0xC0) {
-				int upperByte = (numReads & (byte) 0x3F) << 8;
-				int nextOffset = packet[offset + i + 1] | upperByte;
-				buffer.append(getReference(packet, nextOffset));
-				break;
-			} else {
-				for (int j = 0; j < numReads; j++) {
-					buffer.append((char) packet[offset + i + j + 1]);
-				}
-				buffer.append('.');
-			}
-			i += (numReads + 1);
-		}
-		return buffer.toString();
-	}
-
-	
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java
deleted file mode 100644
index 5fbd9f98a..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.protocol.dnssd;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.protocol.dnssd.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties
deleted file mode 100644
index 05ed2428d..000000000
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/internal/discovery/protocol/dnssd/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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
-##################################################################################
-
-DNSSDProtocol.ServiceDiscoveryCommand=_services._dns-sd._udp.local.
-DNSSDProtocol.legacyServiceDiscoveryCommand=_services._mdns._udp.local.
-DNSSDProtocol.JobName=DNS-SD Service Discovery
-DNSSDProtocol.FinishedJobName=DNS-SD Service Discovery finished
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.classpath b/discovery/org.eclipse.tm.discovery.transport.udp/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore b/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.project b/discovery/org.eclipse.tm.discovery.transport.udp/.project
deleted file mode 100644
index 31a4ba764..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.transport.udp</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
deleted file mode 100644
index 7acf09e7a..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.transport.udp.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.tm.internal.discovery.transport.udp;x-internal:=true
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/about.html b/discovery/org.eclipse.tm.discovery.transport.udp/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/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 2, 2006</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/discovery/org.eclipse.tm.discovery.transport.udp/build.properties b/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
deleted file mode 100644
index e4c000c4c..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .,\
-               plugin.xml
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
deleted file mode 100644
index 4d87b66db..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery UDP Transport
-providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml
deleted file mode 100644
index b97d9d216..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-   <extension
-         point="org.eclipse.tm.discovery.engine.discoveryTransport">
-      <transport
-            class="org.eclipse.tm.internal.discovery.transport.udp.UDPTransport"
-            name="UDP"/>
-   </extension>
-</plugin>
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java
deleted file mode 100644
index f7255a7b9..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.transport.udp;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.discovery.transport.udp"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java b/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java
deleted file mode 100644
index efbf78375..000000000
--- a/discovery/org.eclipse.tm.discovery.transport.udp/src/org/eclipse/tm/internal/discovery/transport/udp/UDPTransport.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.transport.udp;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.tm.discovery.transport.ITransport;
-
-/**
- * UPD/IP transport implementation
- */
-
-public class UDPTransport implements ITransport {
-
-	// Default multicast DNS port
-	public static int MDNS_PORT = 5353;
-	
-	// DNS-SD multicast address 
-	public static String MULTICAST_ADDRESS = "224.0.0.251"; //$NON-NLS-1$
-	
-	private DatagramSocket socket = null;
-
-	private InetAddress server = null;
-	
-	private int port = MDNS_PORT;
-
-	/**
-	 * Constructor for transport for UDP/IP
-	 */
-	
-	public UDPTransport() {
-		try {
-			socket = new DatagramSocket();
-		} catch (SocketException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.transport.ITransport#setTargetAddress(java.lang.String)
-	 */
-	public void setTargetAddress(String address) throws UnknownHostException
-	{
-		
-		Pattern pattern = Pattern.compile("([^:]*)(:(\\d+))?"); //$NON-NLS-1$
-		Matcher matcher = pattern.matcher(address);
-		if (matcher.matches()) {
-			server = InetAddress.getByName(matcher.group(1));
-			if (server.isLoopbackAddress()) {
-				server = InetAddress.getLocalHost();
-			}
-
-			if (matcher.groupCount() == 3 && matcher.group(3) != null)
-				port = Integer.parseInt(matcher.group(3));
-		}
-		
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.transport.ITransport#setTimeOut(int)
-	 */
-	public void setTimeOut(int timeOut) throws SocketException
-	{
-		socket.setSoTimeout(timeOut);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.transport.ITransport#send(byte[])
-	 */
-	public void send(byte[] packet) throws IOException {
-		DatagramPacket packetOut = new DatagramPacket(packet, packet.length,server, port);
-		socket.send(packetOut);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.tm.discovery.transport.ITransport#receive(byte[])
-	 */
-	public String receive(byte[] packet) throws IOException {
-		DatagramPacket packetIn = new DatagramPacket(packet, packet.length);
-		socket.receive(packetIn);
-
-		return packetIn.getAddress().getHostAddress();
-	}
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/.classpath b/discovery/org.eclipse.tm.discovery.view/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.view/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.view/.cvsignore b/discovery/org.eclipse.tm.discovery.view/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.view/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.view/.project b/discovery/org.eclipse.tm.discovery.view/.project
deleted file mode 100644
index edc1b4cc7..000000000
--- a/discovery/org.eclipse.tm.discovery.view/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.view</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.view/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
deleted file mode 100644
index c2296e565..000000000
--- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.view.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.forms,
- org.eclipse.tm.discovery.engine,
- org.eclipse.tm.discovery.model,
- org.eclipse.tm.discovery.model.edit,
- org.eclipse.core.resources,
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.tm.discovery.wizard,
- org.eclipse.ui.ide
-Eclipse-LazyStart: false
-Import-Package: org.eclipse.emf.common.ui,
- org.eclipse.emf.common.util,
- org.eclipse.tm.internal.discovery.engine,
- org.eclipse.tm.internal.discovery.model.provider,
- org.eclipse.tm.internal.discovery.model.util
-Export-Package: org.eclipse.tm.internal.discovery.view
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.view/about.html b/discovery/org.eclipse.tm.discovery.view/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.view/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 2, 2006</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/discovery/org.eclipse.tm.discovery.view/build.properties b/discovery/org.eclipse.tm.discovery.view/build.properties
deleted file mode 100644
index 1f857cd2e..000000000
--- a/discovery/org.eclipse.tm.discovery.view/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/,\
-               .
-src.includes = about.html
-               
diff --git a/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif b/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif
deleted file mode 100644
index c3fe221a1..000000000
--- a/discovery/org.eclipse.tm.discovery.view/icons/system_view.gif
+++ /dev/null
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.properties b/discovery/org.eclipse.tm.discovery.view/plugin.properties
deleted file mode 100644
index 25f2a1a47..000000000
--- a/discovery/org.eclipse.tm.discovery.view/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery View
-providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.xml b/discovery/org.eclipse.tm.discovery.view/plugin.xml
deleted file mode 100644
index cacf9dcc6..000000000
--- a/discovery/org.eclipse.tm.discovery.view/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
-Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-This program and the accompanying materials are made available under the 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
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="Service Discovery"
-            id="org.eclipse.rse.discovery.category">
-      </category>
-      <view
-            category="org.eclipse.rse.discovery.category"
-            class="org.eclipse.tm.internal.discovery.view.ServiceDiscoveryView"
-            icon="icons/system_view.gif"
-            id="org.eclipse.rse.discovery.view.MultipleView"
-            name="Service Discovery Properties"/>
-   </extension>
-   
-</plugin>
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java
deleted file mode 100644
index 7c1fed5da..000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.view;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.rse.discovery.view"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java
deleted file mode 100644
index a5564273c..000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/Messages.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.view;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.view.messages"; //$NON-NLS-1$
-
-	public static String ServiceDiscoveryView_ClearActionText;
-
-	public static String ServiceDiscoveryView_ClearActionToolTipText;
-
-	public static String ServiceDiscoveryView_DiscoveryActionText;
-
-	public static String ServiceDiscoveryView_DiscoveryActionToolTipText;
-
-	public static String ServiceDiscoveryView_KeyColumnLabel;
-
-	public static String ServiceDiscoveryView_PropertiesTableTitle;
-
-	public static String ServiceDiscoveryView_ProtocolErrorDialogMessage;
-
-	public static String ServiceDiscoveryView_ProtocolErrorDialogTitle;
-
-	public static String ServiceDiscoveryView_RefreshActionText;
-
-	public static String ServiceDiscoveryView_RefreshActionToolTipText;
-
-	public static String ServiceDiscoveryView_ServicesTreeTitle;
-
-	public static String ServiceDiscoveryView_TransportErrorDialogMessage;
-
-	public static String ServiceDiscoveryView_TransportErrorDialogTitle;
-
-	public static String ServiceDiscoveryView_TransportNoAddressFoundDialogTitle;
-
-	public static String ServiceDiscoveryView_TransportNoAddressFoundDialogTransport;
-
-	public static String ServiceDiscoveryView_ValueColumnLabel;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java
deleted file mode 100644
index d76483f06..000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/ServiceDiscoveryView.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.view;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.protocol.IProtocol;
-import org.eclipse.tm.discovery.protocol.ProtocolFactory;
-import org.eclipse.tm.discovery.transport.ITransport;
-import org.eclipse.tm.discovery.transport.TransportFactory;
-import org.eclipse.tm.internal.discovery.engine.ServiceDiscoveryEngine;
-import org.eclipse.tm.internal.discovery.model.provider.ModelItemProviderAdapterFactory;
-import org.eclipse.tm.internal.discovery.wizard.ServiceDiscoveryWizardMainPage;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * View to display the Service Discovery model in a tree form.
- * 
- * @see TransportFactory
- * @see ServiceDiscoveryEngine
- * 
- */
-public class ServiceDiscoveryView extends ViewPart {
-	
-	//Tree widgets
-	private TreeViewer treeViewer;
-	private ViewerPane viewerPaneTree;
-	
-	// Table widgets
-	private TableViewer tableViewer;
-	private ViewerPane viewerPaneTable;
-		
-	private String query = null; 
-	
-	private Table table;
-	
-	private Action discoveryAction;
-	private Action refreshAction;
-	private Action clearAction;
-
-	private ITransport transport = null;
-	private IProtocol protocol = null;
-	
-	private ServiceDiscoveryWizardMainPage serviceDiscoveryWizardMainPage;
-	private Resource resource;
-
-	private ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getServiceDiscoveryEngine();
-	
-public void createPartControl(Composite parent) {
-	
-		resource = serviceDiscoveryEngine.getResource();
-		
-		List factories = new ArrayList();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ModelItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-		
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(
-				factories);
-		
-		Composite comp = new Composite(parent, SWT.NULL);
-		
-		GridLayout gridLayout = new GridLayout();
-        gridLayout.numColumns = 1;
-        comp.setLayout(gridLayout);
-        
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessVerticalSpace = true;
-		
-		SashForm sashForm = new SashForm(comp,SWT.NULL );
-		sashForm.setOrientation(SWT.HORIZONTAL);
-		
-		sashForm.setLayoutData(data);
-		
-		// TREE
-		
-		viewerPaneTree = new ViewerPane(getSite().getPage(), ServiceDiscoveryView.this) {
-			public Viewer createViewer(Composite composite) {
-				Tree tree = new Tree(composite, SWT.NULL);
-				ContainerCheckedTreeViewer treeViewer = new ContainerCheckedTreeViewer(tree);
-		
-				return treeViewer;
-			}
-		
-			public void requestActivation() {
-				super.requestActivation();
-			}
-		};
-		
-		Composite sashComposite = new Composite(sashForm,SWT.BORDER);
-		sashComposite.setLayout(new FillLayout());
-		
-		viewerPaneTree.createControl(sashComposite);
-		
-		treeViewer = (TreeViewer) viewerPaneTree.getViewer();
-		
-		treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-		
-		treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-		
-		viewerPaneTree.setTitle(Messages.ServiceDiscoveryView_ServicesTreeTitle, null);
-		
-		treeViewer.setInput(resource);
-		
-		new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-		
-		((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if(!event.getSelection().isEmpty())
-				{
-					EObject obj = (EObject)((IStructuredSelection) event.getSelection()).getFirstElement();
-					
-					if(obj instanceof Service)
-						tableViewer.setInput(obj);
-				}
-			}
-		});
-		
-		
-		// TABLE
-		
-		viewerPaneTable =
-			new ViewerPane(getSite().getPage(), ServiceDiscoveryView.this) {
-				public Viewer createViewer(Composite composite) {
-					return new TableViewer(composite);
-				}
-			};
-		
-		Composite c3 = new Composite(sashForm,SWT.BORDER);
-		c3.setLayout(new FillLayout());
-			
-		viewerPaneTable.createControl(c3);
-		tableViewer = (TableViewer)viewerPaneTable.getViewer();
-
-		viewerPaneTable.setTitle(Messages.ServiceDiscoveryView_PropertiesTableTitle, null);
-		
-		
-		table = tableViewer.getTable();
-		
-		TableLayout layout = new TableLayout();
-		table.setLayout(layout);
-		
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-
-		TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-		layout.addColumnData(new ColumnWeightData(3, 100, true));
-		objectColumn.setText(Messages.ServiceDiscoveryView_KeyColumnLabel);
-		objectColumn.setResizable(true);
-
-		TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-		layout.addColumnData(new ColumnWeightData(2, 100, true));
-		selfColumn.setText(Messages.ServiceDiscoveryView_ValueColumnLabel);
-		selfColumn.setResizable(true);
-		
-		tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-		
-		tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-		
-		makeActions();
-
-		getViewSite().getActionBars().getToolBarManager().add(discoveryAction);
-		getViewSite().getActionBars().getToolBarManager().add(new Separator());
-		getViewSite().getActionBars().getToolBarManager().add(refreshAction);
-		getViewSite().getActionBars().getToolBarManager().add(new Separator());
-		getViewSite().getActionBars().getToolBarManager().add(clearAction);
-	
-	}
-
-	private void update(String query, String address, String transportName, String protocolName, int timeOut)
-	{
-		this.query = query;
-		
-		//instantiate protocol and transport from factories (extensions)
-		
-		try {
-			protocol = ProtocolFactory.getProtocol(protocolName);
-		} catch (Exception e) {
-			MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_ProtocolErrorDialogTitle, Messages.ServiceDiscoveryView_ProtocolErrorDialogMessage+protocolName);
-		}
-		
-		try {
-			transport = TransportFactory.getTransport(transportName, address, timeOut);
-		} catch (UnknownHostException e) {
-			MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_TransportNoAddressFoundDialogTitle, Messages.ServiceDiscoveryView_TransportNoAddressFoundDialogTransport+address);
-		} catch (Exception e) {
-			MessageDialog.openError(new Shell(), Messages.ServiceDiscoveryView_TransportErrorDialogTitle, Messages.ServiceDiscoveryView_TransportErrorDialogMessage+transportName);
-		}
-		
-		
-		if(protocol != null && transport != null)
-		{
-			serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
-		}
-	}
-
-
-
-	private void makeActions() {
-		discoveryAction = new Action() {
-			public void run() {
-				
-				Wizard wizard = new Wizard(){
-					
-					public boolean performFinish() {
-						
-						update(serviceDiscoveryWizardMainPage.getQuery(),
-							   serviceDiscoveryWizardMainPage.getAddress(),	
-							   serviceDiscoveryWizardMainPage.getTransport(), 
-							   serviceDiscoveryWizardMainPage.getProtocol(), 
-							   serviceDiscoveryWizardMainPage.getTimeOut());
-					
-						return true;
-					}};
-				
-				serviceDiscoveryWizardMainPage = new ServiceDiscoveryWizardMainPage();
-					
-				wizard.addPage(serviceDiscoveryWizardMainPage);
-				
-				Shell shell = new Shell();
-				WizardDialog dialog = new WizardDialog(shell, wizard);
-				
-				Rectangle absoluteRect = shell.getMonitor().getClientArea();
-				Rectangle shellRect = shell.getBounds();
-				shell.setLocation(((absoluteRect.width - shellRect.width) / 2), ((absoluteRect.height - shellRect.height) / 2));
-				
-				dialog.open();
-			}
-		};
-		
-		discoveryAction.setText(Messages.ServiceDiscoveryView_DiscoveryActionText);
-		discoveryAction.setToolTipText(Messages.ServiceDiscoveryView_DiscoveryActionToolTipText);
-		discoveryAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_NEW_WIZARD));
-
-		refreshAction = new Action() {
-			public void run() {
-				if(query != null && transport != null && protocol != null)
-				{
-					serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
-				}
-			}
-		};
-		refreshAction.setText(Messages.ServiceDiscoveryView_RefreshActionText);
-		refreshAction.setToolTipText(Messages.ServiceDiscoveryView_RefreshActionToolTipText);
-		refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-		
-		
-		clearAction = new Action() {
-			public void run() {
-				resource.getContents().clear();
-				tableViewer.setInput(null);
-			}
-		};
-		clearAction.setText(Messages.ServiceDiscoveryView_ClearActionText);
-		clearAction.setToolTipText(Messages.ServiceDiscoveryView_ClearActionToolTipText);
-		clearAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-
-	}
-
-	public void setFocus() {
-	}
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties b/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties
deleted file mode 100644
index 61dd8f10f..000000000
--- a/discovery/org.eclipse.tm.discovery.view/src/org/eclipse/tm/internal/discovery/view/messages.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-ServiceDiscoveryView_ServicesTreeTitle=\ \ \ \ \ \ \ \ Services
-ServiceDiscoveryView_PropertiesTableTitle=\ \ \ \ \ \ \ \ Properties
-ServiceDiscoveryView_KeyColumnLabel=Key
-ServiceDiscoveryView_ValueColumnLabel=Value
-ServiceDiscoveryView_ProtocolErrorDialogTitle=Error
-ServiceDiscoveryView_ProtocolErrorDialogMessage=Error loading protocol 
-ServiceDiscoveryView_TransportNoAddressFoundDialogTitle=Error
-ServiceDiscoveryView_TransportNoAddressFoundDialogTransport=Error resolving address 
-ServiceDiscoveryView_TransportErrorDialogTitle=Error
-ServiceDiscoveryView_TransportErrorDialogMessage=Error loading transport 
-ServiceDiscoveryView_DiscoveryActionText=New Service Discovery
-ServiceDiscoveryView_DiscoveryActionToolTipText=New Service Discovery
-ServiceDiscoveryView_RefreshActionText=Refresh
-ServiceDiscoveryView_RefreshActionToolTipText=Refresh
-ServiceDiscoveryView_ClearActionText=Clear
-ServiceDiscoveryView_ClearActionToolTipText=Clear
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.classpath b/discovery/org.eclipse.tm.discovery.wizard/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.cvsignore b/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.project b/discovery/org.eclipse.tm.discovery.wizard/.project
deleted file mode 100644
index e2bf0a62d..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.discovery.wizard</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs b/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b6e2f767c..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 08 00:09:13 CEST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs b/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
deleted file mode 100644
index 0e2b8fb27..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.discovery.wizard
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.discovery.wizard.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.tm.discovery.engine,
- org.eclipse.tm.discovery.model,
- org.eclipse.tm.discovery.model.edit
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.discovery,org.eclipse.tm.discovery.view"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.wizard/about.html b/discovery/org.eclipse.tm.discovery.wizard/about.html
deleted file mode 100644
index 460233046..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/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 2, 2006</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/discovery/org.eclipse.tm.discovery.wizard/build.properties b/discovery/org.eclipse.tm.discovery.wizard/build.properties
deleted file mode 100644
index 815bfc742..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-##################################################################################
-# Copyright (c) 2006 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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 Orús (Symbian) - initial API and implementation
-##################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               .
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
deleted file mode 100644
index f247b20b6..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = TM Service Discovery Wizard
-providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java
deleted file mode 100644
index 340aa608b..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Activator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.wizard.pages"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java
deleted file mode 100644
index a4c01b015..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.tm.internal.discovery.wizard.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
deleted file mode 100644
index 5b752b612..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.tm.discovery.model.Device;
-import org.eclipse.tm.discovery.model.Pair;
-import org.eclipse.tm.discovery.model.Service;
-import org.eclipse.tm.discovery.model.ServiceType;
-import org.eclipse.tm.discovery.protocol.IProtocol;
-import org.eclipse.tm.discovery.protocol.ProtocolFactory;
-import org.eclipse.tm.discovery.transport.ITransport;
-import org.eclipse.tm.discovery.transport.TransportFactory;
-import org.eclipse.tm.internal.discovery.engine.ServiceDiscoveryEngine;
-import org.eclipse.tm.internal.discovery.model.provider.ModelItemProviderAdapterFactory;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
-
-/**
- * Wizard page providing the list of discovered services
- */
-
-public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
-	
-	//tree widgets
-	private TreeViewer treeViewer;
-	private ViewerPane viewerPaneTree;
-	private ViewerFilter filter;
-	
-	//table widgets
-	private TableViewer tableViewer;
-	private ViewerPane viewerPaneTable;
-	private Table table;
-	private TableEditor editor;
-	
-	private ComposedAdapterFactory adapterFactory;
-	
-	//button widgets
-	private Button showAllButton;
-	
-	//static service discovery engine
-	private final ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getServiceDiscoveryEngine();
-	
-	//service discovery settings
-	private String query = null; 
-	private String address = null; 
-	private String transportName = null;
-	private String protocolName = null;
-	private int timeOut = 500; 
-	
-	private Service lastSelectedService = null;
-	
-	private Vector supportedServicesType = new Vector();
-	
-	/**
-	 * Constructor for the wizard page performing and displayin the results of the service discovery
-	 * 
-	 * @param query
-	 * Query for the service discovery action
-	 * @param address
-	 * Address of the target device
-	 * @param transportName
-	 * Name of the transport implementation to be used
-	 * @param protocolName
-	 * Name of the protocol implementation to be used
-	 * @param timeOut
-	 * Timeout to be used in the transport
-	 */
-	
-	public ServiceDiscoveryWizardDisplayPage(String query, String address, String transportName, String protocolName, int timeOut) {
-		super("wizardPage2"); //$NON-NLS-1$
-		setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.WizardPageTitle")); //$NON-NLS-1$
-		setDescription(Messages.getString("ServiceDiscoveryWizardDisplayPage.WizardPageDescription")); //$NON-NLS-1$
-		
-		//load all service id's from the extension point registry
-		//this id will be used to filter the supported sytem types
-		
-		IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.core","systemTypes"); //$NON-NLS-1$ //$NON-NLS-2$
-		IConfigurationElement[] ce = ep.getConfigurationElements();
-		for (int i = 0; i < ce.length; i++) {
-			String id = ce[i].getAttribute("name"); //$NON-NLS-1$
-			if(id!=null)
-				supportedServicesType.add(id);
-		}
-		
-		this.query = query;
-		this.address = address;
-		this.transportName = transportName;
-		this.protocolName = protocolName;
-		this.timeOut = timeOut;
-		
-	}
-	
-	/**
-	 * Refresh the contents of the service discovery model
-	 * 
-	 * @param query
-	 * Query for the service discovery action
-	 * @param address
-	 * Address of the target device
-	 * @param transportName
-	 * Name of the transport implementation to be used
-	 * @param protocolName
-	 * Name of the protocol implementation to be used
-	 * @param timeOut
-	 * Timeout to be used in the transport
-	 */
-	public void update(String query, String address, String transportName, String protocolName, int timeOut)
-	{
-		//update settings
-		this.query = query;
-		this.address = address;
-		this.transportName = transportName;
-		this.protocolName = protocolName;
-		this.timeOut = timeOut;
-		
-		//instantiate protocol and transport from factories (extensions)
-		//and perform the service discovery action
-		
-		IProtocol protocol = null;
-		ITransport transport = null;
-		
-		try {
-			protocol = ProtocolFactory.getProtocol(protocolName);
-		} catch (Exception e) {
-			MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.ProtocolErrorTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.ProtocolErrorMessage")+protocolName); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		
-		try {
-			transport = TransportFactory.getTransport(transportName, address, timeOut);
-		} catch (UnknownHostException e) {
-			MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundMessage")+address); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (Exception e) {
-			MessageDialog.openError(new Shell(), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportErrorTitle"), Messages.getString("ServiceDiscoveryWizardDisplayPage.TransportErrorMessage")+transportName); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		
-		if(protocol != null && transport != null)
-		{
-			try{
-				serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport);
-			}catch(Exception e){}
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		List factories = new ArrayList();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ModelItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-		
-		adapterFactory = new ComposedAdapterFactory(factories);
-		
-		Composite comp = new Composite(parent, SWT.NULL);
-		
-		GridLayout gridLayout = new GridLayout();
-        gridLayout.numColumns = 1;
-        comp.setLayout(gridLayout);
-        
-        //TOOLBAR
-        
-        createToolBar(comp);
-     	
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessVerticalSpace = true;
-		
-		SashForm sashForm = new SashForm(comp,SWT.NULL );
-		sashForm.setOrientation(SWT.HORIZONTAL);
-		
-		sashForm.setLayoutData(data);
-		
-		// TREE
-		
-		Composite sashComposite = new Composite(sashForm,SWT.BORDER);
-		sashComposite.setLayout(new FillLayout());
-		
-		createTree(sashComposite);
-		
-		// TABLE
-		
-		Composite innerComposite = new Composite(sashForm,SWT.BORDER);
-		innerComposite.setLayout(new FillLayout());
-		
-		createTable(innerComposite);
-		
-		
-		// SHOW ALL SERVICES BUTTON
-		
-		createShowAllButton(comp);
-		
-		
-		update(query, address, transportName, protocolName, timeOut);
-		
-		setPageComplete(false);
-		
-		setControl(comp);
-		
-	}
-	
-	/*
-	 * ToolBar of the wizard page
-	 */
-	private void createToolBar(Composite comp)
-	{
-		ToolBar toolBar = new ToolBar(comp,SWT.HORIZONTAL | SWT.FLAT | SWT.LEFT | SWT.WRAP );
-		
-		ToolItem refreshButton = new ToolItem(toolBar, SWT.NULL);
-		refreshButton.addListener(SWT.Selection, new Listener(){
-			public void handleEvent(Event event) {
-				update(query, address, transportName, protocolName, timeOut);
-			}
-		});
-		
-		refreshButton.setToolTipText(Messages.getString("ServiceDiscoveryWizardDisplayPage.RefreshButtonToolTipText")); //$NON-NLS-1$
-		refreshButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_REDO).createImage());
-		
-		ToolItem cleanButton = new ToolItem(toolBar, SWT.NULL);
-		cleanButton.addListener(SWT.Selection, new Listener(){
-			public void handleEvent(Event event) {
-				serviceDiscoveryEngine.getResource().getContents().clear();
-				tableViewer.setInput(null);
-			}
-		});
-		
-		cleanButton.setToolTipText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ClearButtonToolTipText")); //$NON-NLS-1$
-		cleanButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE).createImage());
-		
-	}
-	
-	/*
-	 * Tree of the wizard page
-	 */
-	private void createTree(Composite comp)
-	{
-		
-		viewerPaneTree = new ViewerPane(  PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(),
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) {
-			public Viewer createViewer(Composite composite) {
-				Tree tree = new Tree(composite, SWT.CHECK);
-				ContainerCheckedTreeViewer treeViewer = new ContainerCheckedTreeViewer(tree);
-		
-				return treeViewer;
-			}
-		
-			public void requestActivation() {
-				super.requestActivation();
-			}
-		};
-		
-		viewerPaneTree.createControl(comp);
-		
-		treeViewer = (TreeViewer) viewerPaneTree.getViewer();
-		
-		treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-		
-		treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-		
-		viewerPaneTree.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.ServicesTreeTitle"), null); //$NON-NLS-1$
-		
-		treeViewer.setInput(serviceDiscoveryEngine.getResource());
-		
-		new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-		
-		((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if(!event.getSelection().isEmpty())
-				{
-					EObject obj = (EObject)((IStructuredSelection) event.getSelection()).getFirstElement();
-					
-					if(obj instanceof Service)
-					{
-						tableViewer.setInput(obj);
-						lastSelectedService = (Service)obj;
-					}
-				}
-			}
-		});
-		
-		
-		((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-		
-					ContainerCheckedTreeViewer treeViewer = (ContainerCheckedTreeViewer) event.getSource();
-		
-					if(treeViewer.getCheckedElements().length > 0)
-						setPageComplete(true);
-					else
-						setPageComplete(false);
-						
-				}
-			});
-		
-		filter = new ViewerFilter(){
-
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				boolean supported = true; 
-				if(element instanceof ServiceType) {
-					String serviceTypeName = ((ServiceType)element).getName();
-					if(!supportedServicesType.contains(serviceTypeName))
-					{
-						supported = false;
-					}
-				 }
-				return supported;
-		
-			}};
-			
-		((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter);			
-		
-	}
-	
-	/*
-	 * Table of the wizard page
-	 */
-	private void createTable(Composite comp)
-	{
-		viewerPaneTable =
-			new ViewerPane(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), 
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) {
-				public Viewer createViewer(Composite composite) {
-					return new TableViewer(composite);
-				}
-			};
-			
-			viewerPaneTable.createControl(comp);
-			tableViewer = (TableViewer)viewerPaneTable.getViewer();
-
-			viewerPaneTable.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle"), null); //$NON-NLS-1$
-			
-			
-			table = tableViewer.getTable();
-			
-			TableLayout layout = new TableLayout();
-			table.setLayout(layout);
-			
-			table.setHeaderVisible(true);
-			table.setLinesVisible(true);
-
-			TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-			layout.addColumnData(new ColumnWeightData(3, 100, true));
-			objectColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.KeyColumnLabel")); //$NON-NLS-1$
-			objectColumn.setResizable(true);
-
-			TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-			layout.addColumnData(new ColumnWeightData(2, 100, true));
-			selfColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ValueColumnLabel")); //$NON-NLS-1$
-			selfColumn.setResizable(true);
-			
-			tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-			
-			tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-			
-			editor = new TableEditor(table);
-			editor.horizontalAlignment = SWT.LEFT;
-			editor.grabHorizontal = true;
-			table.addListener (SWT.MouseDown, new Listener () {
-					public void handleEvent (Event event) {
-						Rectangle clientArea = table.getClientArea ();
-						Point pt = new Point (event.x, event.y);
-						int index = table.getTopIndex ();
-						while (index < table.getItemCount ()) {
-							boolean visible = false;
-							final TableItem item = table.getItem (index);
-							for (int i=table.getColumnCount()-1; i<table.getColumnCount(); i++) {
-								Rectangle rect = item.getBounds (i);
-								if (rect.contains (pt)) {
-									final int column = i;
-									final Text text = new Text (table, SWT.NONE);
-									Listener textListener = new Listener () {
-										public void handleEvent (final Event e) {
-											switch (e.type) {
-												case SWT.FocusOut:
-													item.setText (column, text.getText ());
-													text.dispose ();
-												
-													//update model when focus out
-													updatePairs(item.getText(0),item.getText(1));
-													break;
-												
-												case SWT.Traverse:
-													switch (e.detail) {
-														case SWT.TRAVERSE_RETURN:
-															item.setText (column, text.getText ());
-															
-															//update model when pressing return
-															updatePairs(item.getText(0),item.getText(1));
-															text.dispose ();
-															e.doit = false;
-															break;
-														case SWT.TRAVERSE_ESCAPE:
-															text.dispose ();
-															e.doit = false;
-													}
-													break;
-											}
-										}
-									};
-									text.addListener (SWT.FocusOut, textListener);
-									text.addListener (SWT.Traverse, textListener);
-									editor.setEditor (text, item, i);
-									text.setText (item.getText (i));
-									text.selectAll ();
-									text.setFocus ();
-									return;
-								}
-								if (!visible && rect.intersects (clientArea)) {
-									visible = true;
-								}
-							}
-							if (!visible) return;
-							index++;
-						}
-					
-					}
-				});
-		
-	}
-	
-	/*
-	 * Check box to show all services
-	 */
-	private void createShowAllButton(Composite comp)
-	{
-		showAllButton = new Button(comp,SWT.CHECK);
-		showAllButton.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ShowAllServicesButtonText")); //$NON-NLS-1$
-		
-		showAllButton.addSelectionListener(new SelectionListener(){
-
-			public void widgetDefaultSelected(SelectionEvent e) {}
-
-			public void widgetSelected(SelectionEvent e) {
-				
-				 Object src = e.getSource();
-				 if(((Button)src).getSelection())
-				 {
-					 ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).removeFilter(filter);
-				 }
-				 else
-				 {
-					 ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter);	
-				 }
-			}
-		});
-	}
-	
-	/*
-	 * Update the service pairs information in the model 
-	 */
-	private void updatePairs(String key, String value)
-	{
-		Iterator pairsIterator = lastSelectedService.getPair().iterator();
-		while(pairsIterator.hasNext())
-		{
-			Pair pair = (Pair)pairsIterator.next();
-			if(pair.getKey().equals(key))
-			{
-				pair.setValue(value);
-			}
-		}
-	}
-	
-	/**
-	 * Get the <code>Service<code> objects selected in the tree view from the specified host
-	 * 
-	 * @param address
-	 * Address of the host which services are queried
-	 * @return
-	 * Vector containing the <code>Service<code> selected
-	 * 
-	 * @see Service
-	 */
-	public Vector getSelectedServices(String address)
-	{
-		Vector services = new Vector();
-		
-		Object[] checkedElements = ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).getCheckedElements();
-		for(int i=0; i<checkedElements.length; i++)
-		{
-			if(checkedElements[i] instanceof Service)
-			{
-				Service service = (Service)checkedElements[i];
-				if(((Device)service.eContainer().eContainer()).getAddress().equalsIgnoreCase(address))
-				{
-					services.add(service);
-				}
-			}
-		}
-		
-		return services;
-	}
-	
-	/**
-	 * Get the addresses of the discovered hosts that have at least one service selected 
-	 * 
-	 * @return
-	 * String[] containing the addresses of the selected hosts
-	 */
-	public String[] getAddresses()
-	{
-		Vector addressVector = new Vector();
-		
-		Object[] checkedElements = ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).getCheckedElements();
-		for(int i=0; i<checkedElements.length; i++)
-		{
-			if(checkedElements[i] instanceof Device)
-			{
-				addressVector.add(((Device)checkedElements[i]).getAddress());
-			}
-		}
-		
-		String[] addresses = new String[addressVector.size()];
-		addressVector.copyInto(addresses);
-		
-		return addresses;
-	}
-
-	 /* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-	        return isPageComplete();
-	    }
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java
deleted file mode 100644
index 546699a44..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the 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
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.discovery.protocol.ProtocolFactory;
-import org.eclipse.tm.discovery.transport.TransportFactory;
-
-/**
- * Main wizard page for the service discovery process.</br>
- * It provides a wizard page with text boxes and combo boxes to gather the following data:
- * <ul>
- * <li>Protocol
- * <li>Transport
- * <li>Query
- * <li>Timeout
- * </li>
- * 
- * @see WizardPage
- */
-
-public class ServiceDiscoveryWizardMainPage extends WizardPage {
-	
-	// settings
-	private int timeOut = 500; //ms
-	
-	// widgets
-	private Combo queryCombo, transportCombo, protocolCombo;
-	private Text addressText, timeOutText;
-	
-	/**
-	 * Wizard main page constructor
-	 */
-	public ServiceDiscoveryWizardMainPage() {
-		super("wizardPage1"); //$NON-NLS-1$
-		setTitle(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageTitle")); //$NON-NLS-1$
-		setDescription(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageDescription")); //$NON-NLS-1$
-		setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		FillLayout layout = new FillLayout();
-		layout.type = SWT.VERTICAL;
-		
-		Composite comp = new Composite(parent,SWT.NULL);
-		comp.setLayout(layout);
-		
-		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.AddressLabel")); //$NON-NLS-1$
-		
-		addressText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
-		addressText.addModifyListener(new ModifyListener(){
-
-			public void modifyText(ModifyEvent e) {
-				if(((Text)e.getSource()).getText().equals("")) //$NON-NLS-1$
-				{
-					setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
-					setPageComplete(false);
-				}	
-				else
-				{
-					setErrorMessage(null);
-					setPageComplete(true);
-				}
-				
-			}
-		});
-		
-		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TransportLabel")); //$NON-NLS-1$
-		
-		transportCombo = new Combo(comp, SWT.READ_ONLY);
-		transportCombo.setItems(TransportFactory.getTransportList());
-		transportCombo.select(0);
-		
-		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.ProtocolLabel")); //$NON-NLS-1$
-		
-		protocolCombo = new Combo(comp, SWT.READ_ONLY);
-		protocolCombo.setItems(ProtocolFactory.getProtocolList());
-		protocolCombo.select(0);
-		
-		protocolCombo.addSelectionListener(new SelectionListener(){
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent event) {
-				String selectedProtocol = ((Combo)event.getSource()).getText();
-				
-				String[] queries = new String[]{};
-				try {
-					queries = ProtocolFactory.getQueryList(selectedProtocol);
-				} catch (CoreException e) {}
-				queryCombo.removeAll();
-				queryCombo.setItems(queries);
-				queryCombo.select(0);
-			}
-		});
-		
-		
-		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel")); //$NON-NLS-1$
-		
-		queryCombo = new Combo(comp, SWT.NONE);
-		String[] queries = new String[]{};
-		try {
-			queries = ProtocolFactory.getQueryList(protocolCombo.getText());
-		} catch (CoreException e) {}
-		for (int i = 0; i < queries.length; i++) {
-			queryCombo.add(queries[i]);
-		}
-		queryCombo.select(0);
-		
-		
-		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutLabel")); //$NON-NLS-1$
-		
-		timeOutText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
-		timeOutText.setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutValue")); //$NON-NLS-1$
-		timeOutText.redraw();
-		
-		setPageComplete(false);
-		
-		setControl(comp);
-		
-	}
-	
-	/**
-	 * Gets the service discovery command
-	 * @return command introduced in the settings window
-	 */
-	public String getQuery() {
-		return queryCombo.getText();
-	}
-
-	/**
-	 * Gets the service discovery address
-	 * @return address introduced in the settings window
-	 */
-	public String getAddress() {
-		return addressText.getText();
-	}
-	
-	/**
-	 * Gets the service discovery transport
-	 * @return address introduced in the settings window
-	 */
-	public String getTransport() {
-		return transportCombo.getText();
-	}
-	
-	/**
-	 * Gets the service discovery protocol
-	 * @return address introduced in the settings window
-	 */
-	public String getProtocol() {
-		return protocolCombo.getText();
-	}
-
-	/**
-	 * Gets the service discovery timeout
-	 * @return timeout introduced in the settings window
-	 */
-	public int getTimeOut() {
-		
-		try{
-			timeOut = Integer.parseInt(timeOutText.getText().trim());
-		}catch(NumberFormatException e){}
-		
-		return timeOut;
-	}
-
-	 /* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-	        return isPageComplete();
-	    }
-
-	
-}
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
deleted file mode 100644
index 62313ffcb..000000000
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the 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
-##################################################################################
-
-ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.WizardPageDescription=Select discovered services.
-ServiceDiscoveryWizardMainPage.AddressLabel=Address:
-ServiceDiscoveryWizardMainPage.TransportLabel=Transport:
-ServiceDiscoveryWizardMainPage.ProtocolLabel=Protocol:
-ServiceDiscoveryWizardMainPage.TimeOutLabel=Timeout (ms):
-ServiceDiscoveryWizardMainPage.TimeOutValue=500
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorTitle=Error
-ServiceDiscoveryWizardMainPage.WizardPageDescription=Discover available services in the target device.
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorMessage=Error loading protocol 
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundMessage=Error resolving address 
-ServiceDiscoveryWizardDisplayPage.TransportErrorTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportErrorMessage=Error loading transport 
-ServiceDiscoveryWizardDisplayPage.RefreshButtonToolTipText=Refresh
-ServiceDiscoveryWizardDisplayPage.ClearButtonToolTipText=Clear
-ServiceDiscoveryWizardDisplayPage.ServicesTreeTitle=\ \ \ \ \ \ \ \ Services
-ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle=\ \ \ \ \ \ \ \ Properties
-ServiceDiscoveryWizardDisplayPage.KeyColumnLabel=Key
-ServiceDiscoveryWizardMainPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.ValueColumnLabel=Value
-ServiceDiscoveryWizardMainPage.ProvideAddressError=Provide a valid address
-ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel=Discovery Query:
-ServiceDiscoveryWizardDisplayPage.ShowAllServicesButtonText=Show all services
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/about.html b/releng/org.eclipse.rse.build/about.html
deleted file mode 100644
index 460233046..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 2, 2006</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 ebe9d16ff..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 1.0 Stream 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 ad3e9ab56..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 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/>archived downloads</font> 
-      <br>
-      <font class=indexsub>archived downloads from the dsdp-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/dsdp/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/dsdp/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/index.php/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/newsgroups">newsgroup</a>,
-<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</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/dsdp/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;
-				}
-			}
-			$aDropDirectory.closedir();
-			// 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.closedir();
- ?>
- 
-<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 3f351726e..000000000
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ /dev/null
@@ -1,86 +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 
-#*******************************************************************************
-#:#
-#:# 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/common/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-export PATH=/shared/webtools/apps/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/dsdp/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 f1ef55e4f..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# 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 
-#*******************************************************************************
-#:#
-#:# Bootstrapping script to perform S-builds and R-builds on build.eclipse.org
-#:# Will build based on HEAD of all mapfiles, and update the testUpdates as well
-#:#
-#:# Usage:
-#:#    doit_irsbuild.sh {buildType} [buildId]
-#:# Examples:
-#:#    doit_irsbuild.sh R 1.0
-#:#    doit_irsbuild.sh S 1.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/common/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/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|xR) ok=1 ;;
-  xM) mapTag=R1_0_maintenance ; ok=1 ;;
-  *) ok=0 ;;
-esac
-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/ws2
-#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'`
-log=$HOME/ws2/log-${buildType}$stamp.txt
-touch $log
-cvs -q update -RPd >> $log 2>&1
-daystamp=`date +'%Y%m%d*%H'`
-
-echo "Running the builder..."
-./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1
-tail -50 $log
-
-#update the main download and archive pages
-cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-
-#Fixup permissions and group id on download.eclpse.org (just to be safe)
-chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
-chmod -R g+w drops/${buildType}*${daystamp}*
-
-#Check the publishing
-cd $HOME/ws2/publish
-cd ${buildType}*${daystamp}*
-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_SIGN=1
-  fi
-  
-  if [ "$DO_SIGN" = "1" ]; then
-    #sign the zipfiles
-    ${mydir}/batch_sign.sh `pwd`
-  fi
-
-  if [ ${buildType} != M ]; then
-    #update the doc server
-    rm -f ../N.latest/RSE-SDK-*.zip
-    cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip
-    #chmod g+w ../N.latest/RSE-SDK-latest.zip
-    #chgrp dsdp-tmadmin ../N.latest/RSE-SDK-latest.zip
-
-    if [ ${buildType} != N ]; then
-      #Update the testUpdates sites
-      echo "Refreshing update site"
-      cd $HOME/downloads-tm/testUpdates/bin
-      ./mkTestUpdates.sh
-      #echo "Refreshing signedUpdates site"
-      #cd $HOME/downloads-tm/signedUpdates/bin
-      #./mkTestUpdates.sh
-    fi
-  fi
-  
-  cd "$curdir"
-else
-  echo "package.count missing, release seems failed"
-fi
-chgrp dsdp-tm-rse $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 19c65ecc5..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ /dev/null
@@ -1,77 +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 
-#*******************************************************************************
-#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/common/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH
-#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/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/ws2
-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/ws2/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 -50 $log
-
-#update the main download and archive pages
-cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-
-#Fixup permissions and group id on download.eclpse.org (just to be safe)
-chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
-chmod -R g+w drops/${buildType}*${daystamp}*
-
-#Copy latest SDK in order to give access to DOC server
-cd $HOME/ws2/publish
-FILES=`ls N${daystamp}*/RSE-SDK-N${daystamp}*.zip 2>/dev/null`
-echo "FILES=$FILES"
-if [ "$FILES" != "" ]; then
-  rm N.latest/RSE-SDK-N*.zip
-  cp N${daystamp}*/RSE-SDK-N${daystamp}*.zip N.latest
-  cd N.latest
-  mv -f RSE-SDK-N${daystamp}*.zip RSE-SDK-latest.zip
-  chgrp dsdp-tmadmin RSE-SDK-latest.zip
-  chmod g+w RSE-SDK-latest.zip
-fi
-
-#Cleanup old nightly builds (leave only last 5 in place)
-cd $HOME/ws2/publish
-ls -d N200* | sort | head -n-5 | xargs rm -rf
-
diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh
deleted file mode 100644
index 12e9c2ce6..000000000
--- a/releng/org.eclipse.rse.build/bootstrap.sh
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2005, 2006 IBM Corporation and 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:
-# 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/dsdp co -r $customBuilderTag org.eclipse.tm.rse/releng/org.eclipse.rse.build
-if [ "$tagMaps" == "-DtagMaps=true" ]; then  
-  cvs -d moberhuber@dev.eclipse.org:/cvsroot/dsdp 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/common/ibm-java2-ppc64-50
-	#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.takefive.co.at" ]
-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/startup.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 002934fcb..000000000
--- a/releng/org.eclipse.rse.build/build.pl
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/perl
-
-# 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)", "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);
-
-$incantation = "java -cp ${basebuilder}/startup.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 ";
-}
-
-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 1ed889c2c..000000000
--- a/releng/org.eclipse.rse.build/build.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# Martin Oberhuber (WindRiver) - 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
-
-#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
-
-zipargs=
-tarargs=--owner=0 --group=0
-
-#Runtime libs - needed for headless build of Jakarta 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 64bc42c3a..000000000
--- a/releng/org.eclipse.rse.build/build.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/ruby
-# 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)", "P")
-mydstamp = Time.now.strftime("%Y%m%d")
-mytstamp = Time.now.strftime("%H%M")
-buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
-
-command = "java -cp #{basebuilder}/startup.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
-
-puts(command)
-
-system(command)
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
deleted file mode 100644
index 1ff4563fe..000000000
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ /dev/null
@@ -1,569 +0,0 @@
-<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.apache.oro" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.apache.commons.net" />
-		</ant>
-		-->
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.core" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.dstore" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.ftp" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.local" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.ssh" />
-		</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.remotecdt" />
-		</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.efs" />
-		</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>
-	</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           -->
-	<!-- ===================================================================== -->
-
-	<!-- No separate assembly, included in FTP ::
-	<target name="assemble.org.apache.oro">
-		<property name="archiveName" value="jakarta-oro-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-	<target name="assemble.org.apache.commons.net">
-		<property name="archiveName" value="commons-net-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-	-->
-
-	<target name="assemble.org.eclipse.rse.core">
-		<property name="archiveName" value="RSE-runtime-core-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.dstore">
-		<property name="archiveName" value="RSE-runtime-dstore-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.ftp">
-		<property name="archiveName" value="RSE-runtime-ftp-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.local">
-		<property name="archiveName" value="RSE-runtime-local-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.ssh">
-		<property name="archiveName" value="RSE-runtime-ssh-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.sdk">
-		<property name="archiveName" value="RSE-SDK-${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.efs">
-		<property name="archiveName" value="RSE-efs-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.remotecdt">
-		<property name="archiveName" value="RSE-remotecdt-${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="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>
-		<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="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="dsdp-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"/>
-			</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="feature" />
-			<property name="id" value="org.apache.commons.net" />
-		</ant>
-		-->
-		<mkdir dir="${buildDirectory}/features"/>
-		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="feature@org.apache.oro"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.oro.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
-		<eclipse.fetch
-			elements="feature@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="preFetch" depends="preFetchOrbitBundles">
-	</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="hideServerStuff" />
-		<antcall target="allElements">
-			<param name="target" value="gatherSources" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-		<antcall target="revealServerStuff" />
-	</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="**/*.bin.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="M"/></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="*"/>
-		</copy>
-		<copy todir="${working}/collector">
-			<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="*"/>
-		</copy>
-	</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>
-
-	<!-- ===================================================================== -->
-	<!-- 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 131c40e84..000000000
--- a/releng/org.eclipse.rse.build/downloads/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/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt
deleted file mode 100644
index 25d58ed18..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[]=M&
-dropType[]=Latest Release&dropType[]=2.0 Stream Stable Build&dropType[]=2.0 Stream Integration Build&dropType[]=2.0 Stream Nightly Build&dropType[]=1.0 Stream Maintenance 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 cf26d29e0..000000000
--- a/releng/org.eclipse.rse.build/downloads/index.php
+++ /dev/null
@@ -1,241 +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 dsdp-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/dsdp/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/dsdp/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/index.php/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/newsgroups">newsgroup</a>,
-<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</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/dsdp/tm/updates">TM update site</a>.</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/dsdp/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/dsdp/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;
-				}
-			}
-			$aDropDirectory.closedir();
-			// 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.closedir();
- ?>
- 
-<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 eddadec9f..000000000
--- a/releng/org.eclipse.rse.build/fetchBuilder.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl
-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/dsdp ';
-$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 cf782ac24..000000000
--- a/releng/org.eclipse.rse.build/go.sh
+++ /dev/null
@@ -1,66 +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 
-#*******************************************************************************
-# 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}"
-
-command="java -cp ${basebuilder}/startup.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 -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 ec5a2b802..000000000
--- a/releng/org.eclipse.rse.build/maps/discovery.map
+++ /dev/null
@@ -1,9 +0,0 @@
-feature@org.eclipse.tm.discovery=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.engine=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,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 b0f39e3f3..000000000
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ /dev/null
@@ -1,52 +0,0 @@
-feature@org.eclipse.rse=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
-feature@org.eclipse.rse.core=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.efs=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.efs-feature
-feature@org.eclipse.rse.examples=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-feature@org.eclipse.rse.remotecdt=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature
-feature@org.eclipse.rse.sdk=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.ssh=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.tests=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
-plugin@org.eclipse.dstore.core=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.doc.isv=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
-plugin@org.eclipse.dstore.extra=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse
-plugin@org.eclipse.rse.connectorservice.dstore=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.connectorservice.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
-plugin@org.eclipse.rse.core=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.doc.isv=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
-plugin@org.eclipse.rse.doc.user=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
-plugin@org.eclipse.rse.dstore.security=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.eclipse.filesystem=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.eclipse.filesystem
-plugin@org.eclipse.rse.examples.daytime=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
-plugin@org.eclipse.rse.examples.tutorial=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
-plugin@org.eclipse.rse.files.ui=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.logging=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
-plugin@org.eclipse.rse.processes.ui=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.remotecdt=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt
-plugin@org.eclipse.rse.sdk=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
-plugin@org.eclipse.rse.services=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.files.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
-plugin@org.eclipse.rse.subsystems.processes.core=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.processes.shell.linux=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
-plugin@org.eclipse.rse.subsystems.shells.core=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.tests=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
-plugin@org.eclipse.rse.tests.framework=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
\ 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 48ce76951..000000000
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ /dev/null
@@ -1,9 +0,0 @@
-feature@org.eclipse.tm.terminal=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.sdk=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
-feature@org.eclipse.tm.terminal.serial=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
-feature@org.eclipse.tm.terminal.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
-feature@org.eclipse.tm.terminal.view=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=v20070222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.serial=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
-plugin@org.eclipse.tm.terminal.ssh=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
-plugin@org.eclipse.tm.terminal.view=v20070221,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,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/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map
deleted file mode 100644
index e8403efcb..000000000
--- a/releng/org.eclipse.rse.build/maps/tmcore.map
+++ /dev/null
@@ -1,4 +0,0 @@
-feature@org.apache.commons.net=v20061031,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons.net-feature
-feature@org.apache.oro=v20061215,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.oro-feature
-plugin@org.apache.commons.net=v20061222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.commons.net
-plugin@org.apache.oro=v20061222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.oro
\ 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 e807f6032..000000000
--- a/releng/org.eclipse.rse.build/message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-The build is available at
-
-	http://download.eclipse.org/dsdp/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 e6047a91f..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/dsdp/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 6aac9ff94..000000000
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ /dev/null
@@ -1,80 +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 
-#*******************************************************************************
-#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`
-
-# 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"
-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}"
-
-command="java -cp ${basebuilder}/startup.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 -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 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 992cacb85..000000000
--- a/releng/org.eclipse.rse.build/setup.sh
+++ /dev/null
@@ -1,122 +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 
-#*******************************************************************************
-#
-# 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/ws2 in order for the mkTestUpdateSite.sh
-# script to find the published packages
-#
-# Bootstrapping: Get this script by
-# 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=DSDP_Project&content-type=text/plain"
-# sh setup.sh
-# ./doit_ibuild.sh
-# cd testUpdates/bin
-# mkTestUpdates.sh
-
-curdir=`pwd`
-
-# prepare the base Eclipse installation in folder "eclipse"
-if [ ! -f eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070202.jar ]; then
-  ## Eclipse Platform 3.3M5
-  #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M5-200702091006/eclipse-platform-3.3M5-linux-gtk-ppc.tar.gz"
-  #tar xfvz eclipse-platform-3.3M5-linux-gtk-ppc.tar.gz
-  #rm eclipse-platform-3.3M5-linux-gtk-ppc.tar.gz
-  # Eclipse SDK 3.3M5: Need the SDK because EMF needs JDT (somehow)
-  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M5-200702091006/eclipse-SDK-3.3M5-linux-gtk-ppc.tar.gz"
-  tar xfvz eclipse-SDK-3.3M5-linux-gtk-ppc.tar.gz
-  rm eclipse-SDK-3.3M5-linux-gtk-ppc.tar.gz
-fi
-if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200702161600.jar ]; then
-  # CDT 4.0.0 Runtime
-  wget "http://download.eclipse.org/tools/cdt/releases/europa/dist/4.0.0M5/cdt-4.0.0-M5-linux.ppc.tar.gz"
-  tar xfvz cdt-4.0.0-M5-linux.ppc.tar.gz
-  rm cdt-4.0.0-M5-linux.ppc.tar.gz
-fi
-if [ ! -f eclipse/plugins/org.eclipse.emf_2.2.0.v200702121527.jar ]; then
-  # EMF 2.3.0 Runtime
-  wget "http://download.eclipse.org//modeling/emf/emf/downloads/drops/2.3.0/S200702121527/emf-sdo-runtime-2.3.0M5.zip"
-  unzip -o emf-sdo-runtime-2.3.0M5.zip
-  rm emf-sdo-runtime-2.3.0M5.zip 
-fi
-if [ ! -f eclipse/plugins/org.junit_3.8.2/junit.jar ]; then
-  # Eclipse Test Framework
-  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M5-200702091006/eclipse-test-framework-3.3M5.zip"
-  unzip -o eclipse-test-framework-3.3M5.zip
-  rm eclipse-test-framework-3.3M5.zip
-fi
-
-# checkout the basebuilder
-if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.core.runtime_3.3.100.v20061204.jar ]; then
-  if [ -d org.eclipse.releng.basebuilder ]; then
-    rm -rf org.eclipse.releng.basebuilder
-  fi
-  cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r M4_33 org.eclipse.releng.basebuilder
-fi
-
-# checkout the RSE builder
-if [ -f org.eclipse.rse.build/CVS/Entries ]; then
-  cd org.eclipse.rse.build
-  cvs update -dPR
-  cd ..
-else
-  if [ -d org.eclipse.rse.build ]; then
-    rm -rf org.eclipse.rse.build
-  fi
-  cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp co -Rd org.eclipse.rse.build org.eclipse.tm.rse/releng/org.eclipse.rse.build
-fi
-
-# prepare directories for the build
-if [ ! -d working/package ]; then
-  mkdir -p working/package
-fi
-if [ ! -d working/build ]; then
-  mkdir -p working/build
-fi
-if [ ! -e publish ]; then
-  ln -s /home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops publish
-fi
-if [ ! -e testUpdates ]; then
-  ln -s /home/data/httpd/download.eclipse.org/dsdp/tm/testUpdates testUpdates
-fi
-if [ ! -e udpates ]; then
-  ln -s /home/data/httpd/download.eclipse.org/dsdp/tm/updates updates
-fi
-if [ ! -e staging ]; then
-  ln -s /home/data/httpd/download-staging.priv/dsdp/tm staging
-fi
-
-# create symlinks as needed
-ln -s org.eclipse.rse.build/bin/doit_ibuild.sh .
-ln -s org.eclipse.rse.build/bin/doit_nightly.sh .
-chmod a+x doit_ibuild.sh doit_nightly.sh
-cd org.eclipse.rse.build
-chmod a+x build.pl build.rb go.sh nightly.sh
-cd ..
-
-echo "Your build environment is now created."
-echo ""
-echo "Run ./doit_ibuild to create an I-build."
-echo "You will need to enter 3 items by keyboard blindly."
-echo ""
-echo "When done, cd testUpdates/bin and run ./mkTestUpdates.sh"
-echo ""
-echo "Test the testUpdates, then copy them to updates:"
-echo "cd updates"
-echo "rm -rf plugins features"
-echo "cp -R ../testUpdates/plugins ."
-echo "cp -R ../testUpdates/features ."
-echo "cd bin"
-echo "./mkTestUpdates.sh"
-
-exit 0
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 4b03ffe83..000000000
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ /dev/null
@@ -1,170 +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 RSE @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 RSE @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>Added a <b>milestone update site</b> for RSE 2.0 milestone builds at
-  <a href="http://download.eclipse.org/dsdp/tm/updates/milestones">http://download.eclipse.org/dsdp/tm/updates/milestones</a>.
-  Builds on this site are tested against the latest Eclipse Platform 3.3 Milestones
-  only. Update jars are currently packed but unsigned, until the fix for Platform bug 
-  <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=168594">168594</a>
-  is available as a milestone (supposedly 3.3M5). Contributions to the Europa 
-  coordinated release are served from this site.<br/>
-  The official TM update site will continue serving RSE 1.0 stream updates only, 
-  which are compatible with Eclipse 3.2.x, until RSE 2.0 is released.</li>
-<li><b>Terminal</b>: [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=168893">168893</a>] 
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=170810">170810</a>]
-  Use rxtx-2.1 (gnu.io) for serial line support instead of javax.comm. See the new
-  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?root=DSDP_Project&view=co">README</a> for installing RXTX.</li>
-<li>Use 
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2006-12-24&chfieldto=Now&chfield=resolution&cmdtype=doit">
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&target_milestone=2.0+M5&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&cmdtype=doit">  -->
-  this query</a> to show the list of bugs fixed since the last release,
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-2.0M4-200701040900/index.php">
-  RSE 2.0M4</a>
-  [<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-2.0M4-200701040900/buildNotes.php">build notes</a>].</li>
-<li>For details on checkins, see the
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/index.html">
-  RSE CVS changelog</a>, and the
-  <a href="http://download.eclipse.org/dsdp/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/index.php/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-  as well as the
-  <a href="http://wiki.eclipse.org/index.php/RSE_2.0_Known_Issues_and_Workarounds">
-  RSE 2.0 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 now has a
-<a href="http://dsdp.eclipse.org/help/latest/index.jsp?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,<br/>
-the online
-<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">Getting Started page</a>
-as well as the
-<a href="http://wiki.eclipse.org/index.php/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>As per the Target Management 
-<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#M4">plan</a>,
-we reached API Freeze for RSE 1.0.</p>
-<p>In fact we have reviewed and documented all relevant APIs, and they
-have proven useful in earlier proprietary versions of RSE.<br/>
-Yet, due to a lack of public feedback so far we still want to 
-<b>declare the APIs provisional for now</b>.</p>
-<p><b>We are committed to not introducing any incompatible
-API changes on the RSE 1.0 maintenance stream (1.0.x).</b><br/>
-<b>But we reserve the right to change any API for RSE 2.0</b>
-in a not backward compatible way.<br/>
-All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases.</p>
-<p>Currently, we see the following areas for potential API changes:
-<ul>
-  <li>Classes and Interfaces that are not meant for public use will be
-   moved to packages tagged as <tt>internal</tt>. This will apply 
-   particularly to the "implementation" plugins for the ssh, ftp and
-   local subsystems (these do not define any new APIs anyways).</li>
-  <li>The <tt>IConnectorService</tt> interface may be slightly modified
-   in order to allow for better UI / Non-UI separation.</li>
-  <li>Some more RSE Model classes may be moved from the UI plugin to the 
-   non-UI core plugin.</li>
-</ul>
-If you want to start programming against RSE APIs now, best let us know
-about your endeavours and keep yourself up-to-date. Stay in contact with
-the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and give feedback to make the 
-APIs better.
-</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 Changes since RSE 1.0.1 - newest changest first</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-Use 
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi%5D&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2006-12-24&chfieldto=2007-07-01&chfield=resolution&cmdtype=doit">
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi%5D&classification=DSDP&product=Target+Management&target_milestone=2.0+M5&target_milestone=2.0+M6&target_milestone=2.0+M7&target_milestone=2.0+RC1&target_milestone=2.0&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&cmdtype=doit">  -->
-  this query</a> to show the full list of API changes since RSE 1.0.1.
-</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=162993">bug 162993</a> - maj - ssh connection gets confused</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&classification=DSDP&product=Target+Management&component=RSE&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/index.php/RSE_2.0_Known_Issues_and_Workarounds">
-RSE 2.0 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 RSE, please check the
-<a href="http://wiki.eclipse.org/index.php/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&classification=DSDP&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&classification=DSDP&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/epl-v10.html b/releng/org.eclipse.rse.build/template/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/releng/org.eclipse.rse.build/template/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 efc832369..000000000
--- a/releng/org.eclipse.rse.build/template/index.php
+++ /dev/null
@@ -1,256 +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>DSDP-TM RSE Downloads</title>
-</head>
-
-<body>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" width="80%">
-		<p><b><font class=indextop>RSE @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>
-		</strong></font></p>
-		
-		<!-- <p>To get started, see the <a href="buildNotes.php">build notes</a>.<br>
-		-->
-		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>.</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>RSE 2.0 requires 
-    	<a href="http://download.eclipse.org/eclipse/downloads/drops/S-3.3M4-200612141445/index.php">
-         Eclipse-Platform-3.3M4</a> or later.
-    </b></td></tr>
-    <tr><td>
-      Prerequisites for add-ons (like CDT, EMF) should be retrieved from the
-      <a href="http://download.eclipse.org/europa/releases/">Europa Discovery Site</a>.
-    </td></tr> 
-    <tr><td>
-      Earlier versions (e.g. Eclipse 3.2.x) will <b>not</b> work!
-    </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"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">SDK (includes client runtime, user and ISV documentation, and source)</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><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-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=/dsdp/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?root=DSDP_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?root=DSDP_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=/dsdp/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.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-remotecdt-@buildId@.zip">RSE-remotecdt-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-			A Launch Configuration for running and debugging C/C++
-			programs on a remote host through RSE-provided shell
-			and file services, and gdbserver. Requires CDT and RSE.
-			Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-efs-@buildId@.zip">RSE-efs-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-			An experimental Eclipse Filesystem (EFS) provider, which
-			uses RSE contributed file services. It currently works for accessing
-			remote file systems, but cannot be used to hold Projects of an 
-			Eclipse Workspace due to resource locking issues. Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-        	Tutorial code and example projects for developing against RSE SDK.
-        </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 (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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 (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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 (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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 (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments"><i>Experimental</i></a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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 align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Client Runtime Binaries</font></b></td>
-	</tr>
-	<tr>
-	    <td>The runtime binaries do not include source and developer documentation,
-	    and they are available in a more fine-grained packaging for re-use in
-	    other products.<br/>
-	    <b>RSE-runtime-core is required</b>, and includes the user documentation.
-	    All other runtime packages are optional.</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=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-core-@buildId@.zip">RSE-runtime-core-@buildId@.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-dstore-@buildId@.zip">RSE-runtime-dstore-@buildId@.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-ftp-@buildId@.zip">RSE-runtime-ftp-@buildId@.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-local-@buildId@.zip">RSE-runtime-local-@buildId@.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-ssh-@buildId@.zip">RSE-runtime-ssh-@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">JUnit Plugin Tests</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>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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 c6af966b6..000000000
--- a/releng/org.eclipse.rse.build/template/notice.html
+++ /dev/null
@@ -1,79 +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/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
deleted file mode 100755
index b6a7d89c6..000000000
--- a/releng/org.eclipse.rse.build/template/package.count
+++ /dev/null
@@ -1 +0,0 @@
-16
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 460233046..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 2, 2006</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/addSites.sh b/releng/org.eclipse.rse.releng.infocenter/addSites.sh
deleted file mode 100755
index 982ecee12..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/addSites.sh
+++ /dev/null
@@ -1,19 +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 
-#*******************************************************************************
-#
-# Add new Eclipse "extsion locations" to the infocenter
-#
-IHOME=/home/infocenter/latest
-$IHOME/bin/infocenter.sh addSite -from $IHOME/plugins/rse/eclipse
-$IHOME/bin/infocenter.sh addSite -from $IHOME/plugins/dd.dsf/eclipse
-$IHOME/bin/infocenter.sh addSite -from $IHOME/plugins/nab/eclipse
-$IHOME/bin/infocenter.sh apply
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 fd7dce0f3..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh
+++ /dev/null
@@ -1,36 +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 
-#*******************************************************************************
-umask 022
-
-PATH=/opt/j2sdk1.4.2_12/bin:$PATH
-export PATH
-
-EHOME=/home/infocenter/eclipse3.2/eclipse
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-
-if [ "$1" = "" -o "$1" = "help" ]; then
-  echo "Usage: infocenter.sh [start|shutdown|addSite -from dir|apply]"
-  exit 1
-fi
-
-java \
-  -classpath $EHOME/plugins/org.eclipse.help.base_3.2.0.v20060601.jar \
-  org.eclipse.help.standalone.Infocenter \
-  -command $* \
-  -eclipsehome $EHOME \
-  -data $IHOME/workspace \
-  -port 27127 \
-  -nl en -locales en \
-  -configuration file://$IHOME/config 
-
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 27799ef28..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/readme.txt
+++ /dev/null
@@ -1,31 +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/dsdp \
-    co -d bin org.eclipse.tm.rse/releng/org.eclipse.tm.rse.releng.infocenter
-
-Prerequisites:
-* Eclipse 3.2 installed at /home/infocenter/eclipse3.2/eclipse
-* Infocenter home (IHOME) at /home/infocenter/latest
-  - Scripts checked out at $IHOME/bin
-  - Deployable doc plugins at $IHOME/deploy
-* 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/help32/index.jsp?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/update.sh b/releng/org.eclipse.rse.releng.infocenter/update.sh
deleted file mode 100755
index 71809173c..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/update.sh
+++ /dev/null
@@ -1,81 +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 
-#*******************************************************************************
-umask 022
-echo "Infocenter Update: running as"
-id
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-curdir=`pwd`
-NEED_RESTART=0
-
-#update RSE into deplopyment directory
-cd $IHOME/deploy/rse
-rm *.zip
-echo "Downloading RSE-SDK-latest.zip..."
-wget -q "http://download.eclipse.org/dsdp/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
-    NEED_RESTART=1
-  fi
-else
-  echo "Error downloading RSE-SDK-latest.zip"
-fi
-
-#update Infocenter with latest deployable plug-ins
-if [ "$NEED_RESTART" != "0" ]; then
-  echo "Shutting down infocenter..."
-  $IHOME/bin/infocenter.sh shutdown
-
-  echo "Deploying new plug-ins..."
-  ######################### Deploy RSE #############################
-  rm $IHOME/plugins/rse/eclipse/plugins/*
-  cp -p $IHOME/deploy/rse/plugins/* $IHOME/plugins/rse/eclipse/plugins/
-  ####################### Deploy dd.dsf ############################
-  rm $IHOME/plugins/dd.dsf/eclipse/plugins/*
-  cp -p $IHOME/deploy/dd.dsf/plugins/* $IHOME/plugins/dd.dsf/eclipse/plugins/
-  ####################### Deploy nab ###############################
-  rm -rf $IHOME/plugins/nab/eclipse/plugins/*
-  cp -Rp $IHOME/deploy/nab/plugins/* $IHOME/plugins/nab/eclipse/plugins/
-  
-  #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 9acdc96a6..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ /dev/null
@@ -1,274 +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 
-#*******************************************************************************
-# Convert normal "site.xml" to "testUpdates"
-#
-# Prerequisites: 
-# - Eclipse 3.3Mx installed in $HOME/ws2/eclipse
-# - Java5 in the PATH or in /shared/common/ibm-java2-ppc64-50
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/common/ibm-java2-ppc64-50/jre/bin:/shared/common/ibm-java2-ppc64-50/bin:$PATH
-
-# 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
-if [ `basename $SITE` = testUpdates ]; then
-    echo "Working on test update site"
-    REL=`ls $HOME/ws2/working/package | sort | tail -1`
-    if [ "$REL" != "" ]; then
-      echo "Checking new Updates from $REL"
-      DIR="$HOME/ws2/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
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/testUpdates,g' \
-    	-e 's,Project Update,Project Test Update,g' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/testUpdates,g' \
-        -e 's,Project Update,Project Test Update,g' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Test 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 \
-    #    -jar $HOME/ws2/eclipse/startup.jar \
-    #    -application org.eclipse.update.core.siteOptimizer \
-    #    -jarProcessor -outputDir $SITE \
-    #    -processAll -repack $SITE
-    java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    	$HOME/ws2/jarprocessor/jarprocessor.jar \
-		-outputDir $SITE -processAll -repack $SITE
-elif [ `basename $SITE` = signedUpdates ]; then
-    echo "Working on signed update site"
-    echo "Signing jars from test update site (expecting conditioned jars)..."
-    STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
-    stamp=`date +'%Y%m%d-%H%M'`
-    if [ -d ${STAGING} -a -d ${SITE}/../testUpdates ]; then
-      #get jars from testUpdates, sign them and put them here
-      mkdir ${SITE}/features.${stamp}
-      mkdir -p ${STAGING}/updates.${stamp}/features
-      cp -R ${SITE}/../testUpdates/features/*.jar ${STAGING}/updates.${stamp}/features
-      cd ${STAGING}/updates.${stamp}/features
-      for x in `ls *.jar`; do
-        echo "signing feature: ${x}"
-        sign ${x} nomail >/dev/null
-      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}`
-          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
-        cp ${SITE}/../testUpdates/plugins/*.jar ${STAGING}/updates.${stamp}/plugins
-        cd ${STAGING}/updates.${stamp}/plugins
-        for x in `ls *.jar`; do
-          echo "signing plugin: ${x}"
-          sign ${x} nomail >/dev/null
-        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}`
-            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 -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 testUpdates 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,/dsdp/tm/updates,/dsdp/tm/signedUpdates,g' \
-    	-e 's,Project Update,Project Signed Test Update,g' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/signedUpdates,g' \
-        -e 's,Project Update,Project Signed Test Update,g' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Signed Test Update,g' \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = milestones ]; then
-    echo "Working on milestone 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,/dsdp/tm/updates,/dsdp/tm/updates/milestones,g' \
-    	-e 's,Project Update,Project Milestone Update,g' \
-    	-e '\,</h1>,a\
-This site contains Target Management Milestones (I-, S- and M- builds) which are \
-being contributed to the Europa coordinated release train (Eclipse 3.3).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/milestones,g' \
-        -e 's,Project Update,Project Milestone Update,g' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Milestone Update,g' \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = interim ]; then
-    echo "Working on interim 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,/dsdp/tm/updates,/dsdp/tm/updates/interim,g' \
-    	-e 's,Project Update,Project Interim Update,g' \
-    	-e '\,</h1>,a\
-This site contains Target Management Interim Maintenance builds (M-builds) in order \
-to test them before going live.' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/interim,g' \
-        -e 's,Project Update,Project Interim Update,g' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Interim 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"
-    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
-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
-
-# optimize the site
-# see http://wiki.eclipse.org/index.php/Platform-releng-faq
-#Pack the site
-# Workaround for downgrading effort of pack200 to avoid VM bug
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
-echo "Packing the site... $SITE"
-#java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-#    -jar $HOME/ws2/eclipse/startup.jar \
-#    -application org.eclipse.update.core.siteOptimizer \
-#    -jarProcessor -outputDir $SITE \
-#    -processAll -pack $SITE
-java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    $HOME/ws2/jarprocessor/jarprocessor.jar \
-    -outputDir $SITE -processAll -pack $SITE
-
-#Create the digest
-echo "Creating digest..."
-java -jar $HOME/ws2/eclipse/startup.jar \
-    -application org.eclipse.update.core.siteOptimizer \
-    -digestBuilder -digestOutputDir=$SITE \
-    -siteXML=$SITE/site.xml
-
-cd $SITE
-chgrp -R dsdp-tmadmin .
-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/index.html b/releng/org.eclipse.rse.updatesite/index.html
deleted file mode 100644
index 93218c8ea..000000000
--- a/releng/org.eclipse.rse.updatesite/index.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<title>Target Management Project 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/dsdp/tm/images/RSESample.gif">
-        <img src="http://www.eclipse.org/dsdp/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 Updates</h1>
-	<h2>Just getting started?</h2>
-      <p><b>See <a href="http://www.eclipse.org/dsdp/tm/tutorial/">http://www.eclipse.org/dsdp/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/help32/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.2 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/dsdp/tm/updates/</code></p>
-    <p>as the URL to use.
-    See <a href="http://help.eclipse.org/help32/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/dsdp/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 f52355a1c..000000000
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site pack200="true" 
-	mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/updates/site.xml&amp;format=xml&amp;protocol=http"
-	digestURL="http://download.eclipse.org/dsdp/tm/updates/">
-<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/dsdp/tm/updates/" -->
-   <description url="http://download.eclipse.org/dsdp/tm/updates/">
-      This is the Target Management Project Update Site.
-   </description>
-   <feature url="features/org.eclipse.rse.core_2.0.0.qualifier.jar" id="org.eclipse.rse.core" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.0.qualifier.jar" id="org.eclipse.rse.dstore" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.qualifier.jar" id="org.eclipse.rse.ftp" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.0.qualifier.jar" id="org.eclipse.rse.local" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   <!-- !EUROPA_ONLY! Combined Runtime
-   <feature url="features/org.eclipse.rse_2.0.0.qualifier.jar" id="org.eclipse.rse" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   !EUROPA_ONLY! -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.qualifier.jar" id="org.eclipse.rse.sdk" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.0.qualifier.jar" id="org.eclipse.rse.ssh" version="2.0.0.qualifier">
-      <category name="RSE Runtime only"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) SDK"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_1.0.100.qualifier.jar" id="org.eclipse.rse.remotecdt" version="1.0.100.qualifier">
-      <category name="Target Management Add-ons"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.efs_2.0.0.qualifier.jar" id="org.eclipse.rse.efs" version="2.0.0.qualifier">
-      <category name="Target Management Add-ons"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="2.0.0.qualifier">
-      <category name="Target Management Add-ons"/>
-   </feature>
-   <feature url="features/org.apache.commons.net_1.4.1.qualifier.jar" id="org.apache.commons.net" version="1.4.1.qualifier">
-      <category name="Enabling Features"/>
-   </feature>
-   <feature url="features/org.apache.oro_2.0.8.qualifier.jar" id="org.apache.oro" version="2.0.8.qualifier">
-      <category name="Enabling Features"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.qualifier">
-      <category name="Target Management Add-ons"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.0.qualifier.jar" id="org.eclipse.rse.tests" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) SDK"/>
-   </feature>
-   <category-def name="RSE Runtime only" label="RSE_Runtime">
-      <description>
-         RSE Runtime-only features: no developer documentation or sources.
-      </description>
-   </category-def>
-   <category-def name="Remote System Explorer (RSE) SDK" label="RSE_SDK">
-      <description>
-         Remote System Explorer (RSE) with developer documentation and sources..
-      </description>
-   </category-def>
-   <category-def name="Target Management Add-ons" label="Target Management Add-ons">
-      <description>
-         Target Management Core Components as well as Experimental add-ons for RSE
-      </description>
-   </category-def>
-   <category-def name="Enabling Features" label="Enabling Features">
-      <description>
-         Third Party Libraries
-      </description>
-   </category-def>
-</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 6d0e36e80..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 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/readme.txt b/releng/readme.txt
deleted file mode 100644
index 0c5f44d24..000000000
--- a/releng/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the "releng" folder for projects containing instructions and scripts for 
-building RSE.
-All projects should be named "org.eclipse.rse.build<.*>".
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/.classpath b/rse/doc/org.eclipse.dstore.doc.isv/.classpath
deleted file mode 100755
index acad1c227..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.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.dstore.doc.isv/.cvsignore b/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore
deleted file mode 100755
index 891527ed8..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-index
-build.xml
-javadoc.link.location
-temp.bin.log
-temp.options.txt
-temp.convert.txt
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/.project b/rse/doc/org.eclipse.dstore.doc.isv/.project
deleted file mode 100755
index b79ee8ec5..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.dstore.doc.isv</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.dstore.doc.isv/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.dstore.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100755
index 8d181e03c..000000000
--- a/rse/doc/org.eclipse.dstore.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.dstore.doc.isv; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
-Bundle-Vendor: %providerName
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt b/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt
deleted file mode 100755
index d73e72b8e..000000000
--- a/rse/doc/org.eclipse.dstore.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/index.php/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.dstore.doc.isv/about.html b/rse/doc/org.eclipse.dstore.doc.isv/about.html
deleted file mode 100755
index 460233046..000000000
--- a/rse/doc/org.eclipse.dstore.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 2, 2006</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.dstore.doc.isv/book.css b/rse/doc/org.eclipse.dstore.doc.isv/book.css
deleted file mode 100755
index 157414c6c..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";

diff --git a/rse/doc/org.eclipse.dstore.doc.isv/build.properties b/rse/doc/org.eclipse.dstore.doc.isv/build.properties
deleted file mode 100755
index e69e2c016..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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 = META-INF/,\
-               about.html,\
-               book.css,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               toc.html,\
-               toc.xml,\
-               guide/,\
-               index/,\
-               reference/,\
-               provisional_api.html
-customBuildCallbacks = customBuildCallbacks.xml
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
deleted file mode 100755
index 4701988a4..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="RSE DStore 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.ui*.jar"/>
-        	<include name="**/org.eclipse.ui*/**/*.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.junit*.jar"/>
-        	<include name="**/org.junit*/**/*.jar"/>
-			<include name="**/com.ibm.icu*.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="debug" 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.dstore.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.dstore.core/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" />
-	</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}${argsListDelimiter}${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">
-			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
-		</exec>
-	</target>
-
-</project>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml b/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml
deleted file mode 100644
index e457715e4..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- ===================================================================== -->
-<!-- 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.dstore.doc.isv/guide/Artifacts.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/Artifacts.html
deleted file mode 100755
index 3b35774b0..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/Artifacts.html
+++ /dev/null
@@ -1,64 +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 2000, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>RSE Artifacts</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body>
-<h1>DataStore Artifacts</h1>
-<p>With the DataStore, you interface the following artifacts:</p>
-<ul>
-<li><A href="#clientconnection">Client Connection</A></li>
-<li><A href="#datastore">DataStore</A></li>
-<li><A href="#dataelement">DataElement</A></li>
-<li><A href="#miner">Miner</A></li>
-</ul>
-<p>All the classes and interfaces mentioned here are defined in the <samp>org.eclipse.dstore.core</samp> plugin.
-
-<h2><A name="clientconnection">Client Connection</A></h2>
-<p>
-The <b>ClientConnection</b> class is used for establishing a DataStore connection.   This class provides the
-means to instantiate a client DataStore and connect to a server DataStore on a specified host running under a
-specified port.  The connection to the server DataStore may either be made directly or a startup
-negotiation may be made with a remote daemon before connecting to the server.  This class also provides the means
-for disconnecting from the DataStore.
-</p>
-
-<h2><A name="datastore">DataStore</A></h2>
-<p>
-The <b>DataStore</b> class is the heart of the DataStore communications framework.  An instance of a DataStore contains a tree
-of <a href="#dataelement">DataElements</a>.  This tree can be referred to as the <i>DataStore repository</i> because
-it consists of all the schema information and data content used.  Any type of object or relationship defined, command definition or
-piece of data that needs to be communicated between the client and server are stored in the <i>DataStore repository</i>.
-The DataStore class can be used for finding, creating and deleting DataElements and for communicating commands
-to <a href="#miner">miner</a>.  The DataStore class encapsulates all remote synchronizations between the client and the
-server via its <code>command</code> and <code>refresh</code> APIs.
-</p>
-
-<h2><A name="dataelement">DataElement</A></h2>
-<p>
-The <b>DataElement</b> is the unit of information in a DataStore repository.  Each DataElement has a set of attributes that describe
-the object it represents and is related to other DataElements by containing other DataElements.  DataElements represent both the meaning
-of data as well as the data itself.
-</p>
-<p>
-For more information about DataElements, see the section, <a href="DataElements.html">DataElements and the DataStore model</a>.
-</p>
-
-<h2><A name="miner">Miner</A></h2>
-<p>
-A <b>Miner</b> is an extension point to the DataStore.  Miners are classes, residing on the server-side, that implement a common
-interface used by the DataStore for communication information between the DataStore and the tools.
-</p>
-<p>
-For more information about Miners, see the section, <a href="Miners.html">Miners</a>.
-</p>
-</body>
-</html>
-
-
-
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/ClientSide.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/ClientSide.html
deleted file mode 100755
index c2fb661a7..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/ClientSide.html
+++ /dev/null
@@ -1,171 +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 2000, 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>Communicating with the Server-side</h1>
-
-<h2>Connecting to a Local DataStore</h2>
-<p>
-If you're writing an RSE subsystem to connect to a local standalone DataStore, the following needs
-to be done during the connect:
-</p>
-
-<font color='#4444CC'>
-<pre>
-	...
-	ClientConnection clientConnection = new ClientConnection(connectionName);
-
-	// initialize the local datastore	
-	clientConnection.localConnect();
-	
-	DataStore dataStore = clientConnection.getDataStore();
-
-	// specify miners to load
-	dataStore.addMinersLocation("."); // initializes the default miners
-	
-	// initialize miners
-	dataStore.getSchema();
-	dataStore.initMiners();	
-	...
-			
-</pre>
-</font>
-
-<h2>Connecting to a Remote DataStore</h2>
-<p>
-If you're writing an RSE subsystem to connect to a remote DataStore, the only difference
-from the local scenario is that <code>connect</code> is called rather than <code>localConnect</code>.
-</p>
-
-<font color='#4444CC'>
-<pre>
-	...
-	ClientConnection clientConnection = new ClientConnection(connectionName);
-	
-	// prepare connection
-	clientConnection.setHost(hostName);
-	clientConnection.setPort(port);
-	
-	// connect	
-	clientConnection.connect(ticket);
-	
-	DataStore dataStore = clientConnection.getDataStore();
-
-	// specify miners to load
-	dataStore.addMinersLocation("."); // initializes the default miners
-	
-	// initialize miners
-	dataStore.getSchema();
-	dataStore.initMiners();	
-	...
-			
-</pre>
-</font>
-
-<h2>Loading an Additional DataStore Miner</h2>
-<p>
-If the new miner has been registered via the default minerFile.dat file, then
-no further steps are required to load it.  Otherwise, after the subsystem is
-connected to the remote DataStore, you need to tell the DataStore to load the
-miner as follows.
-</p>
-
-<font color='#4444CC'>
-<pre>
-	...
-	dataStore.addMinersLocation(location);
-	dataStore.getSchema();
-	...
-</pre>
-</font>
-
-<p>
-This tells the host DataStore to instantiate and initialize all miners listed in
-the specified minerFile.dat file.
-</p>
-
-
-<h2>Sending Commands to a Miner</h2>
-<p>
-To send a command to a miner, the required <a href="DataElements.html#commanddescriptor">command descriptor</a> must first be obtained
-using the method <code>DataStore.localDescriptorQuery</code>.  The method <code>DataStore.command</code> is then called with command
-descriptor and the subject of the command.  For example, a query might need to be called on the miner as shown in the following code segment.
-</p>
-
-<font color='#4444CC'>
-<pre>
-		...
-		// the UI model object
-		MyRemoteObject obj = getMyRemoteObject();
-		
-		// get the corresponding DataElement for this object
-		DataElement deObj = obj.getDataElement();
-		
-		// get the DataStore from the DataElement
-		DataStore ds = deObj.getDataStore();
-		
-		// get the query command descriptor for the subject
-		DataElement queryCmd = ds.localDescriptorQuery(deObj.getDescriptor(), "MY_QUERY_COMMAND");
- 		
- 		// send the command
- 		DataElement status = ds.command(queryCmd, deObj, true);
- 		...
-</pre>
-</font>
-
-<h2>Receiving Data from a Miner</h2>
-<p>
-After a command is sent to a miner, you might want to receive information that the miner produced in response to the command.
-DataStore commands and responses are sent asynchronously, much like events.  On the server, the
-<a href="Communications.html#servercommandhandler">Server Command Handler</a> reacts to incoming commands by calling the <code>handleCommand</code>
-method on the appropriate miner.  For the client, the <a href="Communications.html#clientcommandhandler">Client Command Handler</a>
-reacts to incoming responses by firing domain notifications.  In order to receive miner responses, asynchronously,
-you need to implement a DataStore domain listener.
-</p>
-<p>
-A domain listener implements the IDomainListener interface.  An instance of an IDomainListener needs to be added to the DataStore domain listener
-list.  The following is what a simple domain listener looks like:
-</p>
-
-<font color='#4444CC'>
-<pre>
-	public class MyDomainListener implements IDomainListener
-	{
-	    public boolean listeningTo(DomainEvent e)
-	    {
-	    	// check if we care about this event
-	    	...
-	    }
-	
-	    public void domainChanged(DomainEvent e)
-	    {
-	    	// get the data from this event
-	    	...
-	    }
-	}
-</pre>
-</font>
-
-<p>
-A domain listener may either listen for the duration of a DataStore session or may be transient, to be used for
-a receiving data from a particular command.  For example, after calling <code>DataStore.command</code>, which returns
-the status of the command instance, a listener can be added as follows:
-</p>
-<font color='#4444CC'>
-<pre>
-		...
-       	MyDomainListener listener = new MyDomainListener(shell);
-       `ds.getDomainNotifier().addDomainListener(listener);
-       	listener.setStatus(status);
-		...
-</pre>
-</font>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/Communications.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/Communications.html
deleted file mode 100755
index 3cad8e804..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/Communications.html
+++ /dev/null
@@ -1,159 +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 2000, 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>DataStore Communications</h1>
-<p>
-Communication in the DataStore is asynchronous and symmetric.  Commands sent and results received are all represented in the same form,
-<a href="DataElements.html">DataElements</a> and the underlying means of transmitting this information is basically the same for each.
-When a command is issued, it gets queued and then later routed to the appropriate <b>miner</b> where it gets executed.
-A miner returns results by updating the DataStore repository with information.  Like commands, these
-results are queued and then later notifications are sent out to any listener that requires the results.
-</p>
-<p>
-The asynchronous routing of data and commands between a client and the tools is made possible by threads, called <i>handlers</i>.   There are two
-types of handlers - a <a href="#commandhandlers">Command Handler</a> and an <a href="#updatehandlers">Update Handler</a>.  Each handler thread contains a queue
-of data that needs to be transmitted and each periodically communicates the data contained in it's queue.
-</p>
-
-<h2><a name="commandhandlers">Command Handlers</a></h2>
-<p>
-The job of the Command Handler is to route commands to the miners.  There are two types of command handlers.
-</p>
-
-<h3><a name="clientcommandhandler">Client Command Handler</a></h3>
-<p>
-The <b>Client Command Handler</b> is a command handler responsible for transmitting its queue of DataStore commands across a network to
-the server DataStore.  This handler encapsulates the communication of DataStore client data to a DataStore server.  The Client Command Handler
-interfaces the DataStore communication layer, where its queue of commands gets serialized into XML before being sent over a TCP/IP socket
-to the server.
-</p>
-
-<h3><a name="servercommandhandler">Server Command Handler</a></h3>
-The <b>Server Command Handler</b> is a command handler responsible for directly routing the DataStore commands in its queue to the appropriate
-miner(s) depending on the command.
-
-<h2><a name="updatehandlers">Update Handlers</a></h2>
-<p>
-The job of the Update Handler is to notify the client that some results have been received or changed.  There are two types of
-update handlers.
-</p>
-
-<h3><a name="clientupdatehandler">Client Update Handler</a></h3>
-<p>
-The <b>Client Update Handler</b> is an update handler responsible for sending out domain notifications for each unit of data
-contained in its queue.
-</p>
-
-<h3><a name="serverupdatehandler">Server Update Handler</a></h3>
-<p>
-The <b>Server Update Handler</b> is an update handler responsible for transmitting its queue of DataStore objects across a network to
-the client DataStore.  This handler encapsulates the communication of DataStore server data to a DataStore client.  The Server Update Handler
-interfaces the DataStore communication layer, where its queue of data gets serialized into XML before being sent over a TCP/IP socket
-to the client.
-</p>
-
-<p>
-Communication between a client and tools may either occur locally and remotely depending on how the
-user chooses to connect to the DataStore.  The client interface and the server tooling are the same regardless of
-whether the DataStore is standalone or client/server based.  The communication differences are encapsulated by
-the DataStore handlers.
-</p>
-
-<h2>Standalone Local DataStore</h2>
-<p>
-Locally, the DataStore may be used standalone such that all communication through the DataStore goes directly to between the <b>miners</b>
-and the client, all running within the same process.  In this case, there is only a single DataStore and no communication goes
-over the network.  For its handlers, the local DataStore uses a <b>Client Update Handler</b> and a <b>Server Command Handler</b>.
-</p>
-
-<img src="images/local.jpg" alt="Local DataStore Eclipse" border="0">
-
-<p>
-In the above dialog, the path of commands to the tools is shown with solid lines, while the path of data to client is shown with dotted lines.
-
-<ol>
-<li>
-In RSE, a subsystem calls a DataStore command API to issue a command.
-</li>
-<li>
-The command is then queued in the <b>Server Command Handler</b>.
-</li>
-<li>
-The Server Command Handler gets the command from the queue, determines which miner should run it, and passes the command into that miner.
-</li>
-<li>The miner then executes the command and produces results by calling DataStore object creation methods.  When the resulting objects are created,
-the DataStore queues them in the <b>Client Update Handler</b>.
-</li>
-<li>
-The Client Update Handler gets the data from the queue and sends out a domain notification for each data object in the queue.
-</li>
-<li>
-A domain listener for the RSE subsystem receives the notification and then uses the result data to update the UI.
-</li>
-</ol>
-</p>
-
-<h2>Client/Server DataStore</h2>
-<p>
-In the remote case, a DataStore client is part of the Eclipse process, while the DataStore server is run
-in a separate process on a remote host.  Information is transferred between the two DataStore repositories over
-a TCP/IP socket.  Any data that is created or changed on either the client or the server is asynchronously
-propagated over to the other side via serialization/deserialization of the delta.
-
-Like in the standalone case, the client DataStore uses a <b>Client Update Handler</b>, but instead of using
-a Server Command Handler it uses a <b>Client Command Handler</b>.  The server DataStore uses a <b>Server Update Handler</b>
-and a <b>Server Command Handler</b>.
-</p>
-
-<img src="images/remote.jpg" alt="Remote DataStore Eclipse" border="0">
-
-<ol>
-<li>
-In RSE, a subsystem calls a DataStore command API to issue a command.
-</li>
-<li>
-The command is then queued in the <b>Client Comamnd Handler</b>.
-</li>
-<li>
-The Client Command Handler gets the command from the queue and, via the communication layer, transmits it to the server DataStore.
-The communication layer on the client serializes the DataStore respository objects that make up the command and sends that
-serialization over a socket to the server.
-</li>
-<li>
-The communication layer on the server deserializes the socket data and creates DataStore objects in the DataStore repository.
-Those command objects are added it to the <b>Server Command Handler</b> queue.
-</li>
-<li>
-The Server Command Handler gets the command from the queue, determines which miner should run it, and passes the command into that miner.
-</li>
-<li>
-The miner then executes the command and produces results by calling DataStore object creation methods.  When the resulting objects are created,
-the DataStore queues them in the <b>Server Update Handler</b>.
-</li>
-<li>
-The Server Update Handler gets the results from the queue and transmits them, via the DataStore communicate layer, to the client DataStore.
-The communication layer on the server serializes the DataStore objects from the queue and sends that serialization over a socket
-to the client.
-</li>
-<li>
-The communication layer on the client deserializes the socket data and creates DataStore objects in the DataStore respository.
-Those results are added to the <b>Client Update Handler</b> queue.
-</li>
-<li>
-The Client Update Handler gets the data from the queue and sends out a domain notification for each data object in the queue.
-</li>
-<li>
-A domain listener for the RSE subsystem receives the notification and then uses the result data to update the UI.
-</li>
-</ol>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/DataElements.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/DataElements.html
deleted file mode 100755
index 50eb1468e..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/DataElements.html
+++ /dev/null
@@ -1,206 +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 2000, 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><a name="dataelements">DataElements</a></h1>
-<p>
-All information in the DataStore repository is stored in the form of <b>DataElements</b>.  DataElements are objects
-that have attributes and may contain other DataElements.  The attributes of a DataElement are stored as an array of
-strings.  A particular attribute is retrieved by calling <code>getAttribute(</code><i>attribute index</i><code>)</code>.
-A particular attribute is set by calling <code>setAttribute(</code><i>attribute index</i><code>, </code><i>attribute value</i><code>)</code>.
-The attribute indices that can be used are as follows:
-<table>
-<tr><td><b>Attribute</b></td><td><b>Description</b></td></tr>
-<tr><td><code>A_TYPE</code></td><td>Attribute indicating the type of object.  The type can be used to indicate the type of an instance of data, a descriptor, a relationship or a commnad.</td></tr>
-<tr><td><code>A_NAME</code></td><td>Attribute indicating the name of object.</td></tr>
-<tr><td><code>A_VALUE</code></td><td>Attribute indicating the more information about that object</td></tr>
-<tr><td><code>A_SOURCE</code></td><td>Attribute indicating source information about an object, if applicable</td></tr>
-<tr><td><code>A_REF_TYPE</code></td><td>Attribute indicating whether the object is a normal object ("value"), a spirit ("spirit"), or a reference to another DataElement ("reference").  In the DataStore, a reference to another DataElement is represented with a DataElement. For more information on spirit elements, see <a href="MemoryManagement.html">Memory Management in DataStore</a> </td></tr>
-<tr><td><code>A_ID</code></td><td>The unique ID of a DataElement.</td></tr>.
-</table>
-</p>
-<p>
-Rather than representing different types of objects as different classes, the type attribute of a DataElement
-indicates its type.  There are two general categories of DataElements.  There are schema elements, <A href="#descriptors">descriptors</a>, and instances of
-those schema elements, <a href="#instances">instances</a>.
-</p>
-
-<h2><a name="descriptors">Descriptors</a></h2>
-<p>
-A descriptor is a DataElement that describes some type of object.  The <code>A_TYPE</code> attribute of a descriptor indicates what type of
-descriptor it is.  The <code>A_NAME</code> attribute of a descriptor identifies the type that the descriptor describes.
-</p>
-<p>
-A descriptor may be of one of the following types:
-</p>
-<table>
-<tr><td><code>T_OBJECT_DESCRIPTOR</code></td><td>Describes a type of object</td></tr>
-<tr><td><code>T_RELATION_DESCRIPTOR</code></td><td>Describes a type of relationship that may exist between two DataElements.</td></tr>
-<tr><td><code>T_COMMAND_DESCRIPTOR</code></td><td>Describes a type of command</td></tr>
-</table>
-
-<h3><a name="objectdescriptors">Object Descriptors</a></h3>
-<p>
-<b>Object descriptors</b> describe the different types of data that can be represented in the DataStore repository.  Object descriptors
-can describe types of object instances as well as other types of object descriptors.  Each object descriptor is related to other object,
-relationship and command descriptors.
-</p>
-
-<h3><a name="relationdescriptors">Relation Descriptors</a></h3>
-<p>
-<b>Relation descriptors</b> describe the different types of relationships that can be represented in the DataStore repository.  Relation
-descriptors describe types of relationships between object instances, object descriptors, command instances and command descriptors.
-</p>
-
-<h3><a name="commanddescriptors">Command Descriptors</a></h3>
-<p>
-<b>Command descriptors</b> describe the different types of commands that can be executed on an object in the DataStore repository.
-In the DataStore schema, object descriptors are related to command descriptors to indicate that an object instance of a certain type can
-have the described command run on it.  Command descriptors are always contained by the object descriptors they are associated with.  The
-<code>A_SOURCE</code> attribute of a command descriptor indicates which miner(s) may execute an instance of such a command.
-</p>
-
-<p>
-These three types of objects are used to define the DataStore schema.  Instances of relation descriptors are used to define
-relationships between descriptors in the schema.
-</p>
-
-
-<h2><a name="instances">Instances</a></h2>
-<p>
-An instance object is a DataElement that is an instance of a descriptor.  An instance may either by an object, a
-relation or a command.  An instance uses its descriptor's <code>A_NAME</code> attribute as its <code>A_TYPE</code> attribute.
-</p>
-
-<h3><a name="objects">Objects</a></h3>
-<p>
-<b>Objects</b> are instances of <b>object descriptors</b>.  Objects are used to the represent the external or internal
-entities that are being interacted with.  An instance object can be related in a certain way to another type of
-instance object if its object descriptor has the same kind of relationship to the other object's object descriptor.
-An instance object may be associated with a particular command if its object descriptor is associated with the command descriptor
-for that command.
-</p>
-
-<h3><a name="relations">Relations</a></h3>
-<p>
-<b>Relations</b> are instances of <b>relation descriptors</b>.  A relation is really a typed reference to another object.  Relations
-may exist from one object to another if the schema indicates that the object descriptor for the first object may have a relationship
-of that type to the other object's descriptor.  Relations are used to describe the relationship between two instances, the
-relationship between two descriptors and the relationship between an instance and a descriptor.  A relation is able to reference
-another element by storing the other element's <code>A_ID</code> attribute in its <code>A_SOURCE</code> attribute.  If a relation object
-needs to be dereferenced, it uses this attribute to query the DataStore for the object being referenced.
-</p>
-<p>
-A relation is typically represented by having an instance object DataElement contain a relation DataElement.
-There are two types of relationships between elements that are implicit.  These are the <i>contains</i> and
-the <i>parent of</i> relationships.  If an element is directly contained within another element, the
-relationship between those two elements is implied to be <i>contains/parent of</i> relationships.
-</p>
-
-<h3><a name="commands">Commands</a></h3>
-<p>
-<b>Commands</b> are instances of <b>command descriptors</b>.  A command is always associated with an instance object such that
-the command is to be performed on that object.  The object associated with a command is referred to as the <i>subject</i> of
-the command.  Only a command that has a command descriptor that is related to the object descriptor of the subject may be
-constructed.  A command object is constructed when the DataStore method <code>command()</code> is called.  The command is
-created with a reference to the subject, an optional set of arguments, also instance objects, and a status object instance, used
-to indicate the state of the command.  The tree of elements for a command is communicated, via the DataStore comm layer, to
-the appropriate miner(s), where it is interpreted and executed.
-</p>
-<p>
-The structure of a command looks like the following:
-</p>
-<ul>
-<li>Command
-	<ul>
-	<li>subject - a reference to the instance that this command applies to</li>
-	<li>arg 1 - an optional argument represented as a DataElement</li>
-	<li>...</li>
-	<li>arg n - an optional argument represented as a DataElement</li>
-	<li>status - element that represents the current status of a command</li>
-	</ul>
-</li>
-</ul>
-
-<p>
-As an example, suppose the DataStore is being used for browsing a filesystem.  The filesystem entities and how to interact
-with the filesystem needs to be defined in the schema.  The following descriptors could be used to describe this.
-</p>
-
-<ul>
-<li>Object Descriptors
-	<ul>
-	<li>"generic file object" - describes a generic file system object</li>
-	<li>"file" - describes a file object</li>
-	<li>"folder" - describes a folder object</li>
-	</ul>
-</li>	
-<li>Relation Descriptors
-	<ul>
-	<li>"contains" - represents the containment relationship between two objects</li>
-	<li>"abstracts" - represents a derives relationship between two object descriptors</li>
-	<li>"abstracted by" - represents an inherits relationship between two object descriptors</li>
-	</ul>
-</li>
-<li>Command Descriptors
-	<ul>
-	<li>"query" - a command to list the contents of a folder</li>
-	<li>"rename" - a command to rename a file or folder</li>
-	<li>"delete" - a command to delete a file or folder</li>
-	<li>"create" - a command to create a new file or folder from an existing folder</li>
-	</ul>
-</li>
-</ul>
-
-<p>
-Now that all the required descriptors are defined, relations between descriptors are needed.  Note that the
-symbol "-&gt;" implies a "contains" relationship and "IO()" implies an instance of a specified descriptor.
-</p>
-
-<ul>
-<li>"generic file object"
-	<ul>
-	<li>-&gt;"rename"</li>
-	<li>-&gt;"delete"</li>
-	<li>-&gt;IO("abstracts")-&gt;"folder"</li>
-	<li>-&gt;IO("abstracts")-&gt;"file"</li>	
-	</ul>
-</li>
-<li>"folder"
-	<ul>
-	<li>-&gt;"create"</li>
-	<li>-&gt;"query"</li>
-	<li>-&gt;IO("abstracted by")-&gt;"generic file object"</li>
-	<li>-&gt;IO("contains")-&gt;"generic file object"</li>
-	</ul>
-</li>
-<li>"file"
-	<ul>
-	<li>-&gt;IO("abstracted by")-&gt;"generic file object"</li>
-	</ul>
-</li>
-</ul>
-
-<p>
-DataStore schemas are created by the DataStore <b>miners</b>.  Each tool contributes it's
-own schema to the DataStore schema, referencing descriptors of other schemas, such
-that one tool can contribute to another tool.  All the command descriptors that are
-contributed by a miner are expected to be handled by the contributing miner.  Whenever
-a miner creates a new command descriptor, the <code>A_SOURCE</code> attribute indicates
-to the DataStore that an instance of that command should be routed to that miner when
-it's issued.
-<p>
-
-<p>
-See the section, <a href="Miners.html">Miners</a> to find out how miners contribute schemas
-and execute commands.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/Extending.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/Extending.html
deleted file mode 100755
index a136e4b6d..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/Extending.html
+++ /dev/null
@@ -1,18 +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 2000, 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>Extending and Using the DataStore</h1>
-<p>
-This section describes the basic steps required for extending the server DataStore with
-a DataStore miner and how to interact with the miners from an RSE subsystem.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/MemoryManagement.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/MemoryManagement.html
deleted file mode 100644
index 867971733..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/MemoryManagement.html
+++ /dev/null
@@ -1,68 +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 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>RSE DataStore Memory Management</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body>
-<h1><a name="dataelements">Memory Management in DataStore</a></h1>
-<p>
-A Memory Management scheme has been implemented for the DataStore that significantly reduces the memory footprint of the
-DataElements in high-use, long up-time situations. A problem that was identified was that in the DataStore, DataElements were
-rarely being destroyed - only when the files they represented were themselves deleted. When directories in the file system were explored,
-DataElements were being created to represent the files in the directories, but these DataElements were cached and never
-removed from the cache. Therefore, the number of DataElements in the DataStore was always increasing. With no opportunity
-to clear the cache or remove elements, the memory usage of the server continued to grow boundlessly.
-</p>
-<h2><a name="spirit">A solution - Spirit DataElements</a></h2>
-<p>
-The solution to the problem of an ever-growing set of DataElements was simple - provide a mechanism of removing "old"
-DataElements and thus shrinking the set. Since server memory real-estate comes at a much higher premium, the focus here
-is on server-side memory reduction. The assumption then, is that DataElements in the DataStore will always remain in
-memory on the client, but that in the mirror-image DataStore that resides on the server, DataElements can be removed.
-</p>
-<p>
-Formerly, the RSE ran under the assumption that the client and server DataStores mirrored each other. The new
-implementation has a server DataStore tree that is only a subset of all the elements in the client tree (because
-some elements get removed.) In order to accommodate this, a new boolean member variable was added to the DataElement
-class called "isSpirit". When this variable is set to true it means different things on the client and server. On the
-server, a "spirit" DataElement means the element is treated in much the same way as a "deleted" element. At the first
-opportunity, the element is purged from the DataStore and garbage collected by the JVM - freeing up memory. On the client,
-a "spirit" element means that that particular DataElement's counterpart has been made a spirit; thus the client "knows"
-that its twin element on the server side has either been deleted, or is about to be deleted.
-</p>
-<h2><a name="disconnecting">Disconnecting "old" DataElements:</a></h2>
-<p>
-How is it determined when to mark a given DataElement as a spirit? It was decided that the decision to this would be
-left to clients of the DataStore (the miners), rather than to the DataStore itself. This was done for the purposes of
-granularity: some individual miners may not want DataElements to be ever purged, some might want only specific elements,
-etc. As an example, the UniversalFileSystemMiner employs the FileClassifier to classify files returned from a directory
-query, and after each file has been classified, the DataStore's disconnectObject() method is called on the DataElement
-representing that file, setting the stage for its becoming a spirit.
-</p>
-<h2><a name="queue">Controlling the queue of DataElements:</a></h2>
-<p>
-A new class, the DataElementRemover, running in its own thread, maintains a queue of objects that were passed into
-DataStore's disconnectObject() method; each object is stored in the queue along with the time it was added. The
-DataElementRemover is configurable by two command-line options: -DSPIRIT_EXPIRY_TIME=x and -DSPIRIT_INTERVAL_TIME=y;
-where x and y are integers representing a number of seconds. Every y seconds, the queue checks its elements and "makes
-spirit" all those that are older than x seconds. The DataElement is then refreshed, and the change propagated to the
-client. On the server side, the DataElement is deleted at the first opportunity.
-</p>
-<h2><a name="feature">Turning on the feature:</a></h2>
-<p>
-On the client side, this feature is always "on". It is the server which is configured to do or not to do the spirit
-DataElement behaviour. This way, backwards compatibility is maintained - if a new client connects to an old server, or a
-server with spirit turned off, the client detects this and operates as before. If an old client connects to a new server
-with spirit turned on, the server detects that the client does not have spirit capability and behaves as it did before.
-</p>
-<p>
-To turn on the spirit feature on the server side, one needs to include the command-line option -DDSTORE_SPIRIT_ON=true.
-The server scripts have been packaged in order to do this by default.
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/Miners.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/Miners.html
deleted file mode 100755
index 525a9d793..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/Miners.html
+++ /dev/null
@@ -1,142 +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 2000, 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>Miners</h1>
-<p>
-<b>Miners</b> are remote tooling extensions to the DataStore.  Each miner describes the model
-that it works with as well as the commands associated with the model that it implements.  Each
-miner is responsible for extending the DataStore schema and providing implementations for
-commands that it defines.
-</p>
-<p>
-All miners are derived from the abstract class <code>Miner</code>.  To write a miner, the
-following APIs need to be implemented:
-</p>
-<pre>
-        public abstract void extendSchema(DataElement schemaRoot);
-        public abstract DataElement handleCommand(DataElement theCommand);
-</pre>
-<p>
-The first method, <code>extendSchema</code>, is implemented by a miner to contribute the types of objects, relationships and commands that
-it deals with.  The second method, <code>handleCommand</code>, is implemented by a miner so that it can execute the commands it defines.
-</p>
-
-<h2>Extending the Schema</h2>
-<p>
-A miner extends the DataStore schema by populating the <i>schemaRoot</i> with <a href="DataElements.html#descriptors">descriptors</a>.
-The DataStore repository tree is structured so that there is a single node where schema descriptors reside.  All
-<a href="DataElements.html#objectdescriptors">object descriptors</a> and <a href="DataElements.html#relationdescriptors">relation descriptors</a>
-are created under this schema root.  <a href="DataElements.html#commanddescriptors">Command descriptors</a> are created under the
-object descriptors that they apply to.  Each miner contributes to this global DataStore schema, so each may also extend or leverage the
-information from another miner's schema.
-</p>
-<p>
-A miner implements <code>extendSchema(DataElement)</code> to add new descriptors to the DataStore schema.  If a miner creates representations
-of objects that are not already represented by some other miner's schema, then it needs to define descriptors for those new types of objects.
-Sometimes new relationship types also need to be defined by a miner for its particular model.  In order for a miner to be interacted with,
-via <code>handleCommand</code>, it needs to define command descriptors for object descriptors in the schema.  The code below illustrates the
-typical structure of an <code>extendSchema</code> implementation:
-</p>
-
-<font color='#4444CC'>
-<pre>
-	public void extendSchema(DataElement schemaRoot)
-	{
-		// create object descriptors
-		DataElement myObjectType1 = createObjectDescriptor(schemaRoot, "my object type 1");
-		DataElmeent myObjectType2 = createObjectDescriptor(schemaRoot, "my object type 2");
-		DataElement myObjectContainerType = createObjectDescriptor(schemaRoot, "my object container");
-				
-		// create relation descriptors		
-		DataElement myRelationType = createRelationDescriptor(schemaRoot, "my relation type");
-		
-		// create command descriptors
-		createCommandDescriptor(myObjectType1, "My Command 1", MY_COMMAND_1);
-		createCommandDescriptor(myObjectType2, "My Command 2", MY_COMMAND_2);
-		createCommandDescriptor(myObjectContainerType, "Query", MY_QUERY);	
-		
-		// establish relationships between object types		
-		createReference(myObjectType1, myObjectType2, myRelationType); 	// myObjectType1 instances can be associated with myObjectType2 instances by myRelationType
-		createReference(myObjectContainerType, myObjectType1);			// myObjectContainerType instances can contain myObjectType1 instances
-		createReference(myObjectContainerType, myObjectType2);			// myObjectContainerType instances can contain myObjectType2 instances
-	
-		...
-	}	
-</pre>
-</font>
-
-<p>
-The DataStore does not enforce that instance element trees are structured in the manner that the schema describes so the
-establishing of relationships between object types, as done in this example, is unnecessary as a miner knows its own
-model, since it defined it.  But by convention, it is a good thing to describe a model with those relationships explicitly stated
-because other miners or client tools may want to leverage or extend the model for their own purposes.
-</p>
-
-
-<h2>Handling Commands</h2>
-<p>
-The <code>handleCommand</code> method is called by the <a href="Communications.html#servercommandhandler">Server Command Handler</a>
-if the descriptor for a command instance is associated with a particular miner.  When this is called, it is up to the miner implementation
-to interpret and execute the command.
-</p>
-<p>
-A <a href="DataElements.html#commands">Command instance</a> is a tree of <a href="DataElements.html">DataElements</a> representing the
-command, the subject of the command, additional arguments to the command and the status of the command.  The way this is normally interpretted
-by a miner to mean <i>perform the specified command on the subject using the specified arguments.  Change the status to be "done" when the
-operation is complete.</i>.
-</p>
-<p>
-The base miner class provides APIs to assist a miner implementation in extracting information from
-a command tree.  The method <code>getCommandName(DataElement)</code> is used to extract the
-name of the command, <code>getCommandStatus(DataElement)</code> returns the status element of
-the command, and <code>getCommandArgument(DataElement, int)</code> returns an argument at the
-specified index.  The first argument is always the subject.  The code below illustrates
-the typical structure of a <code>handleCommand</code> implementation.
-</p>
-
-<font color='#4444CC'>
-<pre>
-	public DataElement handleCommand(DataElement theElement)
-	{
-		String name = getCommandName(theElement);
-		DataElement status = getCommandStatus(theElement);
-		DataElement subject = getCommandArgument(theElement, 0);
-		
-		if (name.equals(MY_COMMAND_1))
-		{
-			handleMyCommand1(subject, arg1,...,argn, status);
-		}
-		...
-		status.setAttribute(DE.A_NAME, "done");
-		_dataStore.refresh(status);
-	}
-</pre>
-</font>
-<p>	
-The results of a command may be returned in a variety of ways, depending on its
-purpose.  One thing that is always returned is the status object.
-</p>
-<p>
-Think of the status object as the return value of a method.  The status object needs to be set to "done"
-whenever a command is complete but it may also optionally contain results in the form
-of DataElements. If a command is requesting transient information about something, then
-the status object could be populated with the results.
-</p>
-<p>
-Each miner has read and write access to the entire DataStore tree.  If desired a miner
-can modify that tree as a result of a command.  For example, a miner used for browsing
-a file system might populate the subject, a folder object, with other folder and file
-objects, rather than transiently via the status object.  In this way, a miner caches
-data and expands the data available to the DataStore repository in response to user
-requests.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/ServerSide.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/ServerSide.html
deleted file mode 100755
index 5ec50b7b9..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/ServerSide.html
+++ /dev/null
@@ -1,36 +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 2000, 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>Extending the Server-side</h1>
-<p>
-This section describes the basic steps needed to extend the server side tooling using <b>Miners</b>.
-</p>
-<ol>
-<li>
-Write a new <a href="Miners.html">DataStore miner</a> by extending the <b>Miner</b> class.
-</li>
-<li>
-Put the compiled miner class on the host, preferably in jar form
-</li>
-<li>
-Register the new miner so that it gets loaded when the server DataStore is connected to.  This may be done
-by adding the miner's qualified classname to the file <i>minerFile.dat</i>.  Alternatively, an additional <i>minerFile.dat</i>
-file can be used to supply the classname.
-</li>
-<li>
-Update the classpaths for the server side so that the new miner class can be loaded by the
-DataStore.  This will vary depending on how the DataStore server is started up.  If a startup
-script is used, then you could update the classpath specified in the script or the system classpath
-could be updated.
-</li>
-</ol>
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/arch.jpg b/rse/doc/org.eclipse.dstore.doc.isv/guide/images/arch.jpg
deleted file mode 100755
index c52bd9ff9..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/arch.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/local.jpg b/rse/doc/org.eclipse.dstore.doc.isv/guide/images/local.jpg
deleted file mode 100755
index 806c24f43..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/local.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/remote.jpg b/rse/doc/org.eclipse.dstore.doc.isv/guide/images/remote.jpg
deleted file mode 100755
index 0829df309..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/images/remote.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/guide/overview.html b/rse/doc/org.eclipse.dstore.doc.isv/guide/overview.html
deleted file mode 100755
index 92e8e5626..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/guide/overview.html
+++ /dev/null
@@ -1,67 +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 2000, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>Remote System Explorer Overview</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>DataStore Overview</h1>
-<p>
-The RSE uses the concept of <b>subsystems</b> as a common abstraction for remote tooling.  Subsystems provide
-public interfaces that are called when some remote tool or resource needs to be communicated with.  As long as
-the appropriate public interfaces are implemented, the means of communicating with these remote tools and resources
-is up to the developer of the subsystem.  Whatever that might be, some kind of communication layer is required
-to access tools on the host.  One such means that is used by existing RSE Subsystems and can be reused is the
-DataStore framework.
-</p>
-<p>
-The <b>DataStore</b> communications framework is used to provide remote access and tooling for the Remote System Explorer.
-It is a communications layer, in-memory data repository and a pluggable tooling framework.  While Eclipse provides
-the ability for local tools to plug into the Eclipse workbench, DataStore provides the ability to integrate
-remote tools into the Remote System Explorer.  When implementing subsystem APIs, a particular implementation
-may provide remote function by leveraging DataStore.
-</p>
-
-<img src="images/arch.jpg" alt="DataStore and it's relationship to RSE and Eclipse" border="0">
-
-<p>
-In an RSE subsystem, the goal of the DataStore is to provide the bridge to tools and resources on the host.
-To interact with a remote tool, a DataStore client communicates over a network with a DataStore server.  Data and
-commands are transferred between the client and server via the DataStore communication layer.  Information
-that is communicated between each side is kept in memory with the DataStore repository. Both the client and server DataStores
-have this repository and it is the responsibility of the DataStore communication layer to keep the contents
-of each of these repositories in sync.  All the DataStore data on the server side is replicated to the client and
-and vice versa.
-</p>
-<p>
-The DataStore framework is generic in the sense that it can be used to facilitate any kind of remote tooling.  There are
-no specialized APIs or artifacts that are geered towards a particular use.  How DataStore is used is determined by the
-tool extensions, <a href="Miners.html">Miners</a>.  <a href="Miners.html">Miners</a> are typically either adapters to
-tools on the host or are tools themselves.  These extensions determine the meaning of data used to represent objects,
-relationships and the commands that can be issued on the represented objects.  <a href="Miners.html">Miners</a> shape the
-DataStore by contributing <a href="Schemas.html">schemas</a> to the pool of information in a DataStore repository.
-Because the client and server DataStore repositories are synchronized, the DataStore clients
-have access to the miner <a href="Schemas.html">schemas</a> and, using that information, they are able to communicate with the tools on the host.
-Because the server has access to those miner <a href="Schemas.html">schemas</a>, each <a href="Miners.html">Miners</a> may also communicate with
-other <a href="Miners.html">Miners</a> on the host in the same way a client can.
-</p>
-<p>
-A Filesystem miner can shape the DataStore by contributing a <a href="Schemas.html">schema</a> that
-describes file systems and how they should be interacted with.  The <a href="Schemas.html">schema</a> could describe
-files, folders, properties of files and relationships between them as well as commands for querying folders or renaming files.
-An RSE subsystem, can then provide browsing capabilities to a remote file system by sending commands
-via the DataStore client to the Filesystem Miner on the host.  Another <a href="Miners.html">miner</a> can
-contribute its own <a href="Schemas.html">schema</a> or extend the existing Filesystem Miner <a href="Schemas.html">schema</a>
-to leverage or contribute to the existing file  system tool.
-</p>
-<p>
-This guide explains all underlying
-artifacts and model of the DataStore, its relationship to RSE, 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.dstore.doc.isv/notices.html b/rse/doc/org.eclipse.dstore.doc.isv/notices.html
deleted file mode 100755
index 6c70b9c62..000000000
--- a/rse/doc/org.eclipse.dstore.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, 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">

-   <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, 2006.

-</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.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
deleted file mode 100755
index fcb8f7dbd..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ /dev/null
@@ -1,25 +0,0 @@
--charset "iso-8859-1"
--sourcepath "../org.eclipse.dstore.core/src
-;../org.eclipse.dstore.extra/src"
--d reference/api
--classpath @rt@
--breakiterator
--use
--splitIndex
--windowtitle "Remote System Explorer DataStore API Specification"
--doctitle "Remote System Explorer DataStore API Specification"
--header "<b>Remote System Explorer DataStore</b><br>Release 1.0"
--bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using DataStore APIs</a>.</p></font>'
--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/
--link http://bundles.osgi.org/javadoc/r4
-
-org.eclipse.dstore.core
-org.eclipse.dstore.core.client
-org.eclipse.dstore.core.java
-org.eclipse.dstore.core.miners.miner
-org.eclipse.dstore.core.model
-org.eclipse.dstore.core.server
-org.eclipse.dstore.core.util
-org.eclipse.dstore.core.util.ssl
-org.eclipse.dstore.extra
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties b/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties
deleted file mode 100755
index 6b30fcd99..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=RSE DStore ISV Documentation
-providerName=Eclipse.org
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml b/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml
deleted file mode 100755
index c98822571..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-
-   <extension point="org.eclipse.help.toc">
-   	  <toc file="toc.xml" primary="true" category="DSDP.TM"/>
-   	  <index path="index/"/>
-   </extension>
-
-</plugin>
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/provisional_api.html b/rse/doc/org.eclipse.dstore.doc.isv/provisional_api.html
deleted file mode 100644
index ea205b0f3..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/provisional_api.html
+++ /dev/null
@@ -1,32 +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 API Status</title>
-<meta name="copyright" content="Copyright (c) Wind River Systems, Inc. 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">
-<h1>Remote System Explorer API Status</h1>
-<h2>Provisional API</h2>
-<div class="p">
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>
-under category DSDP, Product Target Management.</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore b/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore
deleted file mode 100644
index eedd89b45..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-api
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/reference/placeholder.txt b/rse/doc/org.eclipse.dstore.doc.isv/reference/placeholder.txt
deleted file mode 100644
index 89b1c1c77..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/reference/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-A nearly empty file used to force the creation of the containing folder.
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/toc.html b/rse/doc/org.eclipse.dstore.doc.isv/toc.html
deleted file mode 100755
index 19c48bc70..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/toc.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">
-    <LINK REL="STYLESHEET" HREF="book.css" TYPE="text/css">
-	<title>RSE DataStore developer information</title>
-</head>
-
-<body>
-<h1>Using the RSE DataStore for Remote Communications</h1>
-<div class="p">
-This section provides information for tool developers who wish to
-add server-side tooling capabilities.  Using the RSE DataStore tooling 
-communication framework, server-side extensions can be written.  The Remote System Explorer can be
-extended to interface the new server-side extensions.
-</div>
-
-<h2>Provisional API</h2>
-<div class="p">
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>
-under category DSDP, Product Target Management.</p>
-</div>
- 
-</body>  
-</html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/toc.xml b/rse/doc/org.eclipse.dstore.doc.isv/toc.xml
deleted file mode 100755
index 6ea4c48d1..000000000
--- a/rse/doc/org.eclipse.dstore.doc.isv/toc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="RSE DStore Developer Guide">
- 	<topic label="Guide" href="toc.html">
-		<topic label="DataStore Overview"  href="guide/overview.html">
-			<topic label="DataStore Artifacts" href="guide/Artifacts.html" />
-			<topic label="DataStore Communications" href="guide/Communications.html" />
-			<topic label="DataElements and the DataStore Model" href="guide/DataElements.html" />
-			<topic label="Memory Management of DataElements" href="guide/MemoryManagement.html" />
-			<topic label="Miners" href="guide/Miners.html" />
-		</topic>
-		<topic label="Extending and Using the DataStore" href="guide/Extending.html">
-			<topic label="Extending the Server-side" href="guide/ServerSide.html" />
-			<topic label="Communicating with the Server-side" href="guide/ClientSide.html" />
-		</topic>
-		<anchor id="guide_additions"/>
-	</topic>
-	<topic label="Reference" href="provisional_api.html">
-		<topic label="DataStore API Reference" href="provisional_api.html">
-		     <topic label="org.eclipse.dstore.core.model" href="reference/api/org/eclipse/dstore/core/model/package-summary.html" />
-		     <topic label="org.eclipse.dstore.core.client" href="reference/api/org/eclipse/dstore/core/client/package-summary.html" />
-		     <topic label="org.eclipse.dstore.core.server" href="reference/api/org/eclipse/dstore/core/server/package-summary.html" />
-		     <topic label="org.eclipse.dstore.core.util" href="reference/api/org/eclipse/dstore/core/util/package-summary.html" />
-		     <topic label="org.eclipse.dstore.core.miners.miner" href="reference/api/org/eclipse/dstore/core/miners/miner/package-summary.html" />
-	    </topic>
-	    <anchor id="reference_additions"/>
-	</topic>
-	<topic label="Legal" href="notices.html"/>
-</toc>
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 672279cc2..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: 2.0.0.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 d73e72b8e..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/index.php/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 460233046..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 2, 2006</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 10fd0ba73..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-# Martin Oberhuber (Wind River) - Declare API provisional
-###############################################################################
-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/,\
-               provisional_api.html
-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 2edc7b8c4..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.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.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="debug" 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.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" />
-	</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}${argsListDelimiter}${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">
-			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
-		</exec>
-	</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 7e14739e6..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- ===================================================================== -->
-<!-- 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 d158ee5f0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html
+++ /dev/null
@@ -1,209 +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>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 via RSE persistence in an Eclipse project named <CODE>RemoteSystemsConnections</CODE></A>, which
-the user can enable for team support, allowing Hosts to be shared by a team.
-</p>
-
-<h2><A name="profiles">Profiles</A></h2>
-<p>
-To facilitate team-shared and user-unique Hosts,
-Hosts are owned by <b>profiles</b>. These are simply <A href="file_profiles.gif">folders in the RemoteSystemsConnections
-project</A>, as it turns out, within which all other data including Hosts are scoped. 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. 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>
-<p>
-As an aside, user IDs and passwords are not shared with the team repository, but rather stored only locally per
-workstation.
-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="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>
-<h2><A name="systems">Systems and System 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/model/SystemStartHere.html#getSystemRegistry()">getSystemRegistry()</A> in the
-<A href="../reference/api/org/eclipse/rse/model/SystemStartHere.html">SystemStartHere</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 467060c99..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
+++ /dev/null
@@ -1,99 +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>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 (or this product),
-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, as described in
-this product's online help. 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>
-Here we will introduce the unique extension points defined by the Remote System Explorer. They are
-further described in the reference section. These extension points 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 in the plugin.xml file of the
-<code>org.eclipse.rse.core</code> plugin, which you will find in the plugins sub-folder of your
-installation directory. This file has comment blocks that offer further information about the
-extension points defined in it.
-
-Here are the extension points that are defined by the RSE:
-</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.<b>systemTypes</b></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.ui.<b>subsystemConfigurations</b></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.<b>archivehandlers</b></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.rse.ui.<B>popupMenus</B></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.rse.ui.<b>propertyPages</b></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>
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.<b>remoteSystemsViewPreferencesActions</b></A></TD>
-			<TD>For contributing a fastpath action to jump to your preferences page, from the local pulldown menu of 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>
-<!-- TODO
-  should we add a reference to the runtime-options here,
-  instead of the old rseConfigDefaults extension point?
-
-  <TD>For solution providers that are building a product that includes RSE, 
-  these runtime options allow you to pre-set some out-of-box preference 
-  values. For example, whether the New Connection tree item is shown in 
-  Remote Systems view.</TD>
--->
-</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 841132b66..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 4160df436..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/uiLoggerAPI.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>RSE Logger API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Logger API</h1>
-<p>To use the RSE logging framework, you must first decide if you want your own log file,
-or want to use the common RSE log file.
-</p>
-
-<h2>Using Your Own Log File</h2>
-<p>
-The log file support is encapsulated in a separate plugin, <b><samp>org.eclipse.rse.logging</samp></b>, which
-defines the primary <samp><A href="../../../reference/api/org/eclipse/rse/logging/Logger.html">org.eclipse.rse.logging.Logger</a></samp> class that manages the log file.
-This log file support offers the ability to log the following types of log messages:</p>
-<ul>
-<li><b>Error</b>. These are serious errors detected by your programming logic.
-<li><b>Warning</b>. These are warning situations detected by your programming logic.
-<li><b>Information</b>. These are informational messages you want to capture to help with problem determination.
-<li><b>Debug</b>. These are trace statements typically only enabled in development drivers.
-</ul>
-
-<p>To define your own logging file, in your plugin class:</p>
-<ol>
-<li>Define a static variable to hold the Logger instance, as in:<br>
-<code>protected static Logger log = null;</code>
-<li>Instantiate the Logger object, in your plugin class constructor, as in:<br>
-				<code>if (log == null) log = LoggerFactory.getLogger(this);</code>
-<li>For convenience, offer fastpaths to the logXXX methods in your Logger instance:
-<pre>
-    public static void <b>logInfo</b>(String message)
-    {
-    	log.logInfo(message);
-    }
-    public static void <b>logWarning</b>(String message)
-    {
-    	log.logWarning(message);
-    }
-    public static void <b>logError</b>(String message)
-    {
-    	log.logError(message, null);
-    }
-    public static void <b>logError</b>(String message, Throwable exception)
-    {
-    	log.logError(message, exception);
-    }
-    public static void <b>logDebugMessage</b>(String prefix, String message)
-    {		
-     log.logDebugMessage(prefix, message);
-    }		
-</pre>
-<li>In the <samp>shutdown</samp> method of your plugin class, close the log file:
-<code>LoggerFactory.freeLogger(this); </code>
-</ol>
-<p>Typically your code will write a healthy number of messages to the log file, to help you determine
-what went wrong in an error situation in production. However, since this can result in a large number of
-messages in the log file, it is recommended that you offer the user's a preference page in which they
-can specify the types of messages to record in the log file, which should default to error messages only.
-In the event of a problem, they can then turn on a more verbose logging option and re-produce the problem,
-sending the log file to you for additional information. For example, for the Remote System Explorer, this
-preference page is supplied:</p>
-<P><IMG border="0" src="logPreferences.gif"></P>
-
-<h2>Using The Common RSE Log File</h2>
-<p>To log your messages to the common RSE log file in <samp>.metadata\plugins\org.eclipse.rse.ui</samp>,
-either base your plugin class on the <samp>org.eclipse.rse.core.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 8018d11cc..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/core/SystemBasePlugin.html"org.eclipse.rse.core.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/core/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/core/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/core/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/core/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.core.*; // <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 1258ef57e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessagesCore.html
+++ /dev/null
@@ -1,1010 +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>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 canceled. 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 ultimate are folders in the file system, so profile names must be valid folder names for the workbench. Further, 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>Enter 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>Enter 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 its 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>Not a valid connection name<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.<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 by IBM. Specify another name for the profile.<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>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>
-<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>
-<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>
-<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 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>
-<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>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>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 drag and drop operation<br>
-<b>LevelTwo: </b>The source %1 cannot be transferred into the target %2<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>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>
-<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 '%' 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>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 read access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have read 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 overwrite it?<br>
-<b>LevelTwo: </b><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>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>
-<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.<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>
-<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 4e762dfa0..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/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 7c9bba5a6..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/core/SystemBasePlugin.html">org.eclipse.rse.core.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/core/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/core/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/core/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/core/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/core/SystemBasePlugin.html#initializeImageRegistry()">initializeImageRegistry()</A></samp>. Call
-<samp><A href="../../../reference/api/org/eclipse/rse/core/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/core/SystemBasePlugin.html#getPluginId()">getPluginId()</A></samp>. Return this plugin's ID.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/SystemBasePlugin.html#getActiveWorkbenchShell()">getActiveWorkbenchShell()</A></samp>. Return the shell of the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/SystemBasePlugin.html#getActiveWorkbenchWindow()">getActiveWorkbenchWindow()</A></samp>. Return the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/SystemBasePlugin.html#getWorkspaceRoot()">getWorkspaceRoot()</A></samp>. Return the root of the workspace.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/SystemBasePlugin.html#getWorkspace()">getWorkspace()</A></samp>. Return the workspace root.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/SystemBasePlugin.html#getInstallLocation()">getInstallLocation()</A></samp>. Return the install directory for this plugin.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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/core/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 7c4b5338e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/properties/uiPropertiesAPI.html
+++ /dev/null
@@ -1,76 +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 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>Remote resources have no underlying eclipse resource, and typically all are instances of the same class,
-meaning insufficient fidelity in scoping property pages to a remote resource of a particular type. Because of this,
-the RSE supplies its <a href="../../../reference/extension-points/org_eclipse_rse_ui_propertyPages.html">propertyPages</a> extension point, for remote resources, which allows for
-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 313117219..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html
+++ /dev/null
@@ -1,125 +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 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>Logging</h2>
-<p>The Remote System Explorer comes with special support for <a href="logger/uiLoggerAPI.html">logging information</a> to a log file,
-for the purpose of problem determination for servicing your plugin. The log file support allows
-you to either log your messages to the common RSE log file in the <samp>.metadata\plugins\org.eclipse.rse.core</samp>
-folder, or to define your own log file in your plugin metadata folder, if desired.
-</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/model/SystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String, org.eclipse.jface.viewers.Viewer)">method</a></samp>.
-To get the system registry, use the
-<samp><A href="../../reference/api/org/eclipse/rse/model/SystemStartHere.html#getSystemRegistry()">method</a></samp>.
-</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 9a5485053..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html
+++ /dev/null
@@ -1,160 +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>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><samp>org.eclipse.ui.viewActions</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><samp>org.eclipse.ui.propertyPages</samp></TD>
-			<TD>For adding property pages for non-remote 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>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp>
-			</ul>
-            It is possible to scope your property pages to only appear for certain system types or subsystems, using
-             the <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;subsystemFactoryId&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><samp>org.eclipse.ui.popupMenus</samp></TD>
-			<TD>For adding pop-up menu actions for non-remote 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>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp>
-			</ul>
-            It is possible to scope your actions to only appear for certain system types or subsystems, using
-             the <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;subsystemFactoryId&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>"subsystemFactoryId"</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>"subsystemFactoryCategory"</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/subsystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
deleted file mode 100755
index 10b21ae60..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
+++ /dev/null
@@ -1,243 +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 SubSystems</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In SubSystems</h1>
-<p>The <samp><A href="../../reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.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_ui_subsystemConfiguration.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. However, in this case it is used to create
-folders within the <samp>RemoteSystemsConnections</samp> project, where all Remote System Explorer data is stored.
-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><b>vendor</b>. Your company name, shown in properties dialog for subsystems created by this subsystem configuration.
-<li><b>icon</b>. The icon displayed in the Remote Systems view for each subsystem created by this subsystem configuration.
-<li><b>iconlive</b>. The icon used when the subsystem is physically connected to its remote system.
-<li><b>name</b>. The name displayed in the Remote Systems view for each subsystem created by this subsystem configuration.
-<li><b>systemTypes</b>. A semi-colon separated list of system types 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. The default is all
-system types.
-<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><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.
-</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>ISubSystemFactory</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/subsystems/files/core/subsystems/RemoteFileSubSystem.html#internalResolveFilterString(org.eclipse.core.runtime.IProgressMonitor, java.lang.String)">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>system manager</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A></samp></TD>
-			<TD>Manages a single system 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>return a singleton instance of the system manager from step 3 in its <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#getSystemManager()">getSystemManager</A> method,
-       <li>manage persistent properties via calls to the inherited <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#setVendorAttribute(java.lang.String, java.lang.String, java.lang.String)">setVendorAttribute</A>
-       and <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#getVendorAttribute(java.lang.String, java.lang.String)">getVendorAttribute</A> methods,
-       <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(org.eclipse.core.runtime.IProgressMonitor, java.lang.String)">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.
-      </ul>
-   </li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">DefaultSubSystemFactoryImpl.</A></li>
-  <li>Defining your <A href="../../reference/extension-points/org_eclipse_rse_ui_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>
-		&nbsp;&nbsp;MyAdapterFactory factory = new MyAdapterFactory(); // extends AbstractSystemRemoteAdapterFactory<br>
-		&nbsp;&nbsp;IAdapterManager manager = Platform.getAdapterManager();<br>
-		&nbsp;&nbsp;manager.registerAdapters(factory, MyModelObject1.class);<br>
-		&nbsp;&nbsp;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 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 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 type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.html#getNewFilterPoolFilterAction(org.eclipse.rse.core.filters.ISystemFilterPool, org.eclipse.swt.widgets.Shell)">getNewFilterPoolFilterAction(SystemFilterPool, Shell)</a></samp>
-            method in your subsystem factory, to return an instance of 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 type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.html#getChangeFilterAction(org.eclipse.rse.core.filters.ISystemFilter, org.eclipse.swt.widgets.Shell)">getChangeFilterAction(SystemFilter, Shell)</a></samp>
-            method in your subsystem factory, to return an instance of your change-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/SystemChangeFilterAction.html">change-filter action class</a>.
-    </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 a19febddc..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/systemtype.html
+++ /dev/null
@@ -1,37 +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> extension point is 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 fcc4eaadc..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int.html
+++ /dev/null
@@ -1,48 +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 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>.
-</div>
-
-<h2>Provisional API</h2>
-<table>
-<!--
-<table bgcolor="yellow" border="1">
-<tr><th><b>API Status</b></th></tr>
--->
-<tr><td>
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>under 
-category DSDP, Product Target Management.</p>
-</td></tr></table>
-
-</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 0bb2eeb94..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_architecture.html
+++ /dev/null
@@ -1,78 +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="#UIs">UI Layer</A></li>

-</ul>

-

-

-<h2><A name="Services">RSE Service Layer</A></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>

-		<h2><A name="SubSystems">RSE Subsystem Layer</A></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 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>

-

-<h2><A name="UI">RSE UI Layer</A></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 0e908d1f8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_connectorservices.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, 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 Connector Services</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Connector Services</h1>

-</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 8040c8990..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, 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 Hosts</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 309efcbe5..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_hosts.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, 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 Hosts</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Hosts</h1>

-</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 66d81b30e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_overview.html
+++ /dev/null
@@ -1,44 +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 property pages to remote objects, add actions to the pop-up menus for remote objects, and 

-even create your own subsystems that appear when a connection is expanded. 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 existing Eclipse extension points to author menu items, tool bar actions, pop-up menu actions,

-and more for non-remote 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 451a1056d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_services.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, 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 Services</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Services</h1>

-</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 f4799a539..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_subsystems.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, 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 Subsystems</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Subsystems</h1>

-</body>

-</html>

-

diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_ui.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_ui.html
deleted file mode 100755
index 33bba22aa..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_ui.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 UI</h1>

-</body>

-</html>
\ No newline at end of file
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 69fe7749e..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 getTheDeveloperConnectorServiceManager()
-	{
-		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 38095d16a..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()>0) && (textDevr.getText().trim().length()>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 f7cdae861..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
+++ /dev/null
@@ -1,219 +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;

-

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)

-	 */

-	public boolean supportsUserDefinedActions(Object object) {

-		<strong>return false;</strong>

-	}

-

-}

-</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 cd27ebf58..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, 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>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(IProgressMonitor monitor, String filterString)
-         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"/>protected Object[] internalResolveFilterString(IProgressMonitor monitor, Object parent, String filterString)
-         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 060d235f5..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, 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>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(IProgressMonitor monitor, String filterString)
-         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 &lt1; 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) && (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(IProgressMonitor monitor, Object parent, String filterString)
-         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 9e73c074f..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.getTheDeveloperConnectorServiceManager()
-			.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"/><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 6729261ec..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.getTheDeveloperConnectorServiceManager()
-			.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 0ed02dc04..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 && 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) && (folders.length>0))

-			{

-				for (int idx=0; !stopped && (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 ef43681ed..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin.html
+++ /dev/null
@@ -1,141 +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.Platform;

-import org.eclipse.rse.core.SystemBasePlugin;

-import org.eclipse.rse.services.clientserver.messages.SystemMessage;

-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;

-import org.osgi.framework.BundleContext;

-

-/**

- * 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 = null;

-	private static SystemMessageFile messageFile = null;

-	

-	/**

-	 * The constructor.

-	 */

-	public RSESamplesPlugin() {

-		super();

-	}

-

-	/**

-	 * This method is called upon plug-in activation

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		<strong>plugin = this;

-		messageFile = getMessageFile("rseSamplesMessages.xml");</strong>

-	}

-

-	/**

-	 * This method is called when the plug-in is stopped

-	 */

-	public void stop(BundleContext context) throws Exception {

-		<strong>plugin = null;

-		resourceBundle = null;</strong>

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance.

-	 */

-	<strong>public static RSESamplesPlugin getDefault() {

-		return plugin;

-	}</strong>

-

-	/**

-	 * Returns the workspace instance.

-	 */

-	<strong>public static IWorkspace getWorkspace() {

-		return ResourcesPlugin.getWorkspace();

-	}</strong>

-

-	/**

-	 * Returns the string from the plugin's resource bundle,

-	 * or 'key' if not found.

-	 */

-	<strong>public static String getResourceString(String key) {

-		ResourceBundle bundle= RSESamplesPlugin.getDefault().getResourceBundle();

-		try {

-			return (bundle != null) ? bundle.getString(key) : key;

-		} catch (MissingResourceException e) {

-			return key;

-		}

-	}</strong>

-

-	/**

-	 * Returns the plugin's resource bundle,

-	 */

-	<strong>public ResourceBundle getResourceBundle() {

-		try {

-			if (resourceBundle == null)

-				resourceBundle = ResourceBundle.getBundle("samples.rseSamplesResources");

-		} catch (MissingResourceException x) {

-			resourceBundle = null;

-		}

-		return resourceBundle;

-	}</strong>

-

-	/**

-	 * Initialize the image registry by declaring all of the required graphics.

-	 */

-	protected void initializeImageRegistry()

-	{

-	}

-

-	/**

-	 * 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.

-	 */

-	<strong>public SystemMessageFile getMessageFile(String messageFileName)

-	{

-		return loadMessageFile(getBundle(), messageFileName);  	

-	}</strong>	

-

-	/**

-	 * Return our message file

-	 */

-	<strong>public static SystemMessageFile getPluginMessageFile()

-	{

-		return messageFile;

-	}</strong>  

-

-	/**

-	 * Retrieve a message from this plugin's message file

-	 */

-	<strong>public static SystemMessage getPluginMessage(String msgId)

-	{

-		return getMessage(messageFile, msgId);

-	}</strong>

-}

-</samp></pre>

-</p>

-</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 f1b2ee08a..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.core.SystemBasePlugin;

-import org.eclipse.rse.services.clientserver.messages.SystemMessage;

-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;

-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 90e137bc2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents1.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">

-<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>

-<p>

-<pre><samp>

-package samples.ui.actions;

-

-import org.eclipse.rse.files.ui.actions.SystemAbstractRemoteFilePopupMenuExtensionAction;

-

-public class <b>ShowJarContents</b>

-	extends SystemAbstractRemoteFilePopupMenuExtensionAction

-{

-

-	/**

-	 * Constructor for ShowJarContents.

-	 */

-	public <b>ShowJarContents</b>()

-	{

-		super();

-	}

-

-	/**

-	 * @see org.eclipse.rse.ui.actions.SystemAbstractPopupMenuExtensionAction#run()

-	 */

-	public void <b>run</b>()

-	{

-	}

-

-}

-

-</samp></pre>

-</p>

-</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 a316ea3dd..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents2.html
+++ /dev/null
@@ -1,64 +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>ShowJarContents Class After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>ShowJarContents Class After Editing</h1>

-<p>

-<pre><samp>

-package samples.ui.actions;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.rse.core.model.IHost;

-import org.eclipse.rse.files.ui.actions.SystemAbstractRemoteFilePopupMenuExtensionAction;

-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;

-

-public class ShowJarContents2 extends SystemAbstractRemoteFilePopupMenuExtensionAction {

-

-	public ShowJarContents2() {

-		super();

-	}

-

-	public void run() {

-		IRemoteFile selectedFile = getFirstSelectedRemoteFile();

-		String cmdToRun = "jar -tvf " + selectedFile.getAbsolutePath();

-		runCommand(cmdToRun);

-	}

-

-	private void runCommand(String command) {

-		IRemoteCmdSubSystem cmdss = getRemoteCmdSubSystem();

-		if (cmdss != null && cmdss.isConnected()) {

-			RemoteCommandHelpers.runUniversalCommand(getShell(), command, ".", cmdss);

-		} else {

-			MessageDialog.openError(getShell(), "No command subsystem", "Found no command subsystem");

-		}

-	}

-	

-	/**

-	 * Gets the Command subsystem associated with the current host

-	 */

-	private IRemoteCmdSubSystem getRemoteCmdSubSystem() {

-		IHost myHost = getSubSystem().getHost();

-		IRemoteCmdSubSystem[] subsys = RemoteCommandHelpers.getCmdSubSystems(myHost);

-		for (int i = 0; i < subsys.length; i++) {

-			if (subsys[i].getSubSystemConfiguration().supportsCommands()) {

-				return subsys[i];

-			}

-		}

-		return null;

-	}

-

-}

-</samp></pre>

-</p>

-</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 c576c6c5c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResourceAdapter.html
+++ /dev/null
@@ -1,228 +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"/>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"/>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"/>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"/>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"/>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 	

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)

-	 */

-	public boolean supportsUserDefinedActions(Object object) {

-		<strong>return false;</strong>

-	}

-

-}

-</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 c6cd77505..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/index.html
+++ /dev/null
@@ -1 +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.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_1.gif
deleted file mode 100755
index 717f78de8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_1.gif
+++ /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.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif
deleted file mode 100755
index e4fdfff8d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif
deleted file mode 100755
index 5c42bae1b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif
deleted file mode 100755
index 8bbc87bd9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif
+++ /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 fd07da1a7..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProject.html
+++ /dev/null
@@ -1,64 +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 Plug-in Project</title>

-</head>

-

-	<body bgcolor="#ffffff">

-		<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>On the left of the dialog box, select <b>Plug-in Development</b> category, and on the right, select the <b><a href="pdeProj_1.gif">Plug-in Project</a></b> wizard. Press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page1.gif">first page</a> of the wizard (Plug-in Project Name), enter <b>&quot;RSESamples&quot;</b> for the project name (without the quotes). Press <b>Next &gt;</b>.

-			<li>In the second page of the wizard (Plug-in Project Structure), just take the defaults, and press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page3.gif">third page</a> of the wizard (Plug-in Code Generators), select <b>&quot;Default Plug-in Structure&quot;</b>, and press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page4.gif">fourth page</a> of the wizard (Simple Plug-in Content), enter your company for the <b>Provider Name</b>, and press <b>Finish</b>.

-			<li>Your new plugin project is created and visible in the Package Explorer of the Plug-in Development perspective. Your new <samp>plugin.xml</samp> file is also open in the <a href="pdeProj_wiz_after.gif">plug-in editor</a>. <i>Close this editor</i>, as you will not be using it in this tutorial.

-			

-			<li>Select the <samp>plugin.xml</samp> file, right click and select <b>Open</b>. Go to the dependencies tab and add the following plugins to the list:

-			<ul>

-			<li>org.eclipse.rse.ui

-			<li>org.eclipse.rse.services

-			<li>org.eclipse.rse.files.ui

-			<li>org.eclipse.rse.shells.ui

-			<li>org.rse.eclipse.subsystems.files.core

-			<li>org.rse.subsystems.shells.core

-			</ul>

-			<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 to make it look like <a href="RSESamplesPlugin.html">this</a>.

-			

-			<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>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 substution 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>That's it! Your plugin is created and you are ready to go. Now you only need to add code, to implement the extension points.

-		</ol>

-	</body>

-

-</html>

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/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 b5f4aaff4..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html
+++ /dev/null
@@ -1,245 +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_ui_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">AbstractSystemManager</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.ui.subsystemConfigurations&quot;&gt;
-        &lt;configuration
-             id=&quot;samples.subsystems.factory&quot;
-             systemTypes=&quot;Linux;Unix;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.
-</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 74c6e81c8..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 DSDP <a href="http://download.eclipse.org/dsdp/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 9a6eb8600..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/usingAPIs.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">
-<title>Using the Remote System Explorer API</title>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 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">
-<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>
-
-<h2>Provisional API</h2>
-<table>
-<!--
-<table bgcolor="yellow" border="1">
-<tr><th><b>API Status</b></th></tr>
--->
-<tr><td>
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>
-under category DSDP, Product Target Management.</p>
-</td></tr></table>
-
-</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 6c70b9c62..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, 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">

-   <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, 2006.

-</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 19fe0bd46..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ /dev/null
@@ -1,168 +0,0 @@
--quiet
--encoding "iso-8859-1"
--charset "iso-8859-1"
--sourcepath "../org.eclipse.rse.connectorservice.dstore/src
-;../org.eclipse.rse.core/persistence
-;../org.eclipse.rse.core/src
-;../org.eclipse.rse.dstore.security/src
-;../org.eclipse.rse.eclipse.filesystem/src
-;../org.eclipse.rse.files.ui/src
-;../org.eclipse.rse.logging/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.ui/filters
-;../org.eclipse.rse.ui/model
-;../org.eclipse.rse.ui/UI
-;../org.eclipse.rse.ui/subsystems
-;../org.eclipse.rse.ui/systems"
--d reference/api
--classpath @rt@
-;../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 1.0"
--bottom "Copyright (c) IBM Corporation and others 2000, 2006. All Rights Reserved."
--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.*"
--link http://java.sun.com/j2se/1.5/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.filters
-org.eclipse.rse.core.model
-org.eclipse.rse.core.references
-org.eclipse.rse.core.servicesubsystem
-org.eclipse.rse.core.subsystems
-org.eclipse.rse.core.subsystems.util
-org.eclipse.rse.dstore.security
-org.eclipse.rse.dstore.security.preference
-org.eclipse.rse.dstore.security.util
-org.eclipse.rse.dstore.security.widgets
-org.eclipse.rse.dstore.security.wizards
-org.eclipse.rse.dstore.universal.miners
-org.eclipse.rse.dstore.universal.miners.command
-org.eclipse.rse.dstore.universal.miners.command.patterns
-org.eclipse.rse.dstore.universal.miners.environment
-org.eclipse.rse.dstore.universal.miners.filesystem
-org.eclipse.rse.dstore.universal.miners.processes
-org.eclipse.rse.eclipse.filesystem
-org.eclipse.rse.eclipse.filesystem.ui.actions
-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.propertypages
-org.eclipse.rse.files.ui.resources
-org.eclipse.rse.files.ui.view
-org.eclipse.rse.files.ui.widgets
-org.eclipse.rse.files.ui.wizards
-org.eclipse.rse.filters
-org.eclipse.rse.logging
-org.eclipse.rse.logging.performance
-org.eclipse.rse.logging.ui
-org.eclipse.rse.model
-org.eclipse.rse.persistence
-org.eclipse.rse.persistence.dom
-org.eclipse.rse.processes.ui
-org.eclipse.rse.processes.ui.actions
-org.eclipse.rse.processes.ui.dialogs
-org.eclipse.rse.processes.ui.propertypages
-org.eclipse.rse.processes.ui.view
-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.clientserver.util.tar
-org.eclipse.rse.services.dstore
-org.eclipse.rse.services.dstore.files
-org.eclipse.rse.services.dstore.processes
-org.eclipse.rse.services.dstore.rmtservice
-org.eclipse.rse.services.dstore.search
-org.eclipse.rse.services.dstore.shells
-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.shells.ui
-org.eclipse.rse.shells.ui.actions
-org.eclipse.rse.shells.ui.propertypages
-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.dstore.model
-org.eclipse.rse.subsystems.files.dstore.old
-org.eclipse.rse.subsystems.files.dstore.subsystem
-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
-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.dstore.model
-org.eclipse.rse.subsystems.shells.local
-org.eclipse.rse.subsystems.shells.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.open
-org.eclipse.rse.ui.operations
-org.eclipse.rse.ui.propertypages
-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 c7d14afb2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=RSE Developer Guide
-providerName=Eclipse.org
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 0f037481f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- ===================================================== -->
-<!-- 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/provisional_api.html b/rse/doc/org.eclipse.rse.doc.isv/provisional_api.html
deleted file mode 100644
index ea205b0f3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/provisional_api.html
+++ /dev/null
@@ -1,32 +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 API Status</title>
-<meta name="copyright" content="Copyright (c) Wind River Systems, Inc. 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">
-<h1>Remote System Explorer API Status</h1>
-<h2>Provisional API</h2>
-<div class="p">
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>
-under category DSDP, Product Target Management.</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
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 d368231d0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
+++ /dev/null
@@ -1,29 +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">
-<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_systemTypes.html">org.eclipse.rse.core.systemTypes</a></li>
-  <li><a href="org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.archivehandlers</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_dynamicPopupMenuExtensions.html">org.eclipse.rse.ui.dynamicPopupMenuExtensions</a></li>
-  <li><a href="org_eclipse_rse_ui_keystoreProviders.html">org.eclipse.rse.ui.keystoreProviders</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>
-  <li><a href="org_eclipse_rse_ui_persistenceProviders.html">org.eclipse.rse.ui.persistenceProviders</a></li>
-  <li><a href="org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.remoteSystemsViewPreferencesActions</a></li>
-  <li><a href="org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.subsystemConfigurations</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 5c9baaa54..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/runtime-options.html
+++ /dev/null
@@ -1,42 +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 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>Version 1.0 - Last revised September 20, 2006</p>
-<p>The Remote System Explorer (RSE) is configurable through System properties. Many of these
-properties can be used to specify initial RSE settings.</p>
-
-<h2>System properties</h2>
-<p>The following System properties are used by RSE.</p>
-<p>Properties can be set in the following ways:</p>
-<ul>
-  <li>use -DpropName=propValue as a VM argument to the Java VM</li>
-  <li>set the desired property in the config.ini file in the appropriate configuration
-    area</li>
-</ul>
-<dl>
-  <dt><a name="showNewConnectionPrompt" id="showNewConnectionPrompt"></a>rse.showNewConnectionPrompt</dt>
-  <dd>whether to show the New Connection prompt in RSE views by default. "True" or "false".</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 worspace. "True" or "false".</dd>
-  
-  <dt><a name="enableSystemTypes" id="enableSystemTypes"></a>rse.enableSystemTypes</dt>
-  <dd>a comma-separated list of system types to enable by default. This property can be used to limit the system types in RSE.</dd>
-  
-  <dt><a name="showProfilePage" id="showProfilePage"></a>rse.showProfilePage</dt>
-  <dd>whether to show a New Profile wizard by default when creating a new connection for the first time. "True" or "false". If this is "false", a new profile with the hostname is created without asking the user.</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 52193a151..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
-</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 fc514b73f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/toc.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- 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" href="provisional_api.html">
-		<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 43c1fd314..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- 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 label="User Interface" href="guide/rse_int_ui.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" href="provisional_api.html">
-		<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 62fe26b51..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Questions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?NLS TYPE="org.eclipse.help.toc"?>

-<!-- ============================================================================= -->

-<!-- 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 9123922a5..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define topics for the references                                              -->
-<!-- ============================================================================= -->
-<toc label="Reference">
-
-	<topic label="Extension Points Reference" href="provisional_api.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" />
-		<!-- 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.dynamicPopupMenuExtensions" href="reference/extension-points/org_eclipse_rse_ui_dynamicPopupMenuExtensions.html" />
-		<topic label="org.eclipse.rse.ui.keystoreProviders" href="reference/extension-points/org_eclipse_rse_ui_keystoreProviders.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" />
-		<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension-points/org_eclipse_rse_ui_persistenceProviders.html" />
-		<topic label="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions" href="reference/extension-points/org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html" />
-		<topic label="org.eclipse.rse.ui.subsystemConfigurations" href="reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html" />
-		<anchor id="rse-extension-points-ref" />
-	</topic>
-	
-	<topic label="Other reference information" href="provisional_api.html">
-		<topic label="Runtime options" href="reference/misc/runtime-options.html" />
-	</topic>
-	
-	<topic label="Remote Systems API Reference By Topic" href="provisional_api.html">
-		<topic label="Core" href="provisional_api.html">
-			<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.servicessubsystem" href="reference/api/org/eclipse/rse/core/servicessubsystem/package-summary.html" />
-			<topic label="org.eclipse.rse.core.subsystems" href="reference/api/org/eclipse/rse/core/subsystems/package-summary.html" />
-			<topic label="org.eclipse.rse.core.subsystems.util" href="reference/api/org/eclipse/rse/core/subsystems/util/package-summary.html" />
-	    </topic>
-	    <topic label="Logging" href="provisional_api.html">
-	    	<topic label="org.eclipse.rse.logging" href="reference/api/org/eclipse/rse/logging/package-summary.html"/>
-			<topic label="org.eclipse.rse.logging.ui" href="reference/api/org/eclipse/rse/logging/ui/package-summary.html"/>
-			<topic label="org.eclipse.rse.logging.performance" href="reference/api/org/eclipse/rse/logging/performance/package-summary.html"/>
-	    </topic>
-		<topic label="Model and Persistence" href="provisional_api.html">
-			<topic label="org.eclipse.rse.core.model" href="reference/api/org/eclipse/rse/core/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.model" href="reference/api/org/eclipse/rse/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.references" href="reference/api/org/eclipse/rse/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" href="provisional_api.html">
-			<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 label="org.eclipse.rse.services.clientserver.util.tar" href="reference/api/org/eclipse/rse/services/clientserver/util/tar/package-summary.html"/>
-		</topic>
-		<topic label="Basic Services Layer" href="provisional_api.html">
-			<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>
-		<topic label="Services Implementations" href="provisional_api.html">
-			<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.files" href="reference/api/org/eclipse/rse/services/dstore/files/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.processes" href="reference/api/org/eclipse/rse/services/dstore/processes/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.shells" href="reference/api/org/eclipse/rse/services/dstore/shells/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.rmtservice" href="reference/api/org/eclipse/rse/services/dstore/rmtservice/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.search" href="reference/api/org/eclipse/rse/services/dstore/search/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 Security and Miners" href="provisional_api.html">
-			<topic label="org.eclipse.rse.dstore.security" href="reference/api/org/eclipse/rse/dstore/security/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.security.preference" href="reference/api/org/eclipse/rse/dstore/security/preference/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.security.util" href="reference/api/org/eclipse/rse/dstore/security/util/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.security.widgets" href="reference/api/org/eclipse/rse/dstore/security/widgets/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.security.wizards" href="reference/api/org/eclipse/rse/dstore/security/wizards/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners.command" href="reference/api/org/eclipse/rse/dstore/universal/miners/command/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners.command.patterns" href="reference/api/org/eclipse/rse/dstore/universal/miners/command/patterns/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners.environment" href="reference/api/org/eclipse/rse/dstore/universal/miners/environment/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners.filesystem" href="reference/api/org/eclipse/rse/dstore/universal/miners/filesystem/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners" href="reference/api/org/eclipse/rse/dstore/universal/miners/package-summary.html"/>
-			<topic label="org.eclipse.rse.dstore.universal.miners.processes" href="reference/api/org/eclipse/rse/dstore/universal/miners/processes/package-summary.html"/>
-		</topic>
-		<topic label="Connector Service Implementations" href="provisional_api.html">
-			<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" href="provisional_api.html">
-			<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.model" href="reference/api/org/eclipse/rse/subsystems/files/dstore/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.dstore.old" href="reference/api/org/eclipse/rse/subsystems/files/dstore/old/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.dstore.subsystem" href="reference/api/org/eclipse/rse/subsystems/files/dstore/subsystem/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" href="provisional_api.html">
-			<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" href="provisional_api.html">
-			<topic label="org.eclipse.rse.subsystems.shells.core" href="reference/api/org/eclipse/rse/subsystems/shells/core/package-summary.html"/>
-			<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.model" href="reference/api/org/eclipse/rse/subsystems/shells/dstore/model/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>
-		<topic label="User Interface" href="provisional_api.html">
-			<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.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.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" href="provisional_api.html">
-			<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.propertypages" href="reference/api/org/eclipse/rse/files/ui/propertypages/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.view" href="reference/api/org/eclipse/rse/files/ui/view/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.widgets" href="reference/api/org/eclipse/rse/files/ui/widgets/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.wizards" href="reference/api/org/eclipse/rse/files/ui/wizards/package-summary.html"/>
-	    </topic>
-		<topic label="Process UI" href="provisional_api.html">
-			<topic label="org.eclipse.rse.processes.ui" href="reference/api/org/eclipse/rse/processes/ui/package-summary.html"/>
-			<topic label="org.eclipse.rse.processes.ui.actions" href="reference/api/org/eclipse/rse/processes/ui/actions/package-summary.html"/>
-			<topic label="org.eclipse.rse.processes.ui.dialogs" href="reference/api/org/eclipse/rse/processes/ui/dialogs/package-summary.html"/>
-			<topic label="org.eclipse.rse.processes.ui.propertypages" href="reference/api/org/eclipse/rse/processes/ui/propertypages/package-summary.html"/>
-			<topic label="org.eclipse.rse.processes.ui.view" href="reference/api/org/eclipse/rse/processes/ui/view/package-summary.html"/>
-	    </topic>
-		<topic label="Shell UI" href="provisional_api.html">
-			<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.actions" href="reference/api/org/eclipse/rse/shells/ui/actions/package-summary.html"/>
-			<topic label="org.eclipse.rse.shells.ui.propertypages" href="reference/api/org/eclipse/rse/shells/ui/propertypages/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 7d833dae9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Samples.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?NLS TYPE="org.eclipse.help.toc"?>

-<!-- ============================================================================= -->

-<!-- 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 870f6ba8c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/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.user; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
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 460233046..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 2, 2006</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 b362f9bc4..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/build.properties
+++ /dev/null
@@ -1,24 +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
-#     Martin Oberhuber (WindRiver) - 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/
-               
\ No newline at end of file
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 22d12e63f..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cbegin.html
+++ /dev/null
@@ -1,66 +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, 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>Remote System Explorer Connections</title>

-</head>

-<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. If

-you have the appropriate IBM products installed you can also connect to

-iSeries and zSeries servers.&nbsp; 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 939d22466..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cfilters.html
+++ /dev/null
@@ -1,118 +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, 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>Remote System Explorer filters, filter pools, and filter pool references</title>
-</head>
-
-<body id="cfilters-body">
-<a name="cfilters"><!-- --></a>
-<h1 class="topictitle1">Remote System Explorer filters, filter pools,
-and filter pool references</h1>
-<div>
-<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.gif" alt=""/><br/>
-</p>
-<div class="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/>
-</div>
-<p>The Remote System Explorer perspective is designed to allow you to
-manipulate the resources directly on the remote system.&nbsp; The
-actions that are available depend on the type of system you are
-connecting to and the way the resource is recognized.&nbsp; For
-example, your selections can define
-a filter string to find all files that match *.c in a particular
-directory. </p>
-<div class="p">When you access the list by expanding the filter, you
-can see all the files that match that filter and you can perform
-actions (such as editing, compiling, running, and debugging) against
-these files.
-<div class="note"><span class="notetitle">Note: </span>You can drag
-and drop filters from one subsystem or filter
-pool to another. However, if you drag a filter into another filter, the
-filter strings from the source filter are added to the ones already in
-the target
-filter.</div>
-</div>
-<p id="cfilters__poolsdesc"><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 id="cfilters__poolsdesc2"><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 id="cfilters__filterstrings"><a name="cfilters__filterstrings"><!-- --></a>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.<br/>
-</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 (user options)</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="You can change the properties for any filter by opening the filter's properties sheet. You can also add new filter strings to a filter from this sheet. For example, if you have a filter that lists all *.rpgle source members, you can add an additional filter string that will display all *.cblle source members as well.">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 e9a8d5dc8..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cprofile.html
+++ /dev/null
@@ -1,104 +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, 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>Remote System Explorer Profiles</title>

-</head>

-<body id="cprofile-body">

-<a name="cprofile"><!-- --></a>

-<h1 class="topictitle1">Remote System Explorer Profiles</h1>

-<div>

-<p>When you define your first connection to your remote server, you

-will also define

-your first profile. 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

-a unique profile per team member (that person's <span

- style="font-style: italic;">private profile</span>), plus a common

-profile called <i>Team</i>.

-You can also create your own profiles. </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>User-defined actions</li>

-  <li>Compile commands</li>

-</ul>

-</div>

-<p>Profiles can be active, or inactive. By default, only your private

-profile

-and the Team profile are active. 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 first profile will be for your local workstation. When you

-complete

-the steps for your first connection, you can decide whether to use your

-personal

-profile or the Team profile so that you can share resources and

-information

-with other people.</p>

-<div class="p">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.

-<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.&nbsp; See topics in the help contents and

-links

-below about team support for more information on profiles and shared

-data.</div>

-</div>

-<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/>

-<a href="cteam.html" title="">Team support</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/>

-<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 f27a7a409..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, 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>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.&nbsp; 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.&nbsp; 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.&nbsp; 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 71e0fc8f0..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, 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>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 cc211fbc0..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, 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>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.&nbsp; 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.&nbsp; You can also, of course, quit and restart the
-workbench.&nbsp; 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 6424fcba0..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cuniversal.html
+++ /dev/null
@@ -1,55 +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, 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>Linux, UNIX, and Windows host access</title>

-</head>

-

-<body>

-<a name="cuniversal"><!-- --></a>

-<h1 class="topictitle1">Universal Systems</h1>

-<div>

-<p>At a minimum the Remote System Explorer provides access to&nbsp;

-Linux,

-UNIX, and Windows systems.&nbsp; These are called "universal" systems

-since their file and command systems are quite similar.&nbsp; 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.&nbsp; 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 host</a><br clear="all"/>

-<a href="../tasks/tbeginwindows.html">Connecting to a remote Windows host</a><br clear="all"/>

-<a href="../tasks/tbeginsecond.html">Creating a second connection to aremote 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 variablesupport 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 888840e30..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, 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>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&nbsp; 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 127b1d961..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
+++ /dev/null
@@ -1,49 +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 Wind River Systems, Inc. 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>
-<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 the Update Manager: From your running instance
-of Eclipse 3.2, choose <i>Help &gt; Software Updates &gt; Find and Install...</i>.
-Choose "Search for New Features to Install", and add a new Remote Site named
-"RSE" and pointing to <a href="http://download.eclipse.org/dsdp/tm/updates/">
-http://download.eclipse.org/dsdp/tm/updates/</a>.
-Select the RSE SDK feature, and perform the update process as usual.</p>
-
-<p>If you prefer manual installation, you can download RSE SDK from the
-DSDP <a href="http://download.eclipse.org/dsdp/tm/downloads/">Target
-Management Download Site</a> and extract it into your installation of
-Eclipse 3.2 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" title="">Setting up a dstore server</a><br/>
-<!--
-<a href="../tasks/tbeginwindows.html" title="">Connecting to a remote
-Windows server</a><br/>
--->
-<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 ea73e15c0..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
+++ /dev/null
@@ -1,61 +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 Wind River Systems, Inc. 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>
-<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" title="">Setting up a dstore server</a><br/>
-<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/>
-<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/gettingstarted/g_start.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g_start.html
deleted file mode 100644
index 2b198f2a5..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g_start.html
+++ /dev/null
@@ -1,56 +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 Wind River Systems, Inc. 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>
-<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>
-<!--
-<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/gettingstarted/gusing.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gusing.html
deleted file mode 100644
index 6ca3326f1..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gusing.html
+++ /dev/null
@@ -1,89 +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 Wind River Systems, Inc. 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.<br/>
-        Note: Some tar formats currently fail to work. See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=139207">bug 139207</a>.</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 1f7c077bf..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gxtending.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) 2006 Wind River Systems, Inc. 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>
-</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">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">tutorials</a>, 
-<a href="../../org.eclipse.rse.doc.isv/guide/rse_int_architecture.html">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
-<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/>
-<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.gif b/rse/doc/org.eclipse.rse.doc.user/images/ModelRSE.gif
deleted file mode 100755
index 9426bc1d9..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/ModelRSE.gif
+++ /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 6c70b9c62..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, 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">

-   <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, 2006.

-</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 cd2660a77..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-# 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.
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE User Guide
-providerName = Eclipse.org
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 446188d6f..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/ref/rrsepref.html
+++ /dev/null
@@ -1,79 +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, 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>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">

-<p class="sectiontitle">Purpose</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 System Type</td>

-      <td valign="top">Defines the default system type that will be used when creating a new connection.</td>

-      <td valign="top">none<br/></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">Off</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">On</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">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 70ae82453..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, 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>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 ddf821f66..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tarchive.html
+++ /dev/null
@@ -1,180 +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, 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>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__extract">Extract files from an archive</a></li>

-<li><a href="#tarchive__add">Add files to an archive</a></li>

-<li><a href="#tarchive__search">Search for content within an archive</a></li>

-<li><a href="#tarchive__convert">Convert archives of a different types into one type</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__extract">

-<td align="left" valign="top" id="d0e102" headers="d0e45"><b>Extracting:</b></td>

-<td align="left" valign="top" headers="d0e47 d0e102">You have two options

-when extracting files. You can either extract to a new folder within your

-current directory (by selecting <a href="#tarchive__extract1"><b>Extract

-to <i>xyz</i></b></a> where <i>xyz</i> is your current directory) or browse

-to a specific extraction directory (by selecting <a href="#tarchive__extract2"><b>Extract

-To . . .</b></a>). You can also select multiple archives and perform the

-same actions.

-<ul>

-<li id="tarchive__extract1"><a name="tarchive__extract1"><!-- --></a>

-To extract the contents of an archive to a new folder within

-your current directory, right-click your archive and select <b>Extract to <i>xyz</i></b> where <i>xyz</i> is

-the name of your current directory. If your archive was named "MyArchive.zip"

-then the extraction will create a new folder within your current directory

-called "MyArchive" and all of the files will be placed in the new folder in

-their proper structure. Click <b>OK</b>. If you want, use the right-click

-menu to rename the new folder.</li>

-<li id="tarchive__extract2"><a name="tarchive__extract2"><!-- --></a>

-To extract the contents of an archive to a location other

-than the current directory, right-click your archive and select <b>Extract

-To</b>.

-<ol>

-<li>A dialog box displays, presenting a tree view of all drives, files, and

-folders defined in the Remote Systems view. Expand any location in the tree

-view to define the directory location where you want to extract the contents

-of your archive. </li>

-<li>(Optional) You can select a directory, and press the <b>Details</b> button

-to see a list of properties for that location. </li>

-<li>(Optional) You can expand <b>New Connection</b> to define a new connection

-to a location where you want to extract the files.</li>

-<li>(Optional) When you extract the contents of an archive to a destination

-directory, the files and directories in the archive are copied directly to

-that destination. You are prompted to overwrite or rename duplicate files

-in the target directory.</li>

-<li>Click <b>OK</b>.</li>

-</ol>

-</li>

-</ul>

-</td></tr><tr id="tarchive__add"><td align="left" valign="top" id="d0e159" headers="d0e45">

-<b>Adding files to an archive:</b></td>

-<td align="left" valign="top" headers="d0e47 d0e159">To

-add files and folder to an archive, select one or more files/folders, right-click,

-and select <b>Add to Archive</b>.

-<ol>

-<li>A dialog box displays, presenting a tree view of all drives, files, and

-folders defined in the Remote Systems view.</li>

-<li>To create a new archive for the selected files and folders

-<ol type="a">

-<li>Expand any location in the tree view to define the location for the new

-archive.</li>

-<li>Specify a name for the archive in the <b>File name</b> field.</li>

-<li>Specify an <b>Archive type</b> from the drop-down list.</li>

-</ol>

-To add files and folders to an <i>existing</i> archive:

-<ol type="a">

-<li>Select the existing archive's parent folder in the tree view.</li>

-<li>Specify a name for the archive in the <b>File name</b> field.</li>

-<li>Specify an <b>Archive type</b> from the drop-down list.</li>

-</ol>

-</li>

-<li>Click <b>OK</b>.</li>

-</ol>

-The selected files/folders are copied to the root directory in the new

-archive location</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 explicitly start from the archive itself to search for

-contents within that archive.</td>

-</tr>

-<tr id="tarchive__convert">

-<td align="left" valign="top" id="d0e219" headers="d0e45">

-<b>Converting archives:</b></td>

-<td align="left" valign="top" headers="d0e47 d0e219">To convert

-archives from one type (.zip, .jar, or .tar) to another, select one or more

-archives, right-click, and select <b>Convert</b>. A Convert Archive dialog

-box opens for each archive you selected. In the dialog box, select a new archive

-type from the <b>Archive Type</b> drop-down list to convert the selected archive.

-You can also, optionally, specify a new location and new name for your archive,

-by selecting a location in the tree view and entering a new name in the <b>File

-name</b> field. Click <b>OK</b>.</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 47524f040..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, 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>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 868ee0f9f..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, 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>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, filters,

-and

-user actions) for that profile. To delete a profile:</div>

-<ol>

-  <li><span>Click the Menu button <img src="../images/gsarrow.gif" alt=""/> on the toolbar for the Remote Systems view.</span></li>

-  <li><span>Select <b>Delete Profile &gt; <i>name of profile</i></b>.</span></li>

-  <li><span>Click <b>Yes</b>.</span></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 1841625f3..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, 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>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/tbeginenv.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginenv.html
deleted file mode 100755
index 714d4d9af..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, 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>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 4e733ae4d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
+++ /dev/null
@@ -1,180 +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, 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>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 DSDP 
-<a href="http://download.eclipse.org/dsdp/tm/downloads/">Target Management download site</a>
-as the package <b>rseserver-&lt;version&gt;-&lt;os&gt;.tar</b>. For example, rseserver-1.0-linux.tar contains the release 1.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-1.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 4035 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 4035 10000-10010</pre>
-
-<p><b>To start the server manually</b></p>
-<div class="p">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 4a7af04dd..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginpass.html
+++ /dev/null
@@ -1,52 +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, 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>Saving passwords on your local PC</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>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 7e9919e02..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecond.html
+++ /dev/null
@@ -1,36 +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, 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>Creating a second connection to a remote server</title>

-</head>

-

-<body id="tbeginsecond"><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="tbeginwindows.html" title="">Connecting to a remote Windows server</a><br/>

-<a href="tbeginlinux.html" title="">Connecting to a remote Linux or UNIX 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 1ba0b0410..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecprofile.html
+++ /dev/null
@@ -1,26 +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, 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>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>Click the Menu button <img src="../images/gsarrow.gif" alt=""/> on the toolbar for the Remote Systems view and select <b>New profile</b>.</li>

-<li>Specify a name for the new profile and click <b>Finish</b>.</li>

-</ol>

-<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 a8d333439..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, 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>Connecting to a remote Windows server</title>
-</head>
-
-<body id="tbeginlinux">
-<a name="tbeginlinux"></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 DSDP 
-<a href="http://download.eclipse.org/dsdp/tm/downloads/">Target Management download site</a>
-as the package <b>rseserver-&lt;version&gt;-&lt;os&gt;.zip</b>. For example, rseserver-1.0-windows.zip contains the release 1.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 4035 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 4035 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 d74e6e24d..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, 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>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 eb41aacef..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, 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>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 868f7da24..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, 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>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 34d12dc5d..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, 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>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>Change</b>.</span></li>

-<li><span>In the pop-up window, 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 6794ab512..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, 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>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 22734d424..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepools.html
+++ /dev/null
@@ -1,73 +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, 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>Configuring filter pools</title>

-</head>

-

-<body id="tmanagepools">

-<a name="tmanagepools"></a>

-<h1 class="topictitle1">Configuring filter pools</h1>

-<div>

-<div class="p">

-<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>

-To illustrate the

-use of filter pools,</div>

-<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>

-<div class="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.</div>

-</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 69b8a41b9..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, 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>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 20a7b8015..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagesearch.html
+++ /dev/null
@@ -1,94 +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, 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>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://www.english.uga.edu/humcomp/perl/regex2a.html" target="_blank">http://www.english.uga.edu/humcomp/perl/regex2a.html.</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 807245b52..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, 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>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 62f6b2db3..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, 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>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 94490b26a..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, 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>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 898d8f03d..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, 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>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 e60a504d9..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, 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>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 a66853d92..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, 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>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 b2de2f554..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, 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>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.&nbsp; 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.&nbsp; This

-  will bring the Team view to the front of the Remote System Explorer.&nbsp;

-  You can also use the&nbsp;<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 a2944670f..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, 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>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.&nbsp;
-This will bring the Team view to the front of the Remote System
-Explorer.&nbsp; You can also use the&nbsp;
-<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/tworkuseract.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tworkuseract.html
deleted file mode 100755
index 2fcab5135..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, 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>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 65237236e..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/twrkcmdshl.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, 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>Working with command shells</title>

-</head>

-

-<body id="twrkcmdshl"><a name="twrkcmdshl"></a>

-<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. If you check the <b>Run in

-new shell</b> check box you will get a new shell instead of running the

-command in the current shell:

-<ol>

-<li>Expand the file subsystem until you are at the directory where you want

-to run your commands.</li>

-<li>Right-click on that directory and select <b>Run Commands</b>.</li>

-<li>Enter the command you want to run in the <b>Command</b> field and click <b>OK</b>.</li>

-</ol>

-</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 70ced696d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/toc.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<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/tbeginlinux.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>
-   <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"/>
-   <anchor id="rse_user_extensions" />
-<topic label="Legal" href="notices.html"/>
-</toc>
\ No newline at end of file
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/org.eclipse.rse.examples-feature/.project b/rse/examples/org.eclipse.rse.examples-feature/.project
deleted file mode 100644
index 61283964f..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.examples-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/examples/org.eclipse.rse.examples-feature/build.properties b/rse/examples/org.eclipse.rse.examples-feature/build.properties
deleted file mode 100644
index e59c51a6a..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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
-generate.plugin@org.eclipse.rse.examples.source=org.eclipse.rse.examples
diff --git a/rse/examples/org.eclipse.rse.examples-feature/eclipse_update_120.jpg b/rse/examples/org.eclipse.rse.examples-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples-feature/epl-v10.html b/rse/examples/org.eclipse.rse.examples-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.properties b/rse/examples/org.eclipse.rse.examples-feature/feature.properties
deleted file mode 100644
index 6fcf9c7cf..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.properties
+++ /dev/null
@@ -1,146 +0,0 @@
-###############################################################################
-# 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:
-#     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=Remote System Explorer Examples
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 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\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "description" property - description of the feature
-description=Remote System Explorer Examples contain the code from \
-the RSE ISV documentation tutorial, a sample subsystem, and a \
-sample CDT launch integration.
-
-# "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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
deleted file mode 100644
index 8400a702e..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.examples"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.examples.daytime"
-         download-size="9"
-         install-size="25"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.examples.tutorial"
-         download-size="12"
-         install-size="33"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.examples.source"
-         download-size="51"
-         install-size="212"
-         version="0.0.0"/>
-
-</feature>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/license.html b/rse/examples/org.eclipse.rse.examples-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/license.html
+++ /dev/null
@@ -1,79 +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/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.html b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/rse/examples/org.eclipse.rse.examples-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 2, 2006</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/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.ini b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/rse/examples/org.eclipse.rse.examples-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=eclipse32.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/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.mappings b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/examples/org.eclipse.rse.examples-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/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.properties b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 33cc38e3e..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-# 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=Remote System Explorer Examples Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation, Wind River Systems, Inc. and others 2006. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/build.properties b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 89c807a28..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/eclipse32.png b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/plugin.properties b/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index fd958a872..000000000
--- a/rse/examples/org.eclipse.rse.examples-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=RSE Examples Source
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/.classpath b/rse/examples/org.eclipse.rse.examples.daytime/.classpath
deleted file mode 100644
index b7464f3ca..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/.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/examples/org.eclipse.rse.examples.daytime/.cvsignore b/rse/examples/org.eclipse.rse.examples.daytime/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/.project b/rse/examples/org.eclipse.rse.examples.daytime/.project
deleted file mode 100644
index 0b679f38c..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.examples.daytime</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.core.prefs b/rse/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.ui.prefs b/rse/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 07346397c..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Jul 07 11:19:10 CEST 2006
-eclipse.preferences.version=1
-internal.default.compliance=user
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;org.eclipse.rse;
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
deleted file mode 100644
index 8fc1cf6d1..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.examples.daytime;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.examples.daytime.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.ui,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.core.runtime
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.examples.daytime
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/about.html b/rse/examples/org.eclipse.rse.examples.daytime/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/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 2, 2006</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/examples/org.eclipse.rse.examples.daytime/build.properties b/rse/examples/org.eclipse.rse.examples.daytime/build.properties
deleted file mode 100644
index c04261f8a..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml
-src.includes = META-INF/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.txt,\
-               icons/
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime.gif b/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime.gif
deleted file mode 100644
index 202795014..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime_obj.gif b/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime_obj.gif
deleted file mode 100644
index 1aeaa945e..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytime_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytimelive_obj.gif b/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytimelive_obj.gif
deleted file mode 100644
index ad817196f..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/daytimelive_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfiles_obj.gif b/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfiles_obj.gif
deleted file mode 100644
index 874c99262..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfiles_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfileslive_obj.gif b/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfileslive_obj.gif
deleted file mode 100644
index 885b8a69e..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/icons/full/obj16/systemfileslive_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
deleted file mode 100644
index 69c48bad6..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-# 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 (Wind River) - initial API and implementation 
-################################################################################
-
-pluginName = RSE Daytime
-providerName = Eclipse.org
-
-DaytimeSystemDescription=Daytime System Type
-
-Files=Files
-FilesDescription=Files via FTP
-
-DaytimeSubsystemName=Daytime
-DaytimeDescription=This configuration allows you get the current time at a remote system via TCP port 13.
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
deleted file mode 100644
index 2f8514345..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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 (Wind River) - initial API and implementation 
--->
-<?eclipse version="3.1"?>
-<plugin>
-	<!-- Register a System that will only show Daytime subsystems -->
-	<extension point="org.eclipse.rse.core.systemTypes">
-		<systemType id="org.eclipse.rse.examples.daytime.systemtype"
-			name="Daytime"
-			description="%DaytimeSystemDescription"
-			icon="icons/full/obj16/daytime_obj.gif"
-			iconLive="icons/full/obj16/daytimelive_obj.gif"/>
-	</extension>
-	<!-- Instantiate the FTP subsystem by referencing it from the external implementation -->
-	<!-- Disabled to avoid hard dependency to the FTP plugin
-	<extension
-		point="org.eclipse.rse.ui.subsystemConfigurations">
-		<configuration
-			systemTypeIds="org.eclipse.rse.examples.daytime.systemtype"
-			name="%Files"
-			description="%FilesDescription"
-			iconlive="icons/full/obj16/systemfileslive_obj.gif"
-			icon="icons/full/obj16/systemfiles_obj.gif"
-			category="files"
-			class="org.eclipse.rse.subsystems.files.ftp.FTPFileSubSystemConfiguration"
-			vendor="%providerName"
-			priority="100"
-			id="ftp.files">
-		</configuration>
-	</extension>
-	-->
-	<!-- Instantiate the Daytime subsystem from our own plugin -->
-	<extension
-		point="org.eclipse.rse.ui.subsystemConfigurations">
-		<configuration
-			systemTypeIds="org.eclipse.rse.examples.daytime.systemtype;org.eclipse.rse.systemtype.unix"
-			name="%DaytimeSubsystemName"
-			description="%DaytimeDescription"
-			iconlive="icons/full/obj16/daytimelive_obj.gif"
-			icon="icons/full/obj16/daytime_obj.gif"
-			category="daytime"
-			class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration"
-			vendor="%providerName"
-			priority="40000"
-			id="daytime.tcp">
-		</configuration>
-	</extension>
-</plugin> 
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/readme.txt b/rse/examples/org.eclipse.rse.examples.daytime/readme.txt
deleted file mode 100644
index 3f32f75f7..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/readme.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Readme for RSE Daytime Example
-------------------------------
-
-The Daytime Example shows how a new subsystem (daytime) is contributed
-to RSE, and how an existing subsystem (ftp) is configured for a system
-type. The example is mainly meant for developer's educational use,
-it does not have much user value: the Daytime Subsystem retrieves 
-the current time of day from a remote host via TCP port 13.
-
-__Requirements:__
-The Daytime example has been tested with with RSE M1 candidate
-(CVS HEAD as of April 25, 2006) and Eclipse 3.2 RC1.
-
-__Installation:__
-You need an Eclipse PDE Workspace with RSE.
-Then, choose File > Import > Existing Projects > Archive File,
-to import the example archive.
-
-__Usage:__
-The daytime service must be enabled on the remote system (see below).
-* Start RSE, create a new system of type "Daytime".
-* Select the Daytime Subsystem and choose Contextmenu > Connect.
-* Enter any username and password (this is not checked).
-* Select the Daytime Subsystem and choose Refresh, or Contextmenu > Monitor.
-* Enable polling in the remote monitor, you can see the time advance.
-
-__Programmer's documentation:__
-The interesting part of this example is in package 
-   org.eclipse.rse.examples.daytime.model
-where you see how the daytime node is added to the RSE tree through an
-AbstractSystemViewAdapter. The DaytimeService is rather simple, since
-queries are fast enough to use a connectionless service.
-
-__Known Issues:__
-* When something goes wrong during connect, the error message 
-  does not give enough information about the cause of the error.
-* Should define a second service, that uses UDP for getting the
-  daytime. This would show the advantages of ServiceSubsystem.
-  The Tutorial example (developer) is good for showing service-less
-  subsystems.
-* ConnectorService / ConnectorServiceManager should exist in a 
-  simpler default implementation such that not every new service
-  or subsystem implements the same over and over again (bug 150928).
-
-__Enabling the Daytime Service on a Remote Host:__
-In order for the example to work, the service on TCP port 13 must be 
-activated on the host as follows:
-* On Linux or other xinetd based UNIX systems, edit /etc/xinetd.d/daytime
-  and set "disable=no", then restart (kill -HUP) xinetd
-* On Solaris or other inetd based UNIX systmes, edit /etc/inetd.conf
-  and make sure the following line is there:
-     daytime stream tcp nowait root internal
-  the kill -HUP inetd.
-* On Windows/Cygwin, with xinetd installed, edit config
-  files like described for Linux, then start xinetd.exe
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java
deleted file mode 100644
index 254833db6..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime;
-
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.examples.daytime.model.DaytimeAdapterFactory;
-import org.eclipse.rse.examples.daytime.model.DaytimeResource;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class Activator extends SystemBasePlugin {
-
-	//The shared instance.
-	private static Activator plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.SystemBasePlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		IAdapterManager manager = Platform.getAdapterManager();
-		DaytimeAdapterFactory factory = new DaytimeAdapterFactory();
-		manager.registerAdapters(factory, DaytimeResource.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.SystemBasePlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public static final String ICON_ID_DAYTIME = "ICON_ID_DAYTIME"; //$NON-NLS-1$
-	
-	protected void initializeImageRegistry() {
-		String path = getIconPath();
-		putImageInRegistry(ICON_ID_DAYTIME, path+"full/obj16/daytime.gif"); //$NON-NLS-1$
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.java
deleted file mode 100644
index f9afda11b..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Resources for externalized Strings of the Daytime subsystem.
- */
-public class DaytimeResources extends NLS {
-	private static String BUNDLE_NAME = "org.eclipse.rse.examples.daytime.DaytimeResources";//$NON-NLS-1$
-
-	public static String Daytime_Service_Name;
-	public static String Daytime_Service_Description;
-	public static String Daytime_Connector_Name;
-	public static String Daytime_Connector_Description;
-	public static String Daytime_Resource_Type;
-
-	public static String DaytimeConnectorService_NotAvailable;
-
-	public static String DaytimeWizard_TestFieldText;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DaytimeResources.class);
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.properties b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.properties
deleted file mode 100644
index c571a4a6e..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-# 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 (Wind River) - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-Daytime_Service_Name=Daytime Service
-Daytime_Service_Description=The Daytime Service retrieves the current time of day from a remote host by connecting to TCP port 13.
-Daytime_Connector_Name=Daytime Connector Service
-Daytime_Connector_Description=The Daytime Connector Service manages connections to TCP port 13 on a remote host.
-Daytime_Resource_Type=daytime resource
-DaytimeConnectorService_NotAvailable=Daytime service is not available on {0}.
-DaytimeWizard_TestFieldText=This is the Daytime Wizard Test Field.
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java
deleted file mode 100644
index 8d8a39da8..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime.connectorservice;
-
-import java.net.ConnectException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-import org.eclipse.rse.examples.daytime.DaytimeResources;
-import org.eclipse.rse.examples.daytime.service.DaytimeService;
-import org.eclipse.rse.examples.daytime.service.IDaytimeService;
-
-/**
- * The DaytimeConnectorService takes care of keeping a "session" for accessing
- * the remote host to retrieve the time of day.
- * 
- * Since the daytime service is really connectionless, there is not much to do
- * here. We basically keep a local "connected" flag only, so to make sure that
- * the remote host is only accessed when the user explicitly requested so. 
- */
-public class DaytimeConnectorService extends AbstractConnectorService {
-	
-	private boolean fIsConnected = false;
-	private DaytimeService fDaytimeService;
-
-	public DaytimeConnectorService(IHost host) {
-		super(DaytimeResources.Daytime_Connector_Name, DaytimeResources.Daytime_Connector_Description, host, 13);
-		fDaytimeService = new DaytimeService();
-	}
-
-	protected void internalConnect(IProgressMonitor monitor) throws Exception {
-		fDaytimeService.setHostName(getHostName());
-		try {
-			fDaytimeService.getTimeOfDay();
-		} catch (ConnectException e) {
-			String message = NLS.bind(DaytimeResources.DaytimeConnectorService_NotAvailable, getHostName());
-			throw new Exception(message);
-		}
-		//if no exception is thrown, we consider ourselves connected!
-		fIsConnected = true;
-		// Fire comm event to signal state changed -- 
-		// Not really necessary since SubSystem.connect(Shell, boolean) does
-		// SystemRegistry.connectedStatusChange(this, true, false) at the end
-		notifyConnection();
-	}
-
-	public IDaytimeService getDaytimeService() {
-		return fDaytimeService;
-	}
-	
-	public boolean isConnected() {
-		return fIsConnected;
-	}
-
-	public void internalDisconnect(IProgressMonitor monitor) throws Exception {
-		fIsConnected = false;
-		super.internalDisconnect(monitor);
-	}
-
-	public boolean hasRemoteServerLauncherProperties() {
-		return false;
-	}
-
-	public boolean supportsRemoteServerLaunching() {
-		return false;
-	}
-
-	public boolean supportsServerLaunchProperties() {
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword()
-	 */
-	public boolean supportsPassword() {
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserId()
-	 */
-	public boolean supportsUserId() {
-		return false;
-	}
-
-	
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java
deleted file mode 100644
index 1d9edb8cf..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorServiceManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime.connectorservice;
-
-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.examples.daytime.subsystems.IDaytimeSubSystem;
-
-/**
- * This class manages our DaytimeConnectorService objects, so that if we ever
- * have multiple subsystem factories, different subsystems can share the same
- * ConnectorService if they share the communication layer.
- */
-public class DaytimeConnectorServiceManager extends AbstractConnectorServiceManager {
-
-	private static DaytimeConnectorServiceManager fInstance;
-	
-	public DaytimeConnectorServiceManager() {
-		super();
-	}
-
-	/**
-	 * Return singleton instance
-	 * @return the singleton instance
-	 */
-	public static DaytimeConnectorServiceManager getTheDaytimeConnectorServiceManager() {
-		if (fInstance == null) {
-			fInstance = new DaytimeConnectorServiceManager();
-		}
-		return fInstance;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost)
-	 */
-	public IConnectorService createConnectorService(IHost host) {
-		return new DaytimeConnectorService(host);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem) {
-		return (otherSubSystem instanceof IDaytimeSubSystem);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public Class getSubSystemCommonInterface(ISubSystem subsystem) {
-		return IDaytimeSubSystem.class;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java
deleted file mode 100644
index 8fea02647..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime.model;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-
-/**
- * This factory maps requests for an adapter object from a given remote object.
- */
-public class DaytimeAdapterFactory extends AbstractSystemRemoteAdapterFactory
-		implements IAdapterFactory {
-
-	private DaytimeResourceAdapter daytimeAdapter = new DaytimeResourceAdapter();
-
-	public DaytimeAdapterFactory() {
-		super();
-	}
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		ISystemViewElementAdapter adapter = null;
-		if (adaptableObject instanceof DaytimeResource) {
-			adapter = daytimeAdapter;
-		}
-		// these lines are very important! 
-		if ((adapter != null) && (adapterType == IPropertySource.class)) {
-			adapter.setPropertySourceInput(adaptableObject);
-		}
-		return adapter;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResource.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResource.java
deleted file mode 100644
index b0d97ed7b..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime.model;
-
-import org.eclipse.rse.core.subsystems.AbstractResource;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * This models the time of day on a remote system.
- * It might as well model any other remote resource.
- */
-public class DaytimeResource extends AbstractResource {
-
-	private String fDaytime;
-	
-	/** Default constructor */
-	public DaytimeResource() {
-		super();
-	}
-	
-	/** 
-	 * Constructor when parent subsystem is given 
-	 * @param subsystem the parent subsystem
-	 */
-	public DaytimeResource(ISubSystem subsystem) {
-		super(subsystem);
-	}
-	
-	public String getDaytime() {
-		return fDaytime;
-	}
-
-	public void setDaytime(String daytime) {
-		fDaytime = daytime;
-	}
-	
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java
deleted file mode 100644
index afa3c3fa9..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-import org.eclipse.rse.examples.daytime.Activator;
-import org.eclipse.rse.examples.daytime.DaytimeResources;
-import org.eclipse.rse.examples.daytime.service.IDaytimeService;
-import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystem;
-import org.eclipse.rse.ui.SystemMenuManager;
-import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-
-/**
- * The DaytimeResourceAdapter fulfills the interface required by the Remote Systems
- * View, and delegates UI requests to the underlying data model (DaytimeResource).
- */
-public class DaytimeResourceAdapter extends AbstractSystemViewAdapter implements
-		ISystemRemoteElementAdapter {
-
-	public DaytimeResourceAdapter() {
-		super();
-	}
-
-	public void addActions(SystemMenuManager menu,
-			IStructuredSelection selection, Shell parent, String menuGroup) {
-	}
-
-	public ImageDescriptor getImageDescriptor(Object element) {
-		return Activator.getDefault().getImageDescriptor(Activator.ICON_ID_DAYTIME);
-	}
-
-	public String getText(Object element) {
-		return ((DaytimeResource)element).getDaytime();
-	}
-
-	public String getAbsoluteName(Object object) {
-		//Not used since we dont support clipboard copy, rename or filtering
-		//TODO check if it is still used anywhere? Then we'd want to externalize the String
-		return "daytime:"+getText(object); //$NON-NLS-1$
-	}
-
-	public String getType(Object element) {
-		return DaytimeResources.Daytime_Resource_Type;
-	}
-
-	public Object getParent(Object element) {
-		return null; // not really used, which is good because it is ambiguous
-	}
-
-	public boolean hasChildren(IAdaptable element) {
-		return false;
-	}
-
-	public Object[] getChildren(IProgressMonitor monitor, IAdaptable element) {
-		return null;
-	}
-
-	
-	protected Object internalGetPropertyValue(Object key) {
-		return null;
-	}
-
-	protected IPropertyDescriptor[] internalGetPropertyDescriptors() {
-		return null;
-	}
-
-	// --------------------------------------
-	// ISystemRemoteElementAdapter methods...
-	// --------------------------------------
-
-	public String getAbsoluteParentName(Object element) {
-		// not really applicable as we have no unique hierarchy
-		return "root"; //$NON-NLS-1$ 
-	}
-
-	public String getSubSystemConfigurationId(Object element) {
-		// as declared in extension in plugin.xml
-		return "daytime.tcp"; //$NON-NLS-1$  
-	}
-
-	public String getRemoteTypeCategory(Object element) {
-		// Course grained. Same for all our remote resources.
-		return "daytime"; //$NON-NLS-1$ 
-	}
-
-	public String getRemoteType(Object element) {
-		// Fine grained. Unique to this resource type.
-		return "daytime"; //$NON-NLS-1$ 
-	}
-
-	public String getRemoteSubType(Object element) {
-		// Very fine grained. We don't use it.
-		return null; 
-	}
-
-	public boolean refreshRemoteObject(Object oldElement, Object newElement) {
-		DaytimeResource oldTime = (DaytimeResource)oldElement;
-		DaytimeResource newTime = (DaytimeResource)newElement;
-		newTime.setDaytime(oldTime.getDaytime());
-		return false; // If daytime objects held references to their time string, we'd have to return true
-	}
-
-	public Object getRemoteParent(Shell shell, Object element) throws Exception {
-		return null; // leave as null if this is the root 
-	}
-
-	public String[] getRemoteParentNamesInUse(Shell shell, Object element)
-			throws Exception {
-		DaytimeSubSystem ourSS = (DaytimeSubSystem)getSubSystem(element);
-		IDaytimeService service = ourSS.getDaytimeService();
-		String time = service.getTimeOfDay();
-		String[] allLabels = new String[] { time };
-		return allLabels; // Return list of all labels
-	}
-
-	public boolean supportsUserDefinedActions(Object object) {
-		return false;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java
deleted file mode 100644
index 216361dbb..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime.service;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.rse.examples.daytime.DaytimeResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * The DaytimeService implements the UI-less protocol for accessing the
- * daytime TCP service on a remote host. Other implementations of the
- * same interface might use other methods for retrieving the time of day.
- */
-public class DaytimeService implements IDaytimeService {
-	
-	private String fHostname;
-
-	public DaytimeService() {
-		//nothing to do
-	}
-
-	public String getName() {
-		return DaytimeResources.Daytime_Service_Name;
-	}
-
-	public String getDescription() {
-		return DaytimeResources.Daytime_Service_Description;
-	}
-
-	public void initService(IProgressMonitor monitor) {
-		//nothing to do
-	}
-
-	public SystemMessage getMessage(String messageID) {
-		//dummy impl for now
-		return null;
-	}
-
-	public void setHostName(String hostname) {
-		fHostname = hostname;
-	}
-
-	public String getTimeOfDay() throws UnknownHostException, IOException {
-		Socket s = new Socket(fHostname, 13);
-		BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream()));
-		String result = in.readLine();
-		in.close();
-		s.close();
-		return result;
-	}
-
-	public void uninitService(IProgressMonitor monitor) {
-		//nothing to do
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/IDaytimeService.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/IDaytimeService.java
deleted file mode 100644
index 39f9c0858..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/IDaytimeService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime.service;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-
-import org.eclipse.rse.services.IService;
-
-/**
- * IDaytimeService is the interface (API) for retrieving the time of day
- * from a remote system.
- */
-public interface IDaytimeService extends IService {
-
-	/**
-	 * @return a String of the form "01 MAR 2006 11:25:12 CET"
-	 * @throws UnknownHostException when remote address could not be resolved
-	 * @throws IOException in case of an error transferring the data
-	 */
-	public String getTimeOfDay() throws UnknownHostException, IOException;
-	
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java
deleted file mode 100644
index cbcbbc1df..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime.subsystems;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemMessageObject;
-import org.eclipse.rse.core.model.SystemMessageObject;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystem;
-import org.eclipse.rse.examples.daytime.model.DaytimeResource;
-import org.eclipse.rse.examples.daytime.service.IDaytimeService;
-import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.SystemRegistry;
-import org.eclipse.rse.model.SystemResourceChangeEvent;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-
-/**
- * This is our subsystem, which manages the remote connection and resources for
- * a particular Service (system connection) object.
- */
-public class DaytimeSubSystem extends SubSystem {
-
-	private IDaytimeService fDaytimeService; 
-	
-	public DaytimeSubSystem(IHost host, IConnectorService connectorService, IDaytimeService daytimeService) {
-		super(host, connectorService);
-		fDaytimeService = daytimeService;
-	}
-
-	public void initializeSubSystem(IProgressMonitor monitor) {
-		//This is called after connect - expand the daytime node.
-		//May be called in worker thread.
-		//TODO find a more elegant solution for expanding the item, e.g. use implicit connect like filters 
-        final SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
-        final SystemResourceChangeEvent event = new SystemResourceChangeEvent(this, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
-        //TODO bug 150919: postEvent() should not be necessary asynchronously
-        //sr.postEvent(event);
-        Display.getDefault().asyncExec(new Runnable() {
-        	public void run() { sr.postEvent(event); }
-        });
-	}
-	
-	public boolean hasChildren() {
-		return isConnected();
-	}
-	
-	public IDaytimeService getDaytimeService() {
-		return fDaytimeService;
-	}
-	
-	public Object[] getChildren() {
-		if (isConnected()) {
-			try {
-				String daytime = fDaytimeService.getTimeOfDay();
-				DaytimeResource node = new DaytimeResource(this);
-				node.setDaytime(daytime);
-				return new Object[] { node };
-			} catch(Exception e) {
-				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
-				msg.makeSubstitution(getHostName(), e);
-				SystemMessageObject msgobj = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR,this);
-				return new Object[] { msgobj };
-			}
-		} else {
-			return new Object[0];
-		}
-	}
-
-	public void uninitializeSubSystem(IProgressMonitor monitor) {
-		//nothing to do
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java
deleted file mode 100644
index 4bf5b4e91..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and Wind River Systems, Inc.
- * This program and the accompanying materials are made available under the 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 template for daytime example.
- ********************************************************************************/
-
-package org.eclipse.rse.examples.daytime.subsystems;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.servicesubsystem.ServiceSubSystemConfiguration;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.examples.daytime.connectorservice.DaytimeConnectorService;
-import org.eclipse.rse.examples.daytime.connectorservice.DaytimeConnectorServiceManager;
-import org.eclipse.rse.examples.daytime.service.IDaytimeService;
-import org.eclipse.rse.services.IService;
-
-/**
- * The DaytimeSubSystemConfiguration implements the main API for registering
- * a new subsystem type.
- * It gives the RSE framework basic configuration data about enabled
- * or disabled options, and is responsible for instanciating the actual
- * Daytime subsystem as well as the UI-less configuration layer (service).
- */
-public class DaytimeSubSystemConfiguration extends ServiceSubSystemConfiguration {
-
-	private Map fServices = new HashMap();
-	
-	public DaytimeSubSystemConfiguration() {
-		super();
-	}
-
-	public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}
-	public boolean supportsFilters() {
-		return false;
-	}
-	public boolean supportsSubSystemConnect() {
-		//TODO for now, we have to connect in order to pass the hostname to the service
-		//This should not be necessary in an ideal world
-		return true; 
-	}
-	public boolean isPortEditable() {
-		return false;
-	}
-	public boolean isFactoryFor(Class subSystemType) {
-		return DaytimeSubSystem.class.equals(subSystemType);
-	}
-
-	/**
-	 * Instantiate and return an instance of OUR subystem. 
-	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
-	 */
-	public ISubSystem createSubSystemInternal(IHost host) {
-		IConnectorService connectorService = getConnectorService(host);
-		ISubSystem subsys = new DaytimeSubSystem(host, connectorService, createDaytimeService(host)); // DWD need to provide the subsystem with a name and id too.
-		return subsys;
-	}
-
-	public IConnectorService getConnectorService(IHost host) {
-		return DaytimeConnectorServiceManager.getTheDaytimeConnectorServiceManager()
-			.getConnectorService(host, IDaytimeService.class);
-	}
-	public void setConnectorService(IHost host, IConnectorService connectorService) {
-		DaytimeConnectorServiceManager.getTheDaytimeConnectorServiceManager()
-			.setConnectorService(host, IDaytimeService.class, connectorService);
-	}
-
-	public IDaytimeService createDaytimeService(IHost host) {
-		DaytimeConnectorService connectorService = (DaytimeConnectorService)getConnectorService(host);
-		return connectorService.getDaytimeService();
-	}
-
-	public final IService getService(IHost host) {
-		IDaytimeService service = (IDaytimeService)fServices.get(host);
-		if (service == null) {
-			service = createDaytimeService(host);
-			fServices.put(host, service);
-		}
-		return service;
-	}
-	
-	public final Class getServiceType() {
-		return IDaytimeService.class;
-	}
-	
-	public Class getServiceImplType() {
-		return IDaytimeService.class;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/IDaytimeSubSystem.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/IDaytimeSubSystem.java
deleted file mode 100644
index db44df002..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/IDaytimeSubSystem.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.examples.daytime.subsystems;
-
-/**
- * Markup interface for finding multiple different implementations of the 
- * DaytimeSubSystem, just in case we should ever have them. 
- */
-public interface IDaytimeSubSystem {
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java
deleted file mode 100644
index e6ef8fa3b..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java
+++ /dev/null
@@ -1,45 +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.examples.daytime.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.examples.daytime.DaytimeResources;
-import org.eclipse.rse.ui.wizards.AbstractSystemNewConnectionWizardPage;
-
-public class DaytimeNewConnectionWizardPage extends
-		AbstractSystemNewConnectionWizardPage {
-
-	
-	public DaytimeNewConnectionWizardPage(IWizard wizard, ISubSystemConfiguration parentConfig)
-	{
-		super(wizard, parentConfig);
-	}
-	
-	public Control createContents(Composite parent) {
-		Text field = new Text(parent, SWT.NONE);
-		field.setText(DaytimeResources.DaytimeWizard_TestFieldText);
-		
-		// TODO Auto-generated method stub
-		return field;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java
deleted file mode 100644
index cd0ed3250..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java
+++ /dev/null
@@ -1,55 +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.examples.daytime.ui;
-
-import java.util.Vector;
-
-import org.eclipse.jface.wizard.IWizard;
-
-import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
-
-
-public class DaytimeSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter
-{
-	Vector _additionalActions;
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)
-	 */
-	public ISystemNewConnectionWizardPage[] getNewConnectionWizardPages(ISubSystemConfiguration factory, IWizard wizard)
-	{
-		ISystemNewConnectionWizardPage[] basepages = super.getNewConnectionWizardPages(factory, wizard);
-
-		if (true)
-		{
-		  DaytimeNewConnectionWizardPage page = new DaytimeNewConnectionWizardPage(wizard, factory);		  
-		  ISystemNewConnectionWizardPage[] newPages = new ISystemNewConnectionWizardPage[basepages.length + 1];
-		  newPages[0] = page;
-		  for (int i = 0; i < basepages.length; i++)
-		  {
-		  	newPages[i+1] = basepages[i];
-		  }
-		  basepages = newPages;
-		}
-		return basepages;
-	}
-	
- 
-}
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java
deleted file mode 100644
index 33cfc02ff..000000000
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,62 +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.examples.daytime.ui;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IAdapterManager;
-
-import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
-import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration;
-
-public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFactory {
-
-	private ISubSystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter();
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() 
-	{
-	    return new Class[] {ISubSystemConfigurationAdapter.class};		
-	}
-	
-	/**
-	 * Called by our plugin's startup method to register our adaptable object types 
-	 * with the platform. We prefer to do it here to isolate/encapsulate all factory
-	 * logic in this one place.
-	 * 
-	 * @param manager Platform adapter manager to register with
-	 */
-	public void registerWithManager(IAdapterManager manager)
-	{
-		manager.registerAdapters(this, DaytimeSubSystemConfiguration.class);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) 
-	{
-	    Object adapter = null;
-	    if (adaptableObject instanceof DaytimeSubSystemConfiguration)
-	    	adapter = ssFactoryAdapter;
-	      	    
-		return adapter;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/.classpath b/rse/examples/org.eclipse.rse.examples.tutorial/.classpath
deleted file mode 100644
index b7464f3ca..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/.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/examples/org.eclipse.rse.examples.tutorial/.cvsignore b/rse/examples/org.eclipse.rse.examples.tutorial/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/.project b/rse/examples/org.eclipse.rse.examples.tutorial/.project
deleted file mode 100644
index 704598e3c..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.examples.tutorial</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/.settings/org.eclipse.jdt.core.prefs b/rse/examples/org.eclipse.rse.examples.tutorial/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6d1eabbec..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Thu Dec 21 11:26:55 CST 2006
-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.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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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=ignore
-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/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
deleted file mode 100644
index 68b17e22e..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.examples.tutorial;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: samples.RSESamplesPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.rse.ui,
- org.eclipse.rse.core,
- org.eclipse.rse.services,
- org.eclipse.rse.files.ui,
- org.eclipse.rse.shells.ui,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.subsystems.shells.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/about.html b/rse/examples/org.eclipse.rse.examples.tutorial/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/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 2, 2006</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/examples/org.eclipse.rse.examples.tutorial/build.properties b/rse/examples/org.eclipse.rse.examples.tutorial/build.properties
deleted file mode 100644
index e8eb717bc..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               rseSamplesMessages.xml
-src.includes = META-INF/,\
-               about.html,\
-               icons/,\
-               plugin.xml,\
-               rseSamplesMessages.xml
-               
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/developer.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/developer.gif
deleted file mode 100644
index 9dae955d0..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/developer.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/developerFilter.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/developerFilter.gif
deleted file mode 100644
index aaf308445..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/developerFilter.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnection.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnection.gif
deleted file mode 100644
index e8efe69dc..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnection.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnectionlive.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnectionlive.gif
deleted file mode 100644
index f97fa6b48..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/systemconnectionlive.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/team.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/team.gif
deleted file mode 100644
index 510a75377..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/team.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/icons/teamFilter.gif b/rse/examples/org.eclipse.rse.examples.tutorial/icons/teamFilter.gif
deleted file mode 100644
index a8091af8f..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/icons/teamFilter.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties
deleted file mode 100644
index c6a36e859..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = RSE Tutorial Examples
-providerName = Eclipse.org
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml
deleted file mode 100644
index ad568f080..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<?eclipse version="3.1"?>
-<plugin>
-
-	<!-- ======================================= -->
-	<!-- Remote Object Popup Menu Actions        -->
-	<!-- ======================================= -->
-	<!-- Tutorial #1: Creating a Remote Resource pop-up Menu Action -->
-	<extension point="org.eclipse.ui.popupMenus">
-	      <objectContribution
-            objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"
-            nameFilter="*.jar"
-            id="actions.jar">
-         <action
-               label="Show contents"
-               tooltip="list contents of this file"
-               class="samples.ui.actions.ShowJarContents"
-               menubarPath="additions"
-               enablesFor="1"
-               id="actions.jar.show">
-         </action>
-      </objectContribution>
-	</extension>
-
-	<!-- ======================================= -->
-	<!-- Remote Object Property Pages            -->
-	<!-- ======================================= -->
-	<!-- Tutorial #2: Creating a Remote Resource Property Page -->
-  <extension 
-         point="org.eclipse.ui.propertyPages">
-      <page 
-            name="Folder Contents"
-            class="samples.ui.propertypages.FolderInfoPropertyPage"
-			id="samples.ui.PropertyPage1">
-           <enabledWhen>
-             <instanceof value="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>                        
-         </enabledWhen>
-         <filter name="isDirectory" value="true"/>  
-      </page>
-	</extension>    
-
-	<!-- ======================================= -->
-	<!-- SubSystem Configuration                 -->
-	<!-- ======================================= -->
-	<!-- Tutorial #3: Creating a Subsystem Configuration -->
-	<extension
-		point="org.eclipse.rse.ui.subsystemConfigurations">
-		<configuration
-			id="samples.subsystems.factory"
-			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows"
-			name="Teams"
-			class="samples.subsystems.DeveloperSubSystemConfiguration"
-			category="users"
-			vendor="%providerName"
-			description="Example Developer Subsystem"
-			iconlive="icons/systemconnectionlive.gif"
-			icon="icons/systemconnection.gif"
-            priority="50000">
-		</configuration>
-	</extension>
-</plugin> 
-  
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml b/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml
deleted file mode 100644
index a5e6ff074..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/rseSamplesMessages.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<!DOCTYPE MessageFile SYSTEM "../org.eclipse.rse.ui/messageFile.dtd">
-<!-- This is a message file used by SystemMessage and SystemMessageDialog -->
-<MessageFile Version="1.0">
-	<Component Name="RSE Samples" Abbr="RSS">
-		<Subcomponent Name="General" Abbr="G">
-			<MessageList>
-				<Message ID="1001" Indicator="E">
-					<LevelOne>Sample message</LevelOne>		
-					<LevelTwo>This is a sample with one substution variable: %1</LevelTwo>
-				</Message>
-				<Message ID="1002" Indicator="I">
-					<LevelOne>Processing...</LevelOne>
-					<LevelTwo></LevelTwo>
-				</Message>
-			</MessageList>
-		</Subcomponent>
-	</Component>
-</MessageFile>
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/RSESamplesPlugin.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/RSESamplesPlugin.java
deleted file mode 100644
index 4e523495a..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/RSESamplesPlugin.java
+++ /dev/null
@@ -1,179 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-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.core.SystemBasePlugin;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
-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;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.SystemBasePlugin#start(org.osgi.framework.BundleContext)
-	 */
-	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);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.SystemBasePlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * @return the shared instance 
-	 */
-	public static RSESamplesPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 * @return the singleton Workspace from Eclipse Resources plugin
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 * @see java.util.ResourceBundle#getString(String)
-	 * 
-     * @param key the key for the desired string
-     * @return the string for the given key
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle= RSESamplesPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Return the plugin's Resource bundle.
-	 * @return the Resource bundle
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("samples.rseSamplesResources"); //$NON-NLS-1$
-		} 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"); //$NON-NLS-1$ //$NON-NLS-2$
-		putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		putImageInRegistry("ICON_ID_TEAMFILTER", path + "teamFilter.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		putImageInRegistry("ICON_ID_DEVELOPERFILTER", path + "developerFilter.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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.
-	 * 
-	 * @return the RSE message file
-	 */
-	public static SystemMessageFile getPluginMessageFile()
-	{
-		return messageFile;
-	}  
-
-	/**
-	 * Retrieve a message from this plugin's message file,
-	 * or <code>null</code> if the message cannot be found.
-	 * @see SystemMessageFile#getMessage(String)
-	 * 
-	 * @param msgId message id 
-	 * @return the message object referenced by the given id
-	 */
-	public static SystemMessage getPluginMessage(String msgId)
-	{
-		return getMessage(messageFile, msgId);
-	}
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperAdapterFactory.java
deleted file mode 100644
index 8bfbb4a80..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperAdapterFactory.java
+++ /dev/null
@@ -1,55 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-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
-{
-	private TeamResourceAdapter teamAdapter = new TeamResourceAdapter();
-	private DeveloperResourceAdapter developerAdapter = new DeveloperResourceAdapter();
-	
-	/**
-	 * Constructor for DeveloperAdapterFactory.
-	 */
-	public DeveloperAdapterFactory() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		ISystemViewElementAdapter adapter = null;
-		if (adaptableObject instanceof TeamResource)
-		  adapter = teamAdapter;
-		else if (adaptableObject instanceof DeveloperResource)
-		  adapter = developerAdapter;
-		// these lines are very important! 
-		if ((adapter != null) && (adapterType == IPropertySource.class))
-		  adapter.setPropertySourceInput(adaptableObject);
-		return adapter;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResource.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResource.java
deleted file mode 100644
index 017fd46be..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResource.java
+++ /dev/null
@@ -1,101 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-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 {
-
-	private String name;
-	private String id;
-	private String deptNbr;	
-
-	/**
-	 * Default constructor for DeveloperResource.
-	 */
-	public DeveloperResource()
-	{
-		super();
-	}
-	
-	/**
-	 * Constructor for DeveloperResource when given parent subsystem.
-	 * @param parentSubSystem the 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;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java
deleted file mode 100644
index 4b002f854..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java
+++ /dev/null
@@ -1,221 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-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;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-import samples.RSESamplesPlugin;
-
-/**
- * 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)
-	{
-		return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_DEVELOPER"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)
-	 */
-	public String getText(Object element)
-	{
-		return ((DeveloperResource)element).getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)
-	 */
-	public String getAbsoluteName(Object object)
-	{
-		DeveloperResource devr = (DeveloperResource)object;
-		return "Devr_" + devr.getId(); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)
-	 */
-	public String getType(Object element)
-	{
-		return RSESamplesPlugin.getResourceString("property.devr_resource.type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @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(IAdaptable element)
-	{
-		return false;
-	}
-
-
-	public Object[] getChildren(IProgressMonitor monitor, IAdaptable element) {
-		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		
-		PropertyDescriptor[] ourPDs = new PropertyDescriptor[2];
-		ourPDs[0] = new PropertyDescriptor("devr_id", //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("property.devr_id.name")); //$NON-NLS-1$
-		ourPDs[0].setDescription(
-				RSESamplesPlugin.getResourceString("property.devr_id.desc")); //$NON-NLS-1$
-		ourPDs[1] = new PropertyDescriptor("devr_dept", //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("property.devr_dept.name")); //$NON-NLS-1$
-		ourPDs[1].setDescription(
-				RSESamplesPlugin.getResourceString("property.devr_dept.desc")); //$NON-NLS-1$
-		return ourPDs;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyValue(java.lang.Object)
-	 */
-	protected Object internalGetPropertyValue(Object key)
-	{
-		// propertySourceInput holds the currently selected object
-		DeveloperResource devr = (DeveloperResource)propertySourceInput; 
-		if (key.equals("devr_id")) //$NON-NLS-1$
-			return devr.getId();
-		else if (key.equals("devr_dept")) //$NON-NLS-1$
-		  return devr.getDeptNbr();
-		return null;
-	}		
-	// --------------------------------------
-	// ISystemRemoteElementAdapter methods...
-	// --------------------------------------
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)
-	 */
-	public String getAbsoluteParentName(Object element)
-	{
-		return "root"; // not really applicable as we have no unique hierarchy //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)
-	 */
-	public String getSubSystemConfigurationId(Object element)
-	{
-		return "samples.subsystems.factory"; // as declared in extension in plugin.xml //$NON-NLS-1$ 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)
-	 */
-	public String getRemoteTypeCategory(Object element)
-	{
-		return "developers"; // Course grained. Same for all our remote resources. //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)
-	 */
-	public String getRemoteType(Object element)
-	{
-		return "developer"; // Fine grained. Unique to this resource type. //$NON-NLS-1$
-	}
-
-	/* (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)
-	{
-		DeveloperResource oldDevr= (DeveloperResource)oldElement;
-		DeveloperResource newDevr = (DeveloperResource)newElement;
-		newDevr.setName(oldDevr.getName());
-		return false;
-	}
-
-	/* (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;
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)
-	 */
-	public boolean supportsUserDefinedActions(Object object) {
-		return false;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResource.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResource.java
deleted file mode 100644
index 25856ec7d..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResource.java
+++ /dev/null
@@ -1,83 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-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.
-	 * @param parentSubSystem the 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;
-	}
-
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java
deleted file mode 100644
index efc4e270d..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java
+++ /dev/null
@@ -1,233 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-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;
-
-import samples.RSESamplesPlugin;
-import samples.subsystems.DeveloperSubSystem;
-
-/**
- * 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)
-	{
-		return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_TEAM"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)
-	 */
-	public String getText(Object element)
-	{
-		return ((TeamResource)element).getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)
-	 */
-	public String getAbsoluteName(Object object)
-	{
-		TeamResource team = (TeamResource)object;
-		return "Team_"+team.getName(); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)
-	 */
-	public String getType(Object element)
-	{
-		return RSESamplesPlugin.getResourceString("property.team_resource.type"); //$NON-NLS-1$
-	}
-
-	/* (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(IAdaptable element)
-	{
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(IProgressMonitor monitor, IAdaptable element)
-	{
-		return ((TeamResource)element).getDevelopers();
-	}
-
-	/* (non-Javadoc)
-	 * @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.
-	 * 
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#canRename(java.lang.Object)
-	 */
-	public boolean canRename(Object element)
-	{
-		return true;
-	}
-	
-	/**
-	 * 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.
-	 *  
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#doRename(Shell, Object, String)
-	 */
-	public boolean doRename(Shell shell, Object element, String newName)
-	{
-		((TeamResource)element).setName(newName);
-		return true;
-	}
-	
-	// --------------------------------------
-	// ISystemRemoteElementAdapter methods...
-	// --------------------------------------
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)
-	 */
-	public String getAbsoluteParentName(Object element)
-	{
-		return "root"; // not really applicable as we have no unique hierarchy //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)
-	 */
-	public String getSubSystemConfigurationId(Object element)
-	{
-		return "samples.subsystems.factory"; // as declared in extension in plugin.xml //$NON-NLS-1$ 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)
-	 */
-	public String getRemoteTypeCategory(Object element)
-	{
-		return "developers"; // Course grained. Same for all our remote resources. //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)
-	 */
-	public String getRemoteType(Object element)
-	{
-		return "team"; // Fine grained. Unique to this resource type. //$NON-NLS-1$
-	}
-
-	/* (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)
-	{
-		TeamResource oldTeam = (TeamResource)oldElement;
-		TeamResource newTeam = (TeamResource)newElement;
-		newTeam.setName(oldTeam.getName());
-		return false; // 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)
-	 */
-	public String[] getRemoteParentNamesInUse(Shell shell, Object element)
-			throws Exception
-	{
-		DeveloperSubSystem ourSS = (DeveloperSubSystem)getSubSystem(element);
-		TeamResource[] allTeams = ourSS.getAllTeams();
-		String[] allNames = new String[allTeams.length];
-		for (int idx=0; idx<allTeams.length; idx++)
-		  allNames[idx] = allTeams[idx].getName();
-		return allNames; // Return list of all team names 	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)
-	 */
-	public boolean supportsUserDefinedActions(Object object) {
-		return false;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/rseSamplesResources.properties b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/rseSamplesResources.properties
deleted file mode 100644
index dfc96663b..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/rseSamplesResources.properties
+++ /dev/null
@@ -1,56 +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:
-# Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
-################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-# Tutorial #2: Creating a Remote Resource Property Page
-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
-
-# Tutorial #3: Creating a Subsystem Configuration
-connectorservice.devr.name=DeveloperConnectorService
-connectorservice.devr.desc=Manages connections to faked remote developer resources.
-
-property.devr_resource.type=Developer resource
-property.devr_id.name=Id
-property.devr_id.desc=ID number
-property.devr_dept.name=Department
-property.devr_dept.desc=Department number
-property.team_resource.type=Team resource
-filter.default.name=All Teams
-
-# Tutorial #3a: Adding a Custom Filter
-property.type.teamfilter=Team filter
-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
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorService.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorService.java
deleted file mode 100644
index 14b1b640a..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorService.java
+++ /dev/null
@@ -1,115 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-
-import samples.RSESamplesPlugin;
-
-/**
- * Our system class that manages connecting to, and disconnecting from,
- * our remote server-side code.
- */
-public class DeveloperConnectorService extends AbstractConnectorService {
-
-	private boolean connected = false;
-
-	/**
-	 * Constructor for DeveloperConnectorService.
-	 * @param host
-	 */
-	public DeveloperConnectorService(IHost host)
-	{
-		super(
-			RSESamplesPlugin.getResourceString("connectorservice.devr.name"), //$NON-NLS-1$
-			RSESamplesPlugin.getResourceString("connectorservice.devr.desc"), //$NON-NLS-1$
-			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;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword()
-	 */
-	public boolean supportsPassword() {
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserId()
-	 */
-	public boolean supportsUserId() {
-		return false;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java
deleted file mode 100644
index 5c61f70ee..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperConnectorServiceManager.java
+++ /dev/null
@@ -1,78 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-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;
-
-/**
- * This class manages our DeveloperConnectorService objects, so that if we 
- * ever have multiple subsystem factories, different subsystems can share 
- * the same IConnectorService object if they share the communication layer.
- */
-public class DeveloperConnectorServiceManager extends
-		AbstractConnectorServiceManager {
-
-	private static DeveloperConnectorServiceManager inst;
-
-	/**
-	 * Constructor for DeveloperConnectorServiceManager.
-	 */
-	public DeveloperConnectorServiceManager()
-	{
-		super();
-	}
-
-	/**
-	 * Return singleton instance
-	 * @return the singleton instance
-	 */
-	public static DeveloperConnectorServiceManager getTheDeveloperConnectorServiceManager()
-	{
-		if (inst == null)
-		  inst = new DeveloperConnectorServiceManager();
-		return inst;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost)
-	 */
-	public IConnectorService createConnectorService(IHost host)
-	{
-		return new DeveloperConnectorService(host);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem)
-	{
-		return (otherSubSystem instanceof IDeveloperSubSystem);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public Class getSubSystemCommonInterface(ISubSystem subsystem)
-	{
-		return IDeveloperSubSystem.class;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperFilterStringEditPane.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperFilterStringEditPane.java
deleted file mode 100644
index 9bf1c4a25..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperFilterStringEditPane.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/********************************************************************************
- * 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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
-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;
-
-import samples.RSESamplesPlugin;
-
-/**
- * Our specialized filter string edit pane for developer filters.
- */
-public class DeveloperFilterStringEditPane extends SystemFilterStringEditPane {
-
-	// gui widgets
-	private Text textTeam, textDevr;
-
-	/**
-	 * 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
-	 */
-	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();
-				}
-			}
-		);		
-		setEditable(editable);
-		return composite_prompts;
-	}
-	
-	/**
-	 * Override of parent method.
-	 * Return the control to recieve initial focus.
-	 *  
-	 * @see org.eclipse.rse.ui.filters.SystemFilterStringEditPane#getInitialFocusControl()
-	 */
-	public Control getInitialFocusControl()
-	{
-		return textTeam;
-	}	
-
-	/**
-	 * 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
-	 */		
-	protected void doInitializeFields()
-	{
-		if (textTeam == null)
-		  return; // do nothing
-		if (inputFilterString != null)
-		{
-			int idx = inputFilterString.indexOf('/');
-			if (idx < 0)
-		      textTeam.setText(inputFilterString);
-		    else
-		    {
-		    	textTeam.setText(inputFilterString.substring(0,idx));
-		    	textDevr.setText(inputFilterString.substring(idx+1));
-		    }
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.filters.SystemFilterStringEditPane#setEditable(boolean)
-	 */
-	public void setEditable(boolean editable) {
-		super.setEditable(editable);
-		enable(textDevr, editable);
-		enable(textTeam, editable);
-	}
-	
-	/**
-	 * Override of parent method.
-	 * This is called in the change filter dialog when the user selects "new", or selects another string.
-	 */
-	protected void resetFields()
-	{
-	    textTeam.setText(""); //$NON-NLS-1$		
-	    textDevr.setText("*"); //$NON-NLS-1$
-	}
-	/**
-	 * Override of parent method.
-	 * Called by parent to decide if information is complete enough to enable finish. 
-	 */
-	protected boolean areFieldsComplete()
-	{
-		if ((textTeam == null) || (textDevr == null))
-		  return false;
-		else
-		  return (textTeam.getText().trim().length()>0) && (textDevr.getText().trim().length()>0);
-	}
-	
-	/**
-	 * 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.
-	 *  
-	 * @see org.eclipse.rse.ui.filters.SystemFilterStringEditPane#getFilterString()
-	 */
-	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$
-		}
-	}	
-
-	/**
-	 * 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
-	 */
-	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;		
-	}	
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystem.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystem.java
deleted file mode 100644
index bc08b71c3..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystem.java
+++ /dev/null
@@ -1,234 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystem;
-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.
-	 *  
-	 * @param key internal unique ID for object 
-	 * @return Object identified by the given key
-	 */
-	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<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<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(IProgressMonitor monitor, String filterString)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException                
-	{
-		int slashIdx = filterString.indexOf('/');
-		if (slashIdx < 0)
-		{
-			// 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<allTeams.length; idx++)
-			{
-				if (subsetter.matches(allTeams[idx].getName()))
-				  v.addElement(allTeams[idx]);
-			}		
-			TeamResource[] teams = new TeamResource[v.size()];
-			for (int idx=0; idx<v.size(); idx++)
-			   teams[idx] = (TeamResource)v.elementAt(idx);
-			return teams;
-		}
-		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) && (idx<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<allDevrs.length; idx++)
-			    {
-			    	if (subsetter.matches(allDevrs[idx].getName()))
-			    	  v.addElement(allDevrs[idx]);
-			   	}		
-			   	DeveloperResource[] devrs = new DeveloperResource[v.size()];
-			   	for (int idx=0; idx<v.size(); idx++)
-			   	   devrs[idx] = (DeveloperResource)v.elementAt(idx);
-			   	return devrs;	
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 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(IProgressMonitor monitor, Object parent, String filterString)
-         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. 
-	 * @return array of all teams
-	 */
-	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. 
-	 * @return array of all developers
-	 */
-	public DeveloperResource[] getAllDevelopers()
-	{
-		DeveloperResource[] allDevrs = new DeveloperResource[devVector.size()];
-		for (int idx=0; idx<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<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<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;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java
deleted file mode 100644
index 9e1865d5a..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java
+++ /dev/null
@@ -1,111 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import java.util.Vector;
-
-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.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-
-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.
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.core.model.IHost)
-	 */
-	public ISubSystem createSubSystemInternal(IHost conn) {
-	   	return new DeveloperSubSystem(conn, getConnectorService(conn));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		return DeveloperConnectorServiceManager.getTheDeveloperConnectorServiceManager()
-			.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("*"); //$NON-NLS-1$
-			//--tutorial part 1
-			//mgr.createSystemFilter(defaultPool, "All teams", strings);
-			//--tutorial part 2
-			ISystemFilter filter = mgr.createSystemFilter(defaultPool, 
-					RSESamplesPlugin.getResourceString("filter.default.name"), //$NON-NLS-1$
-					strings);
-			filter.setType("team"); //$NON-NLS-1$
-		} 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
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#getTranslatedFilterTypeProperty(org.eclipse.rse.core.filters.ISystemFilter)
-	 */
-	public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
-	{
-		//--tutorial part 1
-	   	//return RSESamplesPlugin.getResourceString("property.type.teamfilter"); //$NON-NLS-1$
-		//--tutorial part 2
-	   	String type = selectedFilter.getType();
-	   	if (type == null)
-	   	  type = "team"; //$NON-NLS-1$
-	   	if (type.equals("team")) //$NON-NLS-1$
-	   	  return RSESamplesPlugin.getResourceString("property.type.teamfilter"); //$NON-NLS-1$ 
-	   	else
-	   	  return RSESamplesPlugin.getResourceString("property.type.devrfilter"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.model.IHost)
-	 */
-	public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java
deleted file mode 100644
index f82290144..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java
+++ /dev/null
@@ -1,108 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction;
-import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction;
-import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-import samples.RSESamplesPlugin;
-
-/**
- * Adds functionality to the basic SubSystemConfiguration.
- */
-public class DeveloperSubSystemConfigurationAdapter extends
-		SubSystemConfigurationAdapter
-{
-
-	/**
-	 * Constructor for DeveloperSubSystemConfigurationAdapter.
-	 */
-	public DeveloperSubSystemConfigurationAdapter()
-	{
-		super();
-	}
-
-	/**
-	 * Override of parent method, to affect what is returned for the New Filter-> actions.
-	 * We intercept here, versus getNewFilterPoolFilterAction, so that we can return multiple
-	 *  actions versus just one.
-	 */
-	protected IAction[] getNewFilterPoolFilterActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
-	{
-	  	SystemNewFilterAction teamAction = (SystemNewFilterAction)super.getNewFilterPoolFilterAction(factory, selectedPool, shell);
-	  	teamAction.setWizardPageTitle(RSESamplesPlugin.getResourceString("filter.team.pagetitle")); //$NON-NLS-1$
-	  	teamAction.setPage1Description(RSESamplesPlugin.getResourceString("filter.team.pagetext")); //$NON-NLS-1$
-	  	teamAction.setType("team"); //$NON-NLS-1$
-	  	teamAction.setText(RSESamplesPlugin.getResourceString("filter.team.pagetitle") + "..."); //$NON-NLS-1$ //$NON-NLS-2$
-	  	
-	  	SystemNewFilterAction devrAction = (SystemNewFilterAction)super.getNewFilterPoolFilterAction(factory, selectedPool, shell);    	
-	  	devrAction.setWizardPageTitle(RSESamplesPlugin.getResourceString("filter.devr.pagetitle")); //$NON-NLS-1$
-	  	devrAction.setPage1Description(RSESamplesPlugin.getResourceString("filter.devr.pagetext")); //$NON-NLS-1$
-	  	devrAction.setType("devr"); //$NON-NLS-1$
-	  	devrAction.setText(RSESamplesPlugin.getResourceString("filter.devr.pagetitle") + "..."); //$NON-NLS-1$ //$NON-NLS-2$
-	  	devrAction.setFilterStringEditPane(new DeveloperFilterStringEditPane(shell));    	
-	  	
-	  	IAction[] actions = new IAction[2];
-	  	actions[0] = teamAction;
-	  	actions[1] = devrAction;
-	  	return actions;
-	 }
-	  
-	/**
-	 * Override of parent method for returning the change-filter action, so we can affect it.
-	 */
-	protected IAction getChangeFilterAction(ISubSystemConfiguration factory, ISystemFilter selectedFilter, Shell shell)
-	{
-		SystemChangeFilterAction action = (SystemChangeFilterAction)super.getChangeFilterAction(factory, selectedFilter, shell);
-	  	String type = selectedFilter.getType();
-	  	if (type == null)
-	  	  type = "team"; //$NON-NLS-1$ 
-	  	if (type.equals("team")) //$NON-NLS-1$
-	  	{
-	  		action.setDialogTitle(RSESamplesPlugin.getResourceString("filter.team.dlgtitle")); //$NON-NLS-1$
-	  	}
-	  	else
-	  	{
-	  		action.setDialogTitle(RSESamplesPlugin.getResourceString("filter.devr.dlgtitle")); //$NON-NLS-1$
-	  		action.setFilterStringEditPane(new DeveloperFilterStringEditPane(shell));
-	  	}    
-	  	return action;
-	}    	
-
-	/**
-	 * Override of parent method for returning the image for filters in our subsystem.
-	 * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getSystemFilterImage(org.eclipse.rse.core.filters.ISystemFilter)
-	 */
-	public ImageDescriptor getSystemFilterImage(ISystemFilter filter)
-	{
-	  	String type = filter.getType();
-	  	if (type == null)
-	  	  type = "team"; //$NON-NLS-1$
-	  	if (type.equals("team")) //$NON-NLS-1$
-	   	  return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_TEAMFILTER"); //$NON-NLS-1$
-	   	else
-	   	  return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_DEVELOPERFILTER"); //$NON-NLS-1$
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java
deleted file mode 100644
index 3ad6da7b0..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and 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
- * 
- * 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.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
-
-/**
- * @see IAdapterFactory
- */
-public class DeveloperSubSystemConfigurationAdapterFactory implements
-		IAdapterFactory {
-
-	private ISubSystemConfigurationAdapter ssConfigAdapter = new DeveloperSubSystemConfigurationAdapter();
-	
-	/**
-	 * @see IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() 
-	{
-	    return new Class[] {ISubSystemConfigurationAdapter.class};		
-	}
-	
-	/**
-	 * Called by our plugin's startup method to register our adaptable object types 
-	 * with the platform. We prefer to do it here to isolate/encapsulate all factory
-	 * logic in this one place.
-	 * @param manager Platform adapter manager
-	 */
-	public void registerWithManager(IAdapterManager manager)
-	{
-		manager.registerAdapters(this, DeveloperSubSystemConfiguration.class);
-	}
-	
-	/**
-	 * @see IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) 
-	{
-	    Object adapter = null;
-	    if (adaptableObject instanceof DeveloperSubSystemConfiguration)
-	    	adapter = ssConfigAdapter;
-	      	    
-		return adapter;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/IDeveloperSubSystem.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/IDeveloperSubSystem.java
deleted file mode 100644
index 226d2b867..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/IDeveloperSubSystem.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and 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
- * 
- * 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;
-
-public interface IDeveloperSubSystem {
-
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/actions/ShowJarContents.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/actions/ShowJarContents.java
deleted file mode 100644
index d36d7e49a..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/actions/ShowJarContents.java
+++ /dev/null
@@ -1,196 +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:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.services.shells.IHostOutput;
-import org.eclipse.rse.services.shells.IHostShell;
-import org.eclipse.rse.services.shells.IHostShellChangeEvent;
-import org.eclipse.rse.services.shells.IHostShellOutputListener;
-import org.eclipse.rse.services.shells.IShellService;
-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.subsystems.shells.core.subsystems.IRemoteCommandShell;
-import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
-import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
-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.rse.ui.actions.SystemAbstractPopupMenuExtensionAction#run()
-	 */
-	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<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 && cmdss.isConnected()) {
-			//Option A: run the command invisibly through SubSystem API
-			//runCommandInvisibly(cmdss, command);
-			//Option B: run the command invisibly through Service API
-			//runCommandInvisiblyService(cmdss, command);
-			//Option C: 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 static class StdOutOutputListener implements IHostShellOutputListener {
-		public void shellOutputChanged(IHostShellChangeEvent event) {
-			IHostOutput[] lines = event.getLines();
-			for(int i=0; i<lines.length; i++) {
-				System.out.println(lines[i]);
-			}
-		}
-	}
-	
-	/** New version of running commands through IShellService / IHostShell */
-	public void runCommandInvisiblyService(IRemoteCmdSubSystem cmdss, String command) throws Exception
-	{
-		if (cmdss instanceof IShellServiceSubSystem) {
-			IShellService shellService = ((IShellServiceSubSystem)cmdss).getShellService();
-	        String [] environment = new String[1];
-	        environment[0] = "AAA=BBB"; //$NON-NLS-1$
-	        String initialWorkingDirectory = "."; //$NON-NLS-1$
-
-	        IHostShell hostShell = shellService.launchShell(new NullProgressMonitor(), initialWorkingDirectory, environment);
-			hostShell.addOutputListener(new StdOutOutputListener());
-	        //hostShell.writeToShell("pwd"); //$NON-NLS-1$
-	        //hostShell.writeToShell("echo ${AAA}"); //$NON-NLS-1$
-	        //hostShell.writeToShell("env"); //$NON-NLS-1$
-	        hostShell.writeToShell(command);
-	        hostShell.writeToShell("exit"); //$NON-NLS-1$
-		}
-	}
-	
-	/** Old version of running commands through the command subsystem */
-	public void runCommandInvisibly(IRemoteCmdSubSystem cmdss, String command) throws Exception
-	{
-		command = command + cmdss.getParentRemoteCmdSubSystemConfiguration().getCommandSeparator() + "exit"; //$NON-NLS-1$
-		Object[] result = cmdss.runCommand(new NullProgressMonitor(), command, null, false);
-		if (result.length>0 && result[0] instanceof IRemoteCommandShell) {
-			IRemoteCommandShell cs = (IRemoteCommandShell)result[0];
-			while (cs.isActive()) {
-				Thread.sleep(1000);
-			}
-			Object[] output = cs.listOutput();
-			for (int i=0; i<output.length; i++) {
-				if (output[i] instanceof IRemoteOutput) {
-					System.out.println(((IRemoteOutput)output[i]).getText());
-				} else if (output[i] instanceof IRemoteError) {
-					System.err.println(((IRemoteError)output[i]).getText());
-				}
-			}
-			cmdss.removeShell(cs);
-		}
-	}
-
-    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) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/propertypages/FolderInfoPropertyPage.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/propertypages/FolderInfoPropertyPage.java
deleted file mode 100644
index d5c42d13b..000000000
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/propertypages/FolderInfoPropertyPage.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and 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
- * 
- * 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.ui.propertypages;
-
-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.rse.ui.propertypages.SystemBasePropertyPage;
-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 SystemBasePropertyPage
-	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 && 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) && (folders.length>0))
-			{
-				for (int idx=0; !stopped && (idx<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);
-	}
-
-	protected boolean verifyPageContents() {
-		return true;
-	}
-
-	/**
-	 * Get the input remote file object
-	 */
-	protected IRemoteFile getRemoteFile()
-	{
-		Object element = getElement();
-		return ((IRemoteFile)element);
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/.classpath b/rse/examples/org.eclipse.rse.remotecdt/.classpath
deleted file mode 100644
index 7bdc3fd56..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/.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="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/examples/org.eclipse.rse.remotecdt/.cvsignore b/rse/examples/org.eclipse.rse.remotecdt/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/examples/org.eclipse.rse.remotecdt/.project b/rse/examples/org.eclipse.rse.remotecdt/.project
deleted file mode 100644
index da5ae4bbb..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.remotecdt</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.core.resources.prefs b/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 831ab78c5..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Sep 19 23:47:40 CEST 2006
-eclipse.preferences.version=1
-encoding//src/org/eclipse/rse/remotecdt/messages.properties=8859_1
diff --git a/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.jdt.core.prefs b/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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/examples/org.eclipse.rse.remotecdt/HelpContexts.xml b/rse/examples/org.eclipse.rse.remotecdt/HelpContexts.xml
deleted file mode 100644
index 8401379b6..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/HelpContexts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!--
-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 (Wind River) - initial API and implementation  
--->
-<contexts>
-  <context id="launchgroup">
-  <description>The Remote CDT Launch Tab Group allows you to specify the connection, program and properties of a program to launch and debug on a remote system.
-  </description>
-  <topic href="remotecdt.html" label="Launching Remote C/C++ Applications"/>
-</context>
-	
-</contexts>
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
deleted file mode 100644
index dfb613033..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.remotecdt;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.rse.remotecdt.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.ui,
- org.eclipse.rse.subsystems.shells.core,
- org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.core,
- org.eclipse.rse.services,
- org.eclipse.cdt.launch,
- org.eclipse.cdt.debug.mi.core,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.core,
- org.eclipse.debug.ui,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.cdt.debug.mi.ui,
- org.eclipse.cdt.debug.ui
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/examples/org.eclipse.rse.remotecdt/about.html b/rse/examples/org.eclipse.rse.remotecdt/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/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 2, 2006</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/examples/org.eclipse.rse.remotecdt/about.ini b/rse/examples/org.eclipse.rse.remotecdt/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/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=eclipse32.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/examples/org.eclipse.rse.remotecdt/about.mappings b/rse/examples/org.eclipse.rse.remotecdt/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/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/examples/org.eclipse.rse.remotecdt/about.properties b/rse/examples/org.eclipse.rse.remotecdt/about.properties
deleted file mode 100644
index 203b2fb10..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# PalmSource - 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=Remote System Explorer CDT Remote Launcher\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright PalmSource, Inc., Wind River Systems, Inc. and others 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.remotecdt/build.properties b/rse/examples/org.eclipse.rse.remotecdt/build.properties
deleted file mode 100644
index f1908ea16..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#####################################################################################
-# Copyright (c) 2006 PalmSource, 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: 
-# Ewa Matejska (PalmSource)
-# Martin Oberhuber (Wind River) - fix 158529: Migrate docs to HTML / TOC format 
-# Martin Oberhuber (Wind River) - add help contexts 
-#####################################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties,\
-               plugin.xml,\
-               remotecdt.html,\
-               toc.xml,\
-               HelpContexts.xml,\
-               icons/,\
-               .
-src.includes = META-INF/,\
-               about.html,\
-               icons/,\
-               plugin.xml
diff --git a/rse/examples/org.eclipse.rse.remotecdt/eclipse32.png b/rse/examples/org.eclipse.rse.remotecdt/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/eclipse32.png
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/c_app.gif b/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/c_app.gif
deleted file mode 100644
index 504ef509f..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/c_app.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocal_obj.gif b/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocal_obj.gif
deleted file mode 100644
index d60c188ca..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocal_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocallive_obj.gif b/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocallive_obj.gif
deleted file mode 100644
index ba10dec0a..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/icons/full/obj16/systemlocallive_obj.gif
+++ /dev/null
diff --git a/rse/examples/org.eclipse.rse.remotecdt/plugin.properties b/rse/examples/org.eclipse.rse.remotecdt/plugin.properties
deleted file mode 100644
index 6b358b8ae..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-
-pluginName = RSE CDT Remote Launcher
-providerName = Eclipse.org
diff --git a/rse/examples/org.eclipse.rse.remotecdt/plugin.xml b/rse/examples/org.eclipse.rse.remotecdt/plugin.xml
deleted file mode 100644
index 4e7673e7c..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006 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) - initial API and implementation 
-Martin Oberhuber (Wind River) - fix 158529: Migrate docs to HTML / TOC format 
--->
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            delegate="org.eclipse.rse.remotecdt.RemoteRunLaunchDelegate"
-            public="true"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer"
-            name="C/C++ Remote Application"
-            id="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
-            modes="debug,run">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/c_app.gif"
-            configTypeID="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
-            id="org.eclipse.cdt.launch.localRunLaunchImagefff">
-      </launchConfigurationTypeImage>
-   </extension>    
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.eclipse.rse.remotecdt.RemoteLaunchConfigurationTabGroup"
-            helpContextId="org.eclipse.rse.remotecdt.launchgroup"
-            id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
-            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.core.CDebugger">
-      <debugger
-            class="org.eclipse.cdt.debug.mi.core.GDBServerCDIDebugger2"
-            cpu="*"
-            id="org.eclipse.rse.remotecdt.RemoteGDBDebugger"
-            modes="run"
-            name="remote gdb/mi"
-            platform="*">
-      </debugger>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.ui.CDebuggerPage">
-      <debuggerPage
-            class="org.eclipse.rse.remotecdt.RemoteGDBDebuggerPage"
-            debuggerID="org.eclipse.rse.remotecdt.RemoteGDBDebugger"
-            id="org.eclipse.rse.remotecdt.RemoteGDBDebuggerPage">
-      </debuggerPage>
-   </extension>
-
-	<!-- ============================================ -->
-	<!-- Define Help Context                          -->
-	<!-- ============================================ -->
-	<extension point="org.eclipse.help.contexts">
-  		<contexts file="HelpContexts.xml"/>
-	</extension>
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml"/>
-	</extension>
-
-</plugin>
diff --git a/rse/examples/org.eclipse.rse.remotecdt/remotecdt.html b/rse/examples/org.eclipse.rse.remotecdt/remotecdt.html
deleted file mode 100644
index 04dc3a22e..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/remotecdt.html
+++ /dev/null
@@ -1,69 +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 PalmSource, Inc. and others. This page is made available under license. For full details see the LEGAL notice in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" href="../org.eclipse.rse.doc.user/book.css" />
-<title>Launching Remote C/C++ Applications</title>
-</head>
-<!--
-Copyright (c) 2006 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) - initial API and implementation 
-Martin Oberhuber (Wind River) - fix 158529: Migrate docs to HTML / TOC format 
--->
-
-<body id="tremotecdt"><a name="tremotecdt"><!-- --></a>
-<h1 class="topictitle1">Launching Remote C/C++ Applications</h1>
-<div class="p">
-<p>The RSE Remote CDT Plugin builds on top of CDT and integrates with RSE to introduce
-a "Remote C/C++ Application" launch configuration. This launch configuration relies 
-on the shell and file services of the RSE connections.</p>
-
-<p>The "Remote C/C++ Application" launch configuration enables the user to select from a list of RSE 
-connections which have the shell service available. For a debug launch, the binary is downloaded
-to the remote using the file service of the RSE connection, gdbserver is automatically started 
-on the remote using the shell service and a gdb debug connection is establised.  For a run launch,
-the binary is downloaded to the remote using the file service and then it is invoked using the shell
-service.</p>
-
-<p>In the future, an RSE file service should be used to select where the remote download
-should take place. Right now the remote path is entered manually in a text field.</p>
-</div>
-
-<h2>System Prerequisites</h2>
-<div class="p"><b>Local Host</b>
-<ul>
-  <li>It is necessary to create an RSE connection which has the file and shell services 
-     available.</li>
-</ul></div>
-
-<div class="p"><b>Remote Host</b>
-<ul>
-  <li>gdbserver is on the path.</li>
-  <li>port 2345 is available to use. gdbserver will use this port.</li>
-</ul></div>
-
-<h2>Using</h2>
-<div class="p">
-<p>A "Remote C++ Application" launch configuration will be available.  
-After building a binary which will run on your remote, try using this 
-configuration to run or debug it.</p>
-</div>
-
-<h2>Current Limitations</h2>
-<div class="p">
-<p>There is no way to tell when the command on the remote has finished 
-running.  As a result, the "Remote Shell" process will be left active
-after the debug session dies and needs to be terminated manually. The
-run process also needs to be terminated manually for the same reason.</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java
deleted file mode 100644
index 0bdfe8027..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource)
- *******************************************************************************/
-
-package org.eclipse.rse.remotecdt;
-
-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;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java
deleted file mode 100644
index d293815a2..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource) - Adapted from IGDBServerMILaunchConfigurationConstants
- *******************************************************************************/
-
-
-package org.eclipse.rse.remotecdt;
-
-import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants;
-import org.eclipse.debug.core.DebugPlugin;
-
-public interface IRemoteConnectionConfigurationConstants extends
-		IGDBServerMILaunchConfigurationConstants {
-	
-	public static final String ATTR_REMOTE_CONNECTION = 
-				DebugPlugin.getUniqueIdentifier() + ".REMOTE_TCP"; //$NON-NLS-1$
-
- 
-	public static final String ATTR_GDBSERVER_PORT = 
-				DebugPlugin.getUniqueIdentifier() + ".ATTR_GDBSERVER_PORT"; //$NON-NLS-1$
-	public static final String ATTR_GDBSERVER_COMMAND = 
-				DebugPlugin.getUniqueIdentifier() + ".ATTR_GDBSERVER_COMMAND"; //$NON-NLS-1$
-	
-	public static final String ATTR_GDBSERVER_PORT_DEFAULT = "2345"; //$NON-NLS-1$
-	public static final String ATTR_GDBSERVER_COMMAND_DEFAULT = "gdbserver"; //$NON-NLS-1$
-	
-	/*
-	 * Generic Remote Path and Download options
-	 * ATTR_REMOTE_PATH: Path of the binary on the remote.
-	 * ATTR_SKIP_DOWNLOAD_TO_TARGET: true if download to remote is not desired.
-	 */
-	public static final String ATTR_REMOTE_PATH = 
-				DebugPlugin.getUniqueIdentifier() + ".ATTR_TARGET_PATH"; //$NON-NLS-1$
-	public static final String ATTR_SKIP_DOWNLOAD_TO_TARGET = 
-				DebugPlugin.getUniqueIdentifier() + ".ATTR_SKIP_DOWNLOAD_TO_TARGET"; //$NON-NLS-1$
-
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Messages.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Messages.java
deleted file mode 100644
index 8b1fbb4a0..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Messages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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 
- *******************************************************************************/
-package org.eclipse.rse.remotecdt;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.rse.remotecdt.messages"; //$NON-NLS-1$
-
-	public static String Gdbserver_name_textfield_label;
-
-	public static String Gdbserver_Settings_Tab_Name;
-
-	public static String Port_number_textfield_label;
-
-	public static String Remote_GDB_Debugger_Options;
-
-	public static String RemoteCMainTab_Program;
-	public static String RemoteCMainTab_SkipDownload;
-	public static String RemoteCMainTab_ErrorNoProgram;
-	public static String RemoteCMainTab_ErrorNoConnection;
-	public static String RemoteCMainTab_Connection;
-	public static String RemoteCMainTab_New;
-
-	public static String RemoteRunLaunchDelegate_RemoteShell;
-	public static String RemoteRunLaunchDelegate_1;
-	public static String RemoteRunLaunchDelegate_3;
-	public static String RemoteRunLaunchDelegate_4;
-	public static String RemoteRunLaunchDelegate_5;
-	public static String RemoteRunLaunchDelegate_6;
-	public static String RemoteRunLaunchDelegate_7;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java
deleted file mode 100644
index 7b0dcd8b3..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCDebuggerTab.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource)
- *******************************************************************************/
-
-package org.eclipse.rse.remotecdt;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.cdt.debug.core.CDebugCorePlugin;
-import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.launch.ui.CDebuggerTab;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-public class RemoteCDebuggerTab extends CDebuggerTab {
-	
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-			"org.eclipse.rse.remotecdt.launchgroup"); //$NON-NLS-1$
-	}
-
-	static final private String REMOTE_GDB_DEBUGGER_NAME = "remote gdb/mi"; //$NON-NLS-1$
-	
-	public RemoteCDebuggerTab(boolean attachMode) {
-		super(attachMode);
-	}
-	
-	protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {
-		ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
-		String defaultSelection = selection;
-		List list = new ArrayList();
-		for(int i = 0; i < debugConfigs.length; i++) {
-			ICDebugConfiguration configuration = debugConfigs[i];
-			if(configuration.getName().equals(REMOTE_GDB_DEBUGGER_NAME))  {
-				list.add(configuration);
-				// Select as default selection
-				defaultSelection = configuration.getID();
-				break;
-			}
-		}
-		setInitializeDefault(defaultSelection.equals("") ? true : false); //$NON-NLS-1$
-		loadDebuggerCombo((ICDebugConfiguration[])list.toArray(
-				new ICDebugConfiguration[list.size()]), defaultSelection);
-	}
-	
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java
deleted file mode 100644
index 567ed2577..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource)
- *******************************************************************************/
-
-package org.eclipse.rse.remotecdt;
-
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.cdt.launch.ui.CMainTab;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class RemoteCMainTab extends CMainTab {
- 
-	/* Labels and Error Messages */
-	private static final String REMOTE_PROG_LABEL_TEXT = Messages.RemoteCMainTab_Program;
-	private static final String SKIP_DOWNLOAD_BUTTON_TEXT = Messages.RemoteCMainTab_SkipDownload;
-	private static final String REMOTE_PROG_TEXT_ERROR = Messages.RemoteCMainTab_ErrorNoProgram;
-	private static final String CONNECTION_TEXT_ERROR = Messages.RemoteCMainTab_ErrorNoConnection;
-	
-	/* Defaults */
-	private static final String REMOTE_PATH_DEFAULT = EMPTY_STRING;
-	private static final boolean SKIP_DOWNLOAD_TO_REMOTE_DEFAULT = false;
-	
-	protected Button newRemoteConnectionButton;
-	protected Label  connectionLabel;
-	protected Combo  connectionCombo;
-	protected Label remoteProgLabel;
-	protected Text remoteProgText;
-	protected Button skipDownloadButton;
-	protected Button useLocalPathButton;
-	
-	SystemNewConnectionAction action = null;
-	
-	public RemoteCMainTab(boolean terminalOption) {
-		super(terminalOption);
-	}
-	
-	/*
-     * createControl
-     * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl
-     */
-    public void createControl(Composite parent) {
-    	Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-	    setControl(comp);
-		comp.setLayout(topLayout);
-
-		/* The RSE Connection dropdown with New button. */
-		createVerticalSpacer(comp, 1);
-		createRemoteConnectionGroup(comp, 3);
-		
-		/* The Project and local binary location */
-		createVerticalSpacer(comp, 1);
-		createProjectGroup(comp, 1);
-		createExeFileGroup(comp, 1);
-		
-		/* The remote binary location and skip download option */
-		createVerticalSpacer(comp, 1);
-		createTargetExePath(comp);
-		createDownloadOption(comp);
- 
-		/* If the local binary path changes, modify the remote binary location */
-		fProgText.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent evt) {
-				setLocalPathForRemotePath();
-			}
-		});
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-				"org.eclipse.rse.remotecdt.launchgroup"); //$NON-NLS-1$
-
-		LaunchUIPlugin.setDialogShell(parent.getShell());
-    }
-
-	/*
-	 * isValid
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		boolean retVal =  super.isValid(config);
-		if(retVal == true) {
-			setErrorMessage(null);
-			int currentSelection = connectionCombo.getSelectionIndex();
-			String connection_name = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : ""; //$NON-NLS-1$
-			if(connection_name.equals("")) { //$NON-NLS-1$
-				setErrorMessage(CONNECTION_TEXT_ERROR);
-				retVal = false;
-			}
-			if(retVal) {
-				String name = remoteProgText.getText().trim();
-				if (name.length() == 0) {
-					setErrorMessage(REMOTE_PROG_TEXT_ERROR);
-					retVal = false;
-				}
-			}
-		}
-		return retVal;
-	}
-	
-	protected void createRemoteConnectionGroup(Composite parent, int colSpan) {
-		Composite projComp = new Composite(parent, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 3;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colSpan;
-		projComp.setLayoutData(gd);
-
-		connectionLabel = new Label(projComp, SWT.NONE);
-		connectionLabel.setText(Messages.RemoteCMainTab_Connection);
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		connectionLabel.setLayoutData(gd);
-		
-		connectionCombo = new Combo(projComp, SWT.DROP_DOWN | SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		connectionCombo.setLayoutData(gd);
-		connectionCombo.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent e) {
-				setDirty(true);
-				updateLaunchConfigurationDialog();
-			}
-		});
-		updateConnectionPulldown();
-
-		newRemoteConnectionButton = createPushButton(projComp, Messages.RemoteCMainTab_New, null);
-		newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() {
-
-		public void widgetSelected(SelectionEvent evt) {
-				handleNewRemoteConnectionSelected();
-				updateLaunchConfigurationDialog();
-				updateConnectionPulldown();
-			}
-		});	
-
-	}
-	
-	/*
-	 * createTargetExePath
-	 * This creates the remote path user-editable textfield on the Main Tab.
-	 */
-	protected void createTargetExePath(Composite parent) {
-		Composite mainComp = new Composite(parent, SWT.NONE);
-		GridLayout mainLayout = new GridLayout();
-		mainLayout.marginHeight = 0;
-		mainLayout.marginWidth = 0;
-		mainComp.setLayout(mainLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		mainComp.setLayoutData(gd);
-		remoteProgLabel = new Label(mainComp, SWT.NONE);
-		remoteProgLabel.setText(REMOTE_PROG_LABEL_TEXT);
-		gd = new GridData();
-		remoteProgLabel.setLayoutData(gd);
-		remoteProgText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		remoteProgText.setLayoutData(gd);
-		remoteProgText.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-    
-	/*
-	 * createDownloadOption
-	 * This creates the skip download check button.
-	 */
-	protected void createDownloadOption(Composite parent) {
-		Composite mainComp = new Composite(parent, SWT.NONE);
-		GridLayout mainLayout = new GridLayout();
-		mainLayout.marginHeight = 0;
-		mainLayout.marginWidth = 0;
-		mainComp.setLayout(mainLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		mainComp.setLayoutData(gd);
-
-		skipDownloadButton = createCheckButton(mainComp, SKIP_DOWNLOAD_BUTTON_TEXT);
-		skipDownloadButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		skipDownloadButton.setEnabled(true);
-	}
-	
-	/*
-	 * performApply
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		
-		int currentSelection = connectionCombo.getSelectionIndex();
-		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, 
-				 currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : null);
-		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, 
-				remoteProgText.getText());
-		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_SKIP_DOWNLOAD_TO_TARGET, 
-				skipDownloadButton.getSelection());
-		super.performApply(config);
-	}
-	
-	/*
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		String remoteConnection = null;
-		try {
-			remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION,
-						 ""); //$NON-NLS-1$
-		} catch (CoreException ce) {
-			// Ignore
-		}
-		
-		String[] items = connectionCombo.getItems();
-		int i = 0;
-		for(i = 0; i < items.length; i++)
-			if(items[i].equals(remoteConnection))
-				break;
-		/* Select the last used connection in the connecion pulldown if it still exists. */
-		if(i < items.length)
-			connectionCombo.select(i);
-		else if(items.length > 0)
-			connectionCombo.select(0);
-		
-		super.initializeFrom(config);
-		
-		updateTargetProgFromConfig(config);
-		updateSkipDownloadFromConfig(config);
-	}
-	
-	protected void handleNewRemoteConnectionSelected() {
-    	if (action == null)
-		{
-		  action = new SystemNewConnectionAction(getControl().getShell(), false, false, null);
-		}
-		
-		try 
-		{
-		  action.run();
-		} catch (Exception e)
-		{
-			// Ignore
-		}
-	}
-	
-	protected void updateConnectionPulldown() {
-		connectionCombo.removeAll();
-		IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySubSystemConfigurationCategory("shells"); //$NON-NLS-1$
-		for(int i = 0; i < connections.length; i++)
-			connectionCombo.add(connections[i].getAliasName());
-		
-		if(connections.length > 0)
-			connectionCombo.select(connections.length - 1);
-	}
-    
-	protected void updateTargetProgFromConfig(ILaunchConfiguration config) {
-		String targetPath = null;
-		try {
-			targetPath = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH,
-						 REMOTE_PATH_DEFAULT);
-		} catch (CoreException e) {
-			// Ignore
-		}
-		remoteProgText.setText(targetPath);
-	}
-	
-	protected void updateSkipDownloadFromConfig(ILaunchConfiguration config) {
-		boolean downloadToTarget = true;
-		try {
-			downloadToTarget = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_SKIP_DOWNLOAD_TO_TARGET, 
-							   SKIP_DOWNLOAD_TO_REMOTE_DEFAULT);
-		} catch (CoreException e) {
-			// Ignore for now
-		}
-		skipDownloadButton.setSelection(downloadToTarget);
-	}
-	
-	/*
-	 * setLocalPathForRemotePath
-	 * This function sets the remote path text field with the value of the 
-	 * local executable path.
-	 */
-	private void setLocalPathForRemotePath() {
-		String programName = fProgText.getText().trim();
-		String remoteName = remoteProgText.getText().trim();
-		if (programName.length() != 0 && remoteName.length() == 0) {
-			IProject project = getCProject().getProject();
-			IPath exePath = new Path(programName);
-			if (!exePath.isAbsolute()) {
-				exePath = project.getFile(programName).getLocation();
-			}
-			String path = exePath.toString();
-			remoteProgText.setText(path);
-		}
-	}
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteGDBDebuggerPage.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteGDBDebuggerPage.java
deleted file mode 100644
index 119b9b5e1..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteGDBDebuggerPage.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource)
- * 
- * Referenced GDBDebuggerPage code to write this.
- *******************************************************************************/
-
-package org.eclipse.rse.remotecdt;
-
-import org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The dynamic debugger tab for remote launches using gdb server.
- * The gdbserver settings are used to start a gdbserver session on the
- * remote and then to connect to it from the host. The DSDP-TM project is
- * used to accomplish this.
- */
-public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
-
-	protected Text fGDBServerCommandText;
-
-	protected Text fGDBServerPortNumberText;
-	
-	public String getName() {
-		return Messages.Remote_GDB_Debugger_Options;
-	}
-	
-	public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
-		super.setDefaults(configuration);
-		configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, 
-									IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND_DEFAULT );
-		configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT,
-									IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
-	}
-	
-	public void initializeFrom( ILaunchConfiguration configuration ) {
-		super.initializeFrom(configuration);
-		String gdbserverCommand = null;
-		String gdbserverPortNumber = null;
-		try {
-			gdbserverCommand = configuration.getAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
-														   IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND_DEFAULT);
-		}
-		catch( CoreException e ) {
-		}
-		try {
-			gdbserverPortNumber = configuration.getAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT,
-															  IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
-		}
-		catch( CoreException e ) {
-		}
-		fGDBServerCommandText.setText( gdbserverCommand );
-		fGDBServerPortNumberText.setText( gdbserverPortNumber );
-	}
-	
-	public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
-		super.performApply(configuration);
-		String str = fGDBServerCommandText.getText();
-		str.trim();
-		configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, str );
-		str = fGDBServerPortNumberText.getText();
-		str.trim();
-		configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT, str );
-	}
-	
-	protected void createGdbserverSettingsTab( TabFolder tabFolder ) {
-		TabItem tabItem = new TabItem( tabFolder, SWT.NONE );
-		tabItem.setText( Messages.Gdbserver_Settings_Tab_Name );
-		
-		Composite comp = new Composite(tabFolder, SWT.NULL);
-		comp.setLayout(new GridLayout(1, true));
-		comp.setLayoutData(new GridData(GridData.FILL_BOTH));
-		((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false;
-		comp.setFont( tabFolder.getFont() );
-		tabItem.setControl( comp );
-		
-		Composite subComp = new Composite(comp, SWT.NULL);
-		subComp.setLayout(new GridLayout(2, true));
-		subComp.setLayoutData(new GridData(GridData.FILL_BOTH));
-		((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false;
-		subComp.setFont( tabFolder.getFont() );
-		
-		Label label = new Label(subComp, SWT.LEFT);		
-		label.setText(Messages.Gdbserver_name_textfield_label);
-		GridData gd = new GridData();
-		label.setLayoutData( gd );
-		
-		
-		fGDBServerCommandText = new Text(subComp, SWT.SINGLE | SWT.BORDER);
-		GridData data = new GridData();
-		fGDBServerCommandText.setLayoutData(data);
-		fGDBServerCommandText.addModifyListener( new ModifyListener() {
-
-			public void modifyText( ModifyEvent evt ) {
-				updateLaunchConfigurationDialog();
-			}
-		} );
-		label = new Label(subComp, SWT.LEFT);
-		label.setText(Messages.Port_number_textfield_label);
-		gd = new GridData();
-		label.setLayoutData( gd );
-		
-		fGDBServerPortNumberText = new Text(subComp, SWT.SINGLE | SWT.BORDER);
-		data = new GridData();
-		fGDBServerPortNumberText.setLayoutData(data);
-		fGDBServerPortNumberText.addModifyListener( new ModifyListener() {
-
-			public void modifyText( ModifyEvent evt ) {
-				updateLaunchConfigurationDialog();
-			}
-		} );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder)
-	 */
-	public void createTabs( TabFolder tabFolder ) {
-		super.createTabs( tabFolder );
-		createGdbserverSettingsTab( tabFolder );
-	}
-}
-
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteLaunchConfigurationTabGroup.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteLaunchConfigurationTabGroup.java
deleted file mode 100644
index b6ce2e190..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchConfigurationTabGroup
- *******************************************************************************/
-
-
-package org.eclipse.rse.remotecdt;
-import org.eclipse.cdt.launch.ui.CArgumentsTab;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-
-/**
- * This class defines the tab group for the Remote C++ Launch
- * Configuration.
- */
-public class RemoteLaunchConfigurationTabGroup extends
-		AbstractLaunchConfigurationTabGroup {
-	 public void createTabs(ILaunchConfigurationDialog dialog, String mode)  {
-         ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-                 new RemoteCMainTab(true),
-                 new CArgumentsTab(),
-     			 new RemoteCDebuggerTab(false),
-                 new SourceLookupTab(),
-                 new CommonTab()
-         };
-         setTabs(tabs);
-	 }
-}
\ No newline at end of file
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
deleted file mode 100644
index 31063691a..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 PalmSource, 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: 
- * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchDelegate
- *******************************************************************************/
-
-
-package org.eclipse.rse.remotecdt;
-
-import java.io.File;
-
-import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.CDIDebugModel;
-import org.eclipse.cdt.debug.core.ICDIDebugger2;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDISession;
-import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
-import org.eclipse.cdt.debug.mi.core.GDBServerCDIDebugger2;
-import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants;
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.services.IService;
-import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.shells.HostShellProcessAdapter;
-import org.eclipse.rse.services.shells.IHostShell;
-import org.eclipse.rse.services.shells.IShellService;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.swt.widgets.Display;
-
-public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
-	
-	private final static String SHELL_SERVICE = "shell.service";  //$NON-NLS-1$
-	private final static String FILE_SERVICE = "file.service";  //$NON-NLS-1$
-	private final static String EXIT_CMD = "exit"; //$NON-NLS-1$
-	private final static String CMD_DELIMITER = ";"; //$NON-NLS-1$
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch
-	 */
-	public void launch(ILaunchConfiguration config, String mode, ILaunch launch,
-			IProgressMonitor monitor)  throws CoreException {
-		
-		IBinaryObject exeFile = null;
-		IPath exePath = verifyProgramPath(config);
-		ICProject project = verifyCProject(config);
-		if (exePath != null) {
-			exeFile = verifyBinary(project, exePath);
-		}
-
-		String arguments = getProgramArguments(config);
-		String remoteExePath = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, ""); //$NON-NLS-1$
-		
-		if(mode.equals(ILaunchManager.DEBUG_MODE)){
-			setDefaultSourceLocator(launch, config);			
-			String debugMode = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
-					ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
-			if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
-				Process remoteShellProcess = null;
-				ICDISession dsession = null;
-				try {
-					// Download the binary to the remote before debugging.
-					remoteFileDownload(config, launch, exePath.toString(), remoteExePath);
-				
-					// Automatically start up the gdbserver.  In the future this should be expanded to launch
-					// an arbitrary remote damon.
-					String gdbserver_port_number = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT,
-																       IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT);
-					String gdbserver_command = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
-							   									   IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND_DEFAULT);
-					String command_arguments = ":" + gdbserver_port_number + " "  //$NON-NLS-1$ //$NON-NLS-2$
-												+ spaceEscapify(remoteExePath);
-					if(arguments != null && !arguments.equals("")) //$NON-NLS-1$
-						command_arguments += " " + arguments; //$NON-NLS-1$
-					remoteShellProcess = remoteShellExec(config, gdbserver_command,
-														 command_arguments);
-					DebugPlugin.newProcess(launch, remoteShellProcess, Messages.RemoteRunLaunchDelegate_RemoteShell);
-				
-					// Pre-set configuration constants for the GDBSERVERCDIDebugger to indicate how the gdbserver
-					// was automatically started on the remote.  GDBServerCDIDebugger uses these to figure out how
-					// to connect to the remote gdbserver.
-					ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-					wc.setAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP, true);
-					wc.setAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_HOST, getRemoteHostname(config)); 
-					wc.setAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_PORT, 
-						gdbserver_port_number);
-					wc.doSave();
-
-					// Default to using the GDBServerCDIDebugger.
-					GDBServerCDIDebugger2 debugger = new GDBServerCDIDebugger2();
-					dsession = ((ICDIDebugger2)debugger).createSession(launch, exePath.toFile(), 
-																	   new SubProgressMonitor(monitor, 8));
-
-					boolean stopInMain = config
-					.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
-					String stopSymbol = null;
-					if ( stopInMain )
-						stopSymbol = launch.getLaunchConfiguration().getAttribute( 
-								ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, 
-								ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT );
-
-					ICDITarget[] targets = dsession.getTargets();
-					for (int i = 0; i < targets.length; i++) {
-						Process process = targets[i].getProcess();
-						IProcess iprocess = null;
-						if (process != null) {
-							iprocess = DebugPlugin.newProcess(launch, process,
-										renderProcessLabel(exePath.toOSString()), getDefaultProcessMap());
-						} 
-						CDIDebugModel.newDebugTarget(launch, project.getProject(), targets[i], 
-										renderProcessLabel("gdbserver debugger"), //$NON-NLS-1$
-										iprocess, exeFile, true, false, stopSymbol, true);
-					}
-				} catch (CoreException e) {
-					try {
-						if(dsession != null)
-							dsession.terminate();
-						if(remoteShellProcess != null)
-							remoteShellProcess.destroy();
-					} catch (CDIException e1) {
-						// ignore
-					}
-					throw e;
-				}
-			}
-
-		} else if(mode.equals(ILaunchManager.RUN_MODE)) {
-			Process remoteProcess = null;
-			try {
-				// Download the binary to the remote before debugging.
-				remoteFileDownload(config, launch, exePath.toString(),remoteExePath );
-				// Use a remote shell to launch the binary.
-				remoteProcess = remoteShellExec(config, remoteExePath, arguments);
-				DebugPlugin.newProcess(launch, remoteProcess, renderProcessLabel(exePath.toOSString()));
-			} catch (CoreException e) {
-				if(remoteProcess != null)
-					remoteProcess.destroy();
-				throw e;
-			}
-			
-		} else {
-			IStatus status = new Status(IStatus.ERROR, getPluginID(),
-								 IStatus.OK, NLS.bind(Messages.RemoteRunLaunchDelegate_1, mode), null);
-			throw new CoreException(status);
-		}		
-	}
-	
-	private String spaceEscapify(String inputString) {
-		if(inputString == null)
-			return null;
-		
-		return inputString.replaceAll(" ", "\\\\ "); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	protected IHost getCurrentConnection(ILaunchConfiguration config) throws CoreException {
-		String remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, ""); //$NON-NLS-1$
-
-		IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts();
-		int i = 0;
-		for(i = 0; i < connections.length; i++)
-			if(connections[i].getAliasName().equals(remoteConnection))
-				break;
-		if(i >= connections.length) {
-			abort("Could not find the remote connection.", null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
-		}
-		return connections[i];
-	}
-	
-	protected IService getConnectedRemoteService(ILaunchConfiguration config, String kindOfService)
-		throws CoreException {
-		
-		// Check that the service requested is file or shell.
-		if(!kindOfService.equals(SHELL_SERVICE) && !kindOfService.equals(FILE_SERVICE))
-			abort(Messages.RemoteRunLaunchDelegate_3, null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
-		
-		IHost currentConnection = getCurrentConnection(config);
-		
-		ISubSystem[] subSystems = currentConnection.getSubSystems();
-		int i = 0;
-		for(i = 0; i < subSystems.length; i++) {
-			if(subSystems[i] instanceof IShellServiceSubSystem && kindOfService.equals(SHELL_SERVICE))
-				break;
-			if(subSystems[i] instanceof IFileServiceSubSystem && kindOfService.equals(FILE_SERVICE))
-				break;
-		}
-		if(i >= subSystems.length)
-			abort(Messages.RemoteRunLaunchDelegate_4, null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
-
-		// Need to run this in the UI thread
-
-		final ISubSystem  subsystem = subSystems[i];
-		Display.getDefault().syncExec(new Runnable()
-		{
-			public void run()
-			{	try {
-				subsystem.connect(false);
-				} catch (Exception e) {
-					// Ignore
-				}
-			}
-		});
-		
-		if(!subsystem.isConnected())
-			abort(Messages.RemoteRunLaunchDelegate_5, null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
-		
-		if(kindOfService.equals(SHELL_SERVICE))
-			return  ((IShellServiceSubSystem) subsystem).getShellService();
-		else
-			return  ((IFileServiceSubSystem) subsystem).getFileService();
-	}
-	
-	protected Process remoteFileDownload(ILaunchConfiguration config,  ILaunch launch,
-			String localExePath, String remoteExePath) throws CoreException {
-		
-		boolean skipDownload = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_SKIP_DOWNLOAD_TO_TARGET, false);
-		
-		if(skipDownload)
-			// Nothing to do.  Download is skipped.
-			return null;
-
-		IFileService fileService = (IFileService) getConnectedRemoteService(config, FILE_SERVICE);
-		File file = new File(localExePath);
-		Path remotePath = new Path(remoteExePath);
-		try {
-			fileService.upload(new NullProgressMonitor(), file, remotePath.removeLastSegments(1).toString(),
-					remotePath.lastSegment(), true, null, null);
-			// Need to change the permissions to match the original file permissions because of a bug in upload
-			Process p = remoteShellExec(config, "chmod", "+x " + spaceEscapify(remotePath.toString())); //$NON-NLS-1$ //$NON-NLS-2$
-			Thread.sleep(500);
-			p.destroy();
-		} catch (Exception e) {
-			abort(Messages.RemoteRunLaunchDelegate_6, e, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR );
-		}	
-		return null;
-	}
-	
-	protected String getRemoteHostname(ILaunchConfiguration config) throws CoreException {
-		IHost currentConnection = getCurrentConnection(config);
-		return currentConnection.getHostName();
-	}
-	
-	protected Process remoteShellExec(ILaunchConfiguration config, String remoteCommandPath,
-			String arguments) throws CoreException {
-		// The exit command is called to force the remote shell to close after our command 
-		// is executed. This is to prevent a running process at the end of the debug session.
-		// See Bug 158786.
-		String real_remote_command = arguments == null ? spaceEscapify(remoteCommandPath) :
-												    spaceEscapify(remoteCommandPath) + " " + arguments; //$NON-NLS-1$
-		String remote_command = real_remote_command + CMD_DELIMITER + EXIT_CMD;
-		
-		IShellService shellService = (IShellService) getConnectedRemoteService(config, SHELL_SERVICE);
-		
-		// This is necessary because runCommand does not actually run the command right now.
-		String env[] = new String[0];
-		IHostShell hostShell = shellService.launchShell(new NullProgressMonitor(), "",env); //$NON-NLS-1$
-		hostShell.writeToShell(remote_command);
-		
-		Process p = null;
-		try {
-			p = new HostShellProcessAdapter(hostShell);
-		} catch (Exception e) {
-			if (p != null) {
-				p.destroy();
-			}
-			abort(Messages.RemoteRunLaunchDelegate_7, null, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
-		}
-		return p;
-	
-	}
-	
-	protected String getPluginID() {
-		return "org.eclipse.rse.remotecdt"; //$NON-NLS-1$
-	}
-}
diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/messages.properties b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/messages.properties
deleted file mode 100644
index 684810018..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/messages.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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) - externalized strings
-################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-RemoteRunLaunchDelegate_RemoteShell=Remote Shell
-RemoteRunLaunchDelegate_1=Unidentified mode {0} passed to RemoteRunLaunchDelegate
-RemoteRunLaunchDelegate_3=Wrong service requested.
-RemoteRunLaunchDelegate_4=No subsystem found.\n
-RemoteRunLaunchDelegate_5=Could not connect to the remote system.
-RemoteRunLaunchDelegate_6=Error during file upload.
-RemoteRunLaunchDelegate_7=Could not create the hostShellProcess.\n
-RemoteCMainTab_Program=Remote Path for C/C++ Application:
-RemoteCMainTab_SkipDownload=Skip download to target path.
-Remote_GDB_Debugger_Options=Remote GDB Debugger Options
-RemoteCMainTab_ErrorNoProgram=Remote executable path is not specified.
-RemoteCMainTab_ErrorNoConnection=Remote Connection must be selected.
-RemoteCMainTab_Connection=Connection:
-RemoteCMainTab_New=New
-Gdbserver_Settings_Tab_Name=Gdbserver Settings
-Gdbserver_name_textfield_label=Gdbserver name:
-Port_number_textfield_label=Port number:
diff --git a/rse/examples/org.eclipse.rse.remotecdt/toc.xml b/rse/examples/org.eclipse.rse.remotecdt/toc.xml
deleted file mode 100644
index 1b2611151..000000000
--- a/rse/examples/org.eclipse.rse.remotecdt/toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-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 (Wind River) - initial API and implementation  
--->
-<toc link_to="../org.eclipse.rse.doc.user/toc.xml#rse_user_extensions"
-	 label="Launching Remote C/C++ Applications"> 
-	<topic label="Launching Remote C/C++ Applications" href="remotecdt.html"/>
-</toc>
\ 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 5ced4830e..000000000
--- a/rse/features/org.eclipse.rse-feature/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# 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 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-generate.feature@org.apache.commons.net.source=org.apache.commons.net
-generate.feature@org.apache.oro.source=org.apache.oro
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 021017634..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-# 
-# 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 (RSE) 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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 6daae3b6e..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse"
-      label="%featureName"
-      version="2.0.0.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="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.core"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.dstore"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ftp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.local"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ssh"
-         version="0.0.0"/>
-
-   <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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse-feature/license.html
+++ /dev/null
@@ -1,79 +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/.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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.core-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 e019a1461..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ /dev/null
@@ -1,141 +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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer (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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 59bc70058..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.core"
-      label="%featureName"
-      version="2.0.0.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="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.debug.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.files.ui"
-         download-size="111"
-         install-size="407"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.logging"
-         download-size="12"
-         install-size="28"
-         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.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"/>
-
-   <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.subsystems.processes.shell.linux"
-         download-size="0"
-         install-size="0"
-         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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.core-feature/license.html
+++ /dev/null
@@ -1,79 +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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 682ae1daa..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# 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:
-#     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=Remote System Explorer Core Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project 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, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..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 2, 2006</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 fdd61ff0d..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=eclipse32.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 97174356b..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# 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=Remote System Explorer Core Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2006.  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 383adb182..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-#     Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/eclipse32.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 165ae9ba7..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-pluginName=RSE Core Source
-providerName=Eclipse.org
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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 174da64cf..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ /dev/null
@@ -1,139 +0,0 @@
-###############################################################################
-# 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:
-#     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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project 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, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 7f2352371..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.dstore"
-      label="%featureName"
-      version="2.0.0.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="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" 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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/license.html
+++ /dev/null
@@ -1,79 +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.dstore-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 3f25b1b10..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-###############################################################################
-# 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:
-#     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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project 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, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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.dstore-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..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 2, 2006</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 fdd61ff0d..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=eclipse32.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 a40e42463..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# 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=Remote System Explorer DStore Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2006.  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 383adb182..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-#     Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/eclipse32.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 51ab5d7a0..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-pluginName=RSE DStore Services Source
-providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.efs-feature/.project b/rse/features/org.eclipse.rse.efs-feature/.project
deleted file mode 100644
index 784c8d63e..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.efs-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.efs-feature/build.properties b/rse/features/org.eclipse.rse.efs-feature/build.properties
deleted file mode 100644
index 038e6d5be..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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
-generate.plugin@org.eclipse.rse.efs.source=org.eclipse.rse.efs
diff --git a/rse/features/org.eclipse.rse.efs-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.efs-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.efs-feature/epl-v10.html b/rse/features/org.eclipse.rse.efs-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.properties b/rse/features/org.eclipse.rse.efs-feature/feature.properties
deleted file mode 100644
index c7819ed43..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/feature.properties
+++ /dev/null
@@ -1,143 +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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Experimental Eclipse Filesystem (EFS) Provider
-
-# "description" property - description of the feature
-description=An experimental EFS provider over RSE remote file services. \
-Does not work for Eclipse Workspace Projects yet. Includes Source.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.efs-feature/feature.xml b/rse/features/org.eclipse.rse.efs-feature/feature.xml
deleted file mode 100644
index e8fc4a731..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/feature.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.efs"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.eclipse.filesystem"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.eclipse.filesystem"
-         download-size="13"
-         install-size="23"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.efs.source"
-         download-size="17"
-         install-size="68"
-         version="0.0.0"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.efs-feature/license.html b/rse/features/org.eclipse.rse.efs-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/license.html
+++ /dev/null
@@ -1,79 +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.efs-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/rse/features/org.eclipse.rse.efs-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 2, 2006</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.efs-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index a070fd9c6..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 = about.html, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 261e8a560..000000000
--- a/rse/features/org.eclipse.rse.efs-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-pluginName=RSE Experimental EFS Provider Source
-providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.ftp-feature/.project b/rse/features/org.eclipse.rse.ftp-feature/.project
deleted file mode 100644
index 6b14f04dc..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.ftp-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.ftp-feature/build.properties b/rse/features/org.eclipse.rse.ftp-feature/build.properties
deleted file mode 100644
index 8ed560ec8..000000000
--- a/rse/features/org.eclipse.rse.ftp-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.ftp-feature/epl-v10.html b/rse/features/org.eclipse.rse.ftp-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/feature.properties
deleted file mode 100644
index ed4f3821c..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE FTP Services
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "description" property - description of the feature
-description=The Remote System Explorer (RSE) ftp feature contains an FTP-based \
-implementation of the file services defined by the RSE API.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
deleted file mode 100644
index 7037eaeba..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.ftp"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.services.files.ftp">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <includes
-         id="org.apache.commons.net"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.oro"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.files.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      -->
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.services.files.ftp"
-         download-size="11"
-         install-size="18"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.ftp"
-         download-size="5"
-         install-size="13"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/license.html b/rse/features/org.eclipse.rse.ftp-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/license.html
+++ /dev/null
@@ -1,79 +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.ftp-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index bdf51122b..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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:
-#     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 FTP Services Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "description" property - description of the feature
-description=The Remote System Explorer (RSE) stp contains an FTP-based \
-implementation of the file services defined by the RSE API.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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.ftp-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/rse/features/org.eclipse.rse.ftp-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 2, 2006</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.ftp-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/rse/features/org.eclipse.rse.ftp-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=eclipse32.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.ftp-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.ftp-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.ftp-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 012ae1175..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# 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=Remote System Explorer FTP Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation, Symbian Software Ltd. and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
-
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 383adb182..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-#     Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f94d068fc..000000000
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-pluginName=RSE FTP Services Source
-providerName=Eclipse.org
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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.local-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 88abe2b99..000000000
--- a/rse/features/org.eclipse.rse.local-feature/feature.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-###############################################################################
-# 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:
-#     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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project 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, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 318b7b4b3..000000000
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.local"
-      label="%featureName"
-      version="2.0.0.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="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.files.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core"/>
-      <import plugin="org.eclipse.rse.processes.ui"/>
-      <import plugin="org.eclipse.rse.shells.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core"/>
-      -->
-   </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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.local-feature/license.html
+++ /dev/null
@@ -1,79 +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.local-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 e31df7cb0..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# 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:
-#     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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project 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, 2006 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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.local-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..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 2, 2006</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 fdd61ff0d..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=eclipse32.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 3dc478764..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# 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=Remote System Explorer Local Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/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 383adb182..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-#     Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/eclipse32.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 e87759777..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-pluginName=RSE Local Services Source
-providerName=Eclipse.org
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/.project b/rse/features/org.eclipse.rse.remotecdt-feature/.project
deleted file mode 100644
index 5ee774e53..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.remotecdt-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.remotecdt-feature/build.properties b/rse/features/org.eclipse.rse.remotecdt-feature/build.properties
deleted file mode 100644
index 5ccdddc9f..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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
-generate.plugin@org.eclipse.rse.remotecdt.source=org.eclipse.rse.remotecdt
-               
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.remotecdt-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/epl-v10.html b/rse/features/org.eclipse.rse.remotecdt-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties b/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties
deleted file mode 100644
index 5cca335d5..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.properties
+++ /dev/null
@@ -1,141 +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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=CDT Remote Launcher End-User and Extender SDK
-
-# "description" property - description of the feature
-description=A Launch Configuration for debugging C/C++ programs on a \
-remote host through RSE-provided shell and file services, and gdbserver. \
-Includes Source.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2007 PalmSource, 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\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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
deleted file mode 100644
index 074779e0e..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.remotecdt"
-      label="%featureName"
-      version="1.0.100.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.remotecdt"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-      <import feature="org.eclipse.cdt"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.remotecdt"
-         download-size="16"
-         install-size="32"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.remotecdt.source"
-         download-size="24"
-         install-size="29"
-         version="0.0.0"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/license.html b/rse/features/org.eclipse.rse.remotecdt-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/license.html
+++ /dev/null
@@ -1,79 +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.remotecdt-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index e2db97ba9..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-# 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 CDT Remote Launcher Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "description" property - description of the feature
-description=A Launch Configuration \
-for debugging C/C++ programs on a remote host through RSE-provided shell and file \
-services, and gdbserver.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 PalmSource, Inc., Wind River Systems, 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\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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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.remotecdt-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-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 2, 2006</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.remotecdt-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-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=eclipse32.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.remotecdt-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-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.remotecdt-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 4ec88065c..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-# 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=Remote System Explorer CDT Remote Launcher Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright PalmSource, Inc., Wind River Systems, Inc. and others 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index b2a9c78b2..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# PalmSource, Inc.  - initial API and implementation
-# Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 7a55ddddc..000000000
--- a/rse/features/org.eclipse.rse.remotecdt-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 
-################################################################################
-pluginName=RSE CDT Remote Launcher Source
-providerName=Eclipse.org
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 5ced4830e..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# 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 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-generate.feature@org.apache.commons.net.source=org.apache.commons.net
-generate.feature@org.apache.oro.source=org.apache.oro
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
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 ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</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 2a41cdeda..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer (RSE) 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.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. 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 7c1ba063d..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.sdk"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.commons.net.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.oro.source"
-         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"/>
-
-   <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 c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/license.html
+++ /dev/null
@@ -1,79 +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.ssh-feature/.project b/rse/features/org.eclipse.rse.ssh-feature/.project
deleted file mode 100644
index b1f050d2e..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.ssh-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.ssh-feature/build.properties b/rse/features/org.eclipse.rse.ssh-feature/build.properties
deleted file mode 100644
index 45085da6d..000000000
--- a/rse/features/org.eclipse.rse.ssh-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,\
-               epl-v10.html,\
-               license.html
diff --git a/rse/features/org.eclipse.rse.ssh-feature/epl-v10.html b/rse/features/org.eclipse.rse.ssh-feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
deleted file mode 100644
index d158ad342..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE SSH Services
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "description" property - description of the feature
-description=An SSH-based \
-implementation of the file ans shell services defined by the RSE API.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Wind River Systems, 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
deleted file mode 100644
index dd3ccb9bc..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.rse.ssh"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.services.ssh">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <!-- Feature dependency due to bug 175004 (UM doesnt use plugins for "Select Required" -->
-      <!-- But take care of bug 154505 (UM "Select Required" selects container features) -->
-      <import feature="org.eclipse.rse.core" version="2.0.0.qualifier" match="compatible"/>
-      <!--
-      <import plugin="org.eclipse.rse.subsystems.files.core"/>
-      <import plugin="org.eclipse.rse.files.ui"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core"/>
-      <import plugin="org.eclipse.rse.shells.ui"/>
-      <import plugin="org.eclipse.rse.services"/>
-      <import plugin="org.eclipse.rse.ui"/>
-      -->
-      <!-- Bug 175108: Excplicit dependency on CVS for SSH -->
-      <!-- TM Site users can deselect SSH if they have Platform Only -->
-      <!-- Europa Users should be able to do "Select Required" -->
-      <import feature="org.eclipse.cvs" version="1.0.0" match="greaterOrEqual"/>
-      <!--
-      <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
-      -->
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.services.ssh"
-         download-size="19"
-         install-size="34"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.connectorservice.ssh"
-         download-size="9"
-         install-size="23"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.ssh"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.shells.ssh"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/license.html b/rse/features/org.eclipse.rse.ssh-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/license.html
+++ /dev/null
@@ -1,79 +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.ssh-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 638d573ac..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,142 +0,0 @@
-###############################################################################
-# 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:
-#     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 SSH Services Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Target Management Project Updates
-
-# "description" property - description of the feature
-description=An SSH-based \
-implementation of the file and shell services defined by the RSE API.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Wind River Systems, 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\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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? 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +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.ssh-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 23d575cee..000000000
--- a/rse/features/org.eclipse.rse.ssh-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 2, 2006</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.ssh-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fdd61ff0d..000000000
--- a/rse/features/org.eclipse.rse.ssh-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=eclipse32.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.ssh-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 720ca870f..000000000
--- a/rse/features/org.eclipse.rse.ssh-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.ssh-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 20f886495..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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
-###############################################################################
-# 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=Remote System Explorer SSH Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Wind River Systems, Inc. and others 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 383adb182..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-#     Martin Oberhuber (WindRiver) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/eclipse32.png b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index df29b11e2..000000000
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-pluginName=RSE SSH Services Source
-providerName=Eclipse.org
diff --git a/rse/features/readme.txt b/rse/features/readme.txt
deleted file mode 100644
index d1091fa2e..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".
\ No newline at end of file
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 f7348997d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.project
+++ /dev/null
@@ -1,28 +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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
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 d141d3395..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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 c0687ce6d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.dstore.core
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.dstore.core.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.dstore.extra,
- org.eclipse.ui.views
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.dstore.core,
- org.eclipse.dstore.core.client,
- org.eclipse.dstore.core.java,
- org.eclipse.dstore.core.miners.miner,
- org.eclipse.dstore.core.model,
- org.eclipse.dstore.core.server,
- org.eclipse.dstore.core.util,
- org.eclipse.dstore.core.util.ssl
-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 460233046..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 2, 2006</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 41b67724f..000000000
--- a/rse/plugins/org.eclipse.dstore.core/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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 = .,\
-               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/
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 a51c480cc..000000000
--- a/rse/plugins/org.eclipse.dstore.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE DStore Core
-providerName = Eclipse.org
\ No newline at end of file
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/ClientAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientAttributes.java
deleted file mode 100644
index 41992fd6b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientAttributes.java
+++ /dev/null
@@ -1,57 +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.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)
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java
deleted file mode 100644
index 9b0a627d2..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java
+++ /dev/null
@@ -1,381 +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.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.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;
-		notifyInput();
-	}
-	
-	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;
-		notifyInput();
-	}
-	
-	public synchronized void waitForInput() 
-	{
-		if (_commands.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null)
-		{
-			super.waitForInput();
-		}
-	}
-}
\ 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 31f589c85..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, 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.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.IDataStoreConstants;
-import org.eclipse.dstore.core.model.ISSLProperties;
-import org.eclipse.dstore.core.server.ServerCommandHandler;
-import org.eclipse.dstore.core.server.ServerLauncher;
-import org.eclipse.dstore.core.util.ExternalLoader;
-import org.eclipse.dstore.core.util.Sender;
-import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
-import org.eclipse.dstore.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>
- * 
- *
- */
-public class ClientConnection implements IDataStoreConstants
-{
-
-
-	private ClientAttributes _clientAttributes;
-
-	private Socket _theSocket;
-	private boolean _isConnected = false;
-	private boolean _isRemote = false;
-	private DataStore _dataStore;
-	private DomainNotifier _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;
-
-	private static final int HANDSHAKE_INCORRECT = 0;
-	private static final int HANDSHAKE_SERVER_OLDER = 1;
-	private static final int HANDSHAKE_CORRECT = 2;
-	private static final int HANDSHAKE_UNEXPECTED = 3;
-	private static final int HANDSHAKE_SERVER_NEWER = 4;
-	private static final int HANDSHAKE_SERVER_RECENT_OLDER = 5;
-	private static final int HANDSHAKE_SERVER_RECENT_NEWER = 6;
-	private static final int HANDSHAKE_TIMEOUT = 7;
-	
-	private static final int VERSION_INDEX_PROTOCOL = 0;
-	private static final int VERSION_INDEX_VERSION  = 1;
-	private static final int VERSION_INDEX_MINOR    = 2;
-	public static String INCOMPATIBLE_SERVER_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$
-	public static String INCOMPATIBLE_CLIENT_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$
-	public static String SERVER_OLDER = "Older DataStore Server."; //$NON-NLS-1$
-	public static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$
-	public static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$
-	public static String CANNOT_CONNECT = "Cannot connect to server."; //$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
-	 */
-	public ClientConnection(String name, DomainNotifier 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
-	 */
-	public ClientConnection(String name, DomainNotifier 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);
-	}
-
-
-
-	/**
-	 * 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 
-	 */
-	public void addLoader(ExternalLoader 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.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());
-	}
-	
-	public DataStoreTrustManager 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();
-				DataStoreTrustManager 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 HANDSHAKE_CORRECT:
-				result = doConnect(ticket);
-				break;
-			case HANDSHAKE_SERVER_RECENT_NEWER:
-				result = doConnect(ticket);
-				result.setMessage(CLIENT_OLDER);
-				break;
-			case HANDSHAKE_SERVER_RECENT_OLDER:
-				result = doConnect(ticket);
-				result.setMessage(SERVER_OLDER);
-				break;
-			case 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 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 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 HANDSHAKE_UNEXPECTED:
-			{
-				msg = CANNOT_CONNECT;
-				msg += "Unexpected exception."; //$NON-NLS-1$
-				break;
-			}
-			case 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);
-		_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 4035
-		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)
-	{
-		ConnectionStatus result = connectDaemon(daemonPort);
-		boolean doTimeOut = timeout > 0;
-		if (!result.isConnected()) {
-			return result;
-		}
-		try
-		{
-			PrintWriter writer = null;
-			BufferedReader reader = null;
-
-			// create output stream for server launcher
-			try
-			{
-				if (doTimeOut) _launchSocket.setSoTimeout(timeout);
-				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(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
-	 */
-	public ConnectionStatus connectDaemon(int daemonPort) {
-		ConnectionStatus result = new ConnectionStatus(true);
-		try
-		{
-			_launchSocket = null;
-			if (_dataStore.usingSSL())
-			{
-				try
-				{
-					String location = _dataStore.getKeyStoreLocation();
-					String pw = _dataStore.getKeyStorePassword();
-					DataStoreTrustManager mgr = getTrustManager();
-					SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr);
-				
-					try
-					{
-						SocketFactory factory = context.getSocketFactory();
-						SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
-						_launchSocket = lSocket;
-
-						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();
-						}
-
-						result = new ConnectionStatus(false, e);						
-						return result;
-					}
-				}
-				catch (Exception e)
-				{
-					result = new ConnectionStatus(false, e);						
-					return result;				
-				}
-			}
-			else
-			{
-				_launchSocket = new Socket(_host, daemonPort);
-			}
-		}
-		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 (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 HANDSHAKE_TIMEOUT;
-			}
-			_theSocket.setSoTimeout(0);
-
-			String[] clientVersionStr = DataStoreAttributes.DATASTORE_VERSION.split("\\.");			 //$NON-NLS-1$
-			String[] serverVersionStr = handshake.split("\\."); //$NON-NLS-1$
-
-			_dataStore.setServerVersion(Integer.parseInt(serverVersionStr[VERSION_INDEX_VERSION]));
-			_dataStore.setServerMinor(Integer.parseInt(serverVersionStr[VERSION_INDEX_MINOR]));
-			
-			
-			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 (_dataStore.getServerVersion()== _clientVersion)
-					{
-						// major versions match so should be compatible
-						return HANDSHAKE_CORRECT;
-					}
-					else
-					{
-						if (_dataStore.getServerVersion()> _clientVersion)
-						{
-							// newer server
-							if (_dataStore.getServerVersion() - 1 == _clientVersion)
-							{
-								return HANDSHAKE_SERVER_RECENT_NEWER;
-							}
-							else
-							{
-								return HANDSHAKE_SERVER_NEWER;
-							}
-						}
-						else
-						{
-							// newer client
-							if (_dataStore.getServerVersion() + 1 == _clientVersion)
-							{
-								return HANDSHAKE_SERVER_RECENT_OLDER;
-							}
-							else
-							{							
-								return HANDSHAKE_SERVER_OLDER;
-							}
-						}
-					}
-				}
-				else
-				{
-					//System.out.println("handshake=" + handshake);
-					return HANDSHAKE_INCORRECT;
-				}
-			}
-
-		}
-		catch (Exception e)
-		{
-			return HANDSHAKE_UNEXPECTED;
-		}
-
-	}
-		
-	public boolean isKnownStatus(String status)
-	{
-		return  status.equals(CONNECTED) ||
-				status.equals(AUTHENTICATION_FAILED) ||
-				status.equals(UNKNOWN_PROBLEM) ||
-				status.startsWith(SERVER_FAILURE) ||
-				status.equals(PASSWORD_EXPIRED) ||
-				status.equals(NEW_PASSWORD_INVALID);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java
deleted file mode 100644
index e1b86b9bb..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java
+++ /dev/null
@@ -1,77 +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.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);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java
deleted file mode 100644
index 193a563fa..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java
+++ /dev/null
@@ -1,106 +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.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;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java
deleted file mode 100644
index 42d634336..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java
+++ /dev/null
@@ -1,189 +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.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() 
-	{
-	}
-
-	
-}
\ No newline at end of file
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 d0635c8d0..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java
+++ /dev/null
@@ -1,150 +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.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.
- */
-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 0d55a70c4..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java
+++ /dev/null
@@ -1,211 +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.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>
- * 
- */
-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()
-		{
-			try
-			{
-				PipedInputStream ins = new PipedInputStream();
-				
-				PipedOutputStream outStream = new PipedOutputStream(ins);
-				outStream.write(_buffer, 0, _size);
-				outStream.flush();
-				outStream.close();				
-
-				IRemoteClassInstance instance = loadInstance(ins);
-				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
-				instance.arrivedOnServer();			
-				_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 7bef3a6f5..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java
+++ /dev/null
@@ -1,78 +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.java;
-
-import java.util.HashMap;
-
-import org.eclipse.dstore.core.model.DataStoreResources;
-
-
-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 e11a4c27c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.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.dstore.core.java;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-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 979358360..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java
+++ /dev/null
@@ -1,140 +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.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
- *
- */
-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 ec99d4713..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2003, 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.java;
-
-/**
- * <p>
- * The IClassByteStreamHandler interface is used to abstract file read and write operations
- * across the network. 
- * 
- */
-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 faeb5e355..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java
+++ /dev/null
@@ -1,25 +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.java;
-
-import java.io.Serializable;
-
-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 fa7e71e70..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java
+++ /dev/null
@@ -1,54 +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.java;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.util.List;
-
-
-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 6806367dc..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java
+++ /dev/null
@@ -1,491 +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.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
- *
- */
-public class RemoteClassLoader extends ClassLoader
-{ 
-	public 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
-	{
-		//System.out.println("finding "+className);
-		
-		// 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)
-				{
-				}
-			}
-		}
-		
-		// next delegate the search to the superclass's find method.
-		try
-		{
-			Class theClass = super.findClass(className);
-			if (theClass != null) 
-			{
-				//System.out.println("Using super's: " + className);
-				return theClass;
-			}
-		}
-		catch (Exception e)
-		{		
-		}
-		
-		// 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;
-		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
-				{
-					
-					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
-		//	System.out.println(className + " already requested but not loaded. Waiting for request to load.");
-			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)
-	{
-	//	System.out.println("receiving "+className);
-		// 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
-		{
-		//	System.out.println("defining "+className+"...");			
-			// 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);
-			
-		//	System.out.println("...finished defining "+className);
-		}
-		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
-	//		System.out.println("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)
-	{
-	//	System.out.println("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
-	//	System.out.println("requesting "+className);
-		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
-		//	System.out.println("thread to wait: "+Thread.currentThread().getName());
-			if (!request.isLoaded()) request.waitForResponse();
-		//	System.out.println("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, wait for it to load
-	//		System.out.println("requested elsewhere, thread to wait: "+Thread.currentThread().getName());
-			if (!request.isLoaded()) request.waitForResponse();
-		//	System.out.println("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)
-	{
-		// 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 6709e7417..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java
+++ /dev/null
@@ -1,39 +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.java;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-
-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/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java
deleted file mode 100644
index d9020a8f2..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java
+++ /dev/null
@@ -1,669 +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.miners.miner;
-
-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.ISchemaExtender;
-import org.eclipse.dstore.core.util.ExternalLoader;
-
-/**
- * Miner is the abstact 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.
- */
-public abstract class Miner extends Handler 
-implements ISchemaExtender
-{
-
-
-	public DataStore _dataStore;
-	public DataElement _minerElement;
-	public DataElement _minerData;
-	public DataElement _minerTransient;
-
-	
-	
-	private boolean _initialized;
-	private boolean _connected;
-	private ExternalLoader _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.
-	 */
-	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);
-	}
-
-	/**
-	 * 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())
-		{
-			DataElement cmd = (DataElement)_commandQueue.remove(0);
-			command(cmd);			
-		}
-	}
-	
-	public final void requestCommand(DataElement command)
-	{
-		_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 (Error er)
-			{
-			    er.printStackTrace();
-				_dataStore.trace(er);
-				_dataStore.finish();
-				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)
-	{
-		_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(ExternalLoader loader)
-	{
-		_loader = loader;
-	}
-
-	public ExternalLoader 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);
-	
-
-	/**
-	 * Returns the version of this miner
-	 * The expected format for this is "<version>.<major>.<minor>"
-	 */
-	public abstract String getVersion();
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/MinerThread.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/MinerThread.java
deleted file mode 100644
index da7074eeb..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/MinerThread.java
+++ /dev/null
@@ -1,122 +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.miners.miner;
-
-/**
- * MinerThread is a utility class used for doing threaded operations in a miner. 
- */
-public abstract class MinerThread extends Thread
-{
-
-	private volatile Thread minerThread;
-	protected boolean _isCancelled;
-
-	/**
-	 * Constructor
-	 */
-	public MinerThread()
-	{
-		super();
-		_isCancelled = false;
-	}
-
-	/**
-	 * stops the thread
-	 */
-	public synchronized void stopThread()
-	{
-		if (minerThread != null)
-		{
-			_isCancelled = true;
-
-			try
-			{
-				minerThread = null;
-			}
-			catch (Exception e)
-			{
-				System.out.println(e);
-			}
-
-		}
-		notify();
-	}
-
-	/**
-	 * runs the thread
-	 */
-	public void 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)
-			{
-				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)
-				{
-					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();
-}
\ No newline at end of file
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 26199e18e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java
+++ /dev/null
@@ -1,290 +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;
-
-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)
-		{
-			try
-			{
-				// need to create directories as well
-				File file = new File(fileName);
-				if (!file.exists())
-				{
-					File parent = new File(file.getParent());
-					parent.mkdirs();
-				}
-				else
-				{
-				}
-
-				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);
-					
-					/*
-					String bufferString = new String(buffer, 0, size, DE.ENCODING_UTF_8);
-
-					// hack for zOS
-					String theOS = System.getProperty("os.name");
-					if (theOS.toLowerCase().startsWith("z"))
-					{
-						bufferString = bufferString.replace('\r', ' ');
-					}
-
-					OutputStreamWriter writer = new OutputStreamWriter(fileStream);
-					writer.write(bufferString, 0, size);
-					writer.flush();
-					*/
-				}
-
-				fileStream.close();
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-			catch (IOException e)
-			{
-				System.out.println(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)
-			{
-				System.out.println(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)
-		{
-			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);
-					
-					try
-					{
-					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);
-					}
-					}
-					catch (Exception e)
-					{
-						e.printStackTrace();
-					}
-					
-					outStream.close();
-
-				}
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-			catch (IOException e)
-			{
-				System.out.println(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;
-	}
-
-}
\ No newline at end of file
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 a424cf3f7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java
+++ /dev/null
@@ -1,82 +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;
-
-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.
- * 
- */
-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/CommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java
deleted file mode 100644
index 77ecd5620..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java
+++ /dev/null
@@ -1,299 +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;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.util.CommandGenerator;
-
-/**
- * <p>
- * Abtract 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>
- */
-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();
-	}
-	
-	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();
-}
\ No newline at end of file
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 292106d27..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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;
-
-/**
- * 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>
- *
- */
-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.   
-     * @deprecated
-     */
-    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$
-}
\ No newline at end of file
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 e302aba1c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
+++ /dev/null
@@ -1,1682 +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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.dstore.core.util.DataElementRemover;
-import org.eclipse.dstore.core.util.StringCompare;
-import org.eclipse.dstore.extra.IDataElement;
-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>
- *
- */
-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 = 2;
-
-		_referencedObject = null;
-		_isExpanded = false;
-		_isUpdated = false;
-		
-		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)
-				{
-				}
-			}
-		}
-		
-		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)
-	{
-		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 < 2 && buffer.length() > 0)
-		{
-			setDepth(2);
-		}
-
-		_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 = 2;
-
-		_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;
-		}
-	}
-	
-	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);
-		}
-	}
-}
\ No newline at end of file
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 f7e89899e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ /dev/null
@@ -1,4202 +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:
- * Michael Berger (IBM) - 146326 fixed erroneously disconnected dstore elements.
- * Michael Berger (IBM) - 145799 added refresh() method with depth parameter.
- ********************************************************************************/
-
-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.util.DataElementRemover;
-import org.eclipse.dstore.core.util.ExternalLoader;
-import org.eclipse.dstore.core.util.StringCompare;
-import org.eclipse.dstore.core.util.XMLgenerator;
-import org.eclipse.dstore.core.util.XMLparser;
-import org.eclipse.dstore.internal.extra.DomainNotifier;
-
-/**
- * <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>DomainNotifier</code> or indirectly over the communication
- * layer through a client <code>DataStore</code>.  
- * </p>
- *
- */
-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 DomainNotifier _domainNotifier;
-
-	private ArrayList _loaders;
-	private ArrayList _minersLocations;
-	private ArrayList _localClassLoaders;
-	private HashMap _dataStorePreferences;
-	
-	private ISSLProperties _sslProperties;
-
-	private boolean _autoRefresh;
-
-	private boolean _isConnected;
-	private boolean _logTimes;
-	private int _timeout;
-
-	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 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;
-
-	/**
-	 * 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 
-	 */
-	public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, DomainNotifier 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 
-	 */
-	public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, DomainNotifier 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
-	 */
-	public void addLoader(ExternalLoader 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
-	 */
-	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 DomainNotifier 
-	 *
-	 * @param domainNotifier the domainNotifier
-	 */
-	public void setDomainNotifier(DomainNotifier 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;
-	}
-
-	/**
-	 * 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;
-	}
-	
-
-	/**
-	 * 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.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
-	 */
-	public DomainNotifier 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()
-	{
-		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();
-			_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();
-			_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();
-			_hashMap.put(toId, toReference);
-
-			// reference with "from" relationship
-			DataElement fromReference = createElement();
-
-			fromReference.reInit(realObject, parent, fromRelation);
-
-			realObject.addNestedData(fromReference, false);
-
-			String fromId = fromReference.getId();
-			_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();
-			_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();
-			_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);
-		}
-
-		_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);
-		}
-
-		_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);
-		}
-
-		_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)
-	{
-		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);
-	}
-
-	public void setPreference(String property, String value)
-	{
-		_dataStorePreferences.put(property, value);
-		if (isVirtual())
-		{
-			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);
-			}
-		}
-	}
-	
-	public String getPreference(String property)
-	{
-		return (String)_dataStorePreferences.get(property);
-	}
-	
-	/**
-	 * 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);
-	}
-
-	/**
-	 * 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;
-				}
-			}
-		}
-
-		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 synchronized List findDeleted(DataElement root)
-	{
-		return findDeleted(root, 10);
-	}
-
-	/**
-	 * Finds all the deleted elements
-	 *
-	 * @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 synchronized List findDeleted(DataElement root, int depth)
-	{
-		ArrayList results = new ArrayList();
-		synchronized (root)
-		{
-			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)
-	{
-		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 className the fully qualified name of the class
-	 * @param buffer the contents of the class
-	 * @param size the size of the buffer
-	 */
-	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) {
-			
-			_userPreferencesDirectory = System.getProperty("user.home"); //$NON-NLS-1$
-			
-			String 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;
-		    }
-  		
-  			_userPreferencesDirectory = _userPreferencesDirectory + ".eclipse" + File.separator +  //$NON-NLS-1$
-  			         												"RSE" + File.separator + clientUserID; //$NON-NLS-1$
-	  		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);
-		
-		_hashMap = new HashMap(2 * _initialSize);
-		_recycled = new ArrayList(_initialSize);
-		initElements(_initialSize);
-
-		_timeout = 20000;
-		_autoRefresh = false;//true;
-	
-
-		_dataStoreSchema = new DataStoreSchema(this);
-
-		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)
-		{
-			String logDir = getUserPreferencesDirectory();
-			_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
-
-			try
-			{
-				_traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
-				startTracing();
-			}
-			catch (IOException e)
-			{
-			}
-		}
-		
-		//_remoteClassLoader = new RemoteClassLoader(this);
-		_classReqRepository = new HashMap();
-		
-		_waitingStatuses = new ArrayList();
-		
-		_byteStreamHandlerRegistry = new ByteStreamHandlerRegistry();
-		_classbyteStreamHandlerRegistry = new ClassByteStreamHandlerRegistry();
-		setDefaultByteStreamHandler();
-		setDefaultClassByteStreamHandler();
-		
-		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$
-	
-				try
-				{
-					_memLogFile = new RandomAccessFile(_memLoggingFileHandle, "rw"); //$NON-NLS-1$
-					startMemLogging();
-				}
-				catch (IOException e)
-				{
-				}
-			}
-			_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);
-		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);
-			_hashMap.remove(id);
-			
-		}
-	}
-
-	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)
-	{
-		
-		if (!_hashMap.containsKey(id))
-		{
-			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()
-	{
-		//return "" + _uniqueNumber++;
-		///*
-		String newId = String.valueOf(_random.nextInt());
-		while (_hashMap.containsKey(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(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
-		//flush();
-
-		if (_tracingOn)
-		{
-			try
-			{
-				_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())
-		{
-			try
-			{
-				JarOutputStream cacheOut = createNewCacheJar(cacheJar);
-				cacheOut.putNextEntry(new JarEntry("/")); //$NON-NLS-1$
-				cacheOut.closeEntry();
-				cacheOut.close();
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-				_cacheJar = null;
-				return;
-			}
-		}
-		_cacheJar = cacheJar;
-	}
-	
-	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;
-	}
-}
\ No newline at end of file
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 363a7ddd1..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java
+++ /dev/null
@@ -1,95 +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;
-
-
-
-/**
- * This class is used to store attributes that are required
- * for configurating a remote connection.
- */
-public class DataStoreAttributes
-{
-
-	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 a15309e60..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java
+++ /dev/null
@@ -1,115 +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 class DataStoreResources 
-{
-	public static String model_Log_Root="Log Root"; //$NON-NLS-1$
-	public static String model_Tool_Root="Tool Root"; //$NON-NLS-1$
-	public static String model_Set="Set"; //$NON-NLS-1$
-	public static String model_Modify="Modify"; //$NON-NLS-1$
-	public static String model_timeout="timeout"; //$NON-NLS-1$
-	public static String model_data="data"; //$NON-NLS-1$
-	public static String model_transient="transient"; //$NON-NLS-1$
-	public static String model_all="all"; //$NON-NLS-1$
-	public static String model_host="host"; //$NON-NLS-1$
-	public static String model_root="root"; //$NON-NLS-1$
-	public static String model_descriptors="descriptors"; //$NON-NLS-1$
-	public static String model_descriptor_for="descriptor for"; //$NON-NLS-1$
-	public static String model_project="Project"; //$NON-NLS-1$
-	public static String model_log="log"; //$NON-NLS-1$
-	public static String model_deleted="deleted"; //$NON-NLS-1$
-	public static String model_status="status"; //$NON-NLS-1$
-	public static String model_start="start"; //$NON-NLS-1$
-	public static String model_failed="failed"; //$NON-NLS-1$
-	public static String model_done="done"; //$NON-NLS-1$
-	public static String model_working="working"; //$NON-NLS-1$
-	public static String model_progress="progress"; //$NON-NLS-1$
-	public static String model_error="error"; //$NON-NLS-1$
-	public static String model_warning="warning"; //$NON-NLS-1$
-	public static String model_informational="informational"; //$NON-NLS-1$
-	public static String model_markers="markers"; //$NON-NLS-1$
-	public static String model_invocation="invocation"; //$NON-NLS-1$
-	public static String model_pattern="pattern"; //$NON-NLS-1$
-	public static String model_input="input"; //$NON-NLS-1$
-	public static String model_output="output"; //$NON-NLS-1$
-	public static String model_details="details"; //$NON-NLS-1$
-	public static String model_contents="contents"; //$NON-NLS-1$
-	public static String model_contents_arguments="Contents and Arguments"; //$NON-NLS-1$
-	public static String model_parent="parent"; //$NON-NLS-1$
-	public static String model_arguments="arguments"; //$NON-NLS-1$
-	public static String model_Commands="Commands"; //$NON-NLS-1$
-	public static String model_device="device"; //$NON-NLS-1$
-	public static String model_directory="directory"; //$NON-NLS-1$
-	public static String model_folder="folder"; //$NON-NLS-1$
-	public static String model_file="file"; //$NON-NLS-1$
-	public static String model_Filesystem_Objects="Filesystem Objects"; //$NON-NLS-1$
-	public static String model_Container_Object="Container Object"; //$NON-NLS-1$
-	public static String model_Directories="Directories"; //$NON-NLS-1$
-	public static String model_Details="Details"; //$NON-NLS-1$
-	public static String model_miners="miners"; //$NON-NLS-1$
-	public static String model_miner="miner"; //$NON-NLS-1$
-	public static String model_state="state"; //$NON-NLS-1$
-	public static String model_ticket="ticket"; //$NON-NLS-1$
-	public static String model_valid="valid"; //$NON-NLS-1$
-	public static String model_invalid="invalid"; //$NON-NLS-1$
-	public static String model_abstracted_by="abstracted by"; //$NON-NLS-1$
-	public static String model_abstracts="abstracts"; //$NON-NLS-1$
-	public static String model_incomplete="incomplete"; //$NON-NLS-1$
-	public static String model_Miner_Details="Miner Details"; //$NON-NLS-1$
-	public static String model_Hosts="Hosts"; //$NON-NLS-1$
-	public static String model_Tools="Tools"; //$NON-NLS-1$
-	public static String model_Schema="Schema"; //$NON-NLS-1$
-	public static String model_Logged_Commands="Logged Commands"; //$NON-NLS-1$
-	public static String model_Cancel="Cancel"; //$NON-NLS-1$
-	public static String model_Get_Schema="Get Schema"; //$NON-NLS-1$
-	public static String model_Show_Ticket="Show Ticket"; //$NON-NLS-1$
-	public static String model_Init_Miners="Init Miners"; //$NON-NLS-1$
-	public static String model_Set_Host="Set Host"; //$NON-NLS-1$
-	public static String model_Exit="Exit"; //$NON-NLS-1$
-	public static String model_Connect_to="Connect to"; //$NON-NLS-1$
-	public static String model_Disconnect_from="Disconnect from"; //$NON-NLS-1$
-	public static String model_Delete_Connection="Delete Connection"; //$NON-NLS-1$
-	public static String model_time="time"; //$NON-NLS-1$
-	public static String model_property="property"; //$NON-NLS-1$
-	public static String model_start_time="start time"; //$NON-NLS-1$
-	public static String model_command_time="command time"; //$NON-NLS-1$
-	public static String model_Transient_Objects="Transient Objects"; //$NON-NLS-1$
-	public static String model_Data="Data"; //$NON-NLS-1$
-	public static String model_No_input="No input"; //$NON-NLS-1$
-	public static String model_Open="Open"; //$NON-NLS-1$
-	public static String model_Close="Close"; //$NON-NLS-1$
-	public static String model_Refresh="Refresh"; //$NON-NLS-1$
-	public static String model_Query="Query"; //$NON-NLS-1$
-	public static String model_Cancellable="Cancellable"; //$NON-NLS-1$
-
-	public static String SERIALIZED_TYPE="SERIALIZED"; //$NON-NLS-1$
-	public static String CLASS_TYPE="CLASS"; //$NON-NLS-1$
-	public static String REQUEST_CLASS_TYPE="REQUEST_CLASS"; //$NON-NLS-1$
-	public static String DEFAULT_CLASSBYTESTREAMHANDLER="default"; 	 //$NON-NLS-1$
-	public static String FILE_TYPE="FILE"; //$NON-NLS-1$
-	public static String DOCUMENT_TYPE="DOCUMENT"; //$NON-NLS-1$
-	public static String DEFAULT_BYTESTREAMHANDLER="default"; //$NON-NLS-1$
-	public static String TRUE="true"; //$NON-NLS-1$
-	public static String FALSE="false"; //$NON-NLS-1$
-	public static String DELETED="deleted"; //$NON-NLS-1$
-	public static String KEEPALIVE_TYPE="KEEPALIVE"; //$NON-NLS-1$
-	public static String KEEPALIVECONFIRM_TYPE="CONFIRMKEEPALIVE"; //$NON-NLS-1$
-	public static String REFERENCE="reference"; //$NON-NLS-1$
-	public static String VALUE="value"; //$NON-NLS-1$
-	public static String SPIRIT="spirit"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.properties b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.properties
deleted file mode 100644
index 7943f826f..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.properties
+++ /dev/null
@@ -1,103 +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.
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# This file contains the DataStore resources.  English.
-
-# model types
-model.Log_Root=Log Root
-model.Tool_Root=Tool Root
-model.Set=Set
-model.Modify=Modify
-model.timeout=timeout
-model.data=data
-model.transient=transient
-model.all=all
-model.host=host
-model.root=root
-model.descriptors=descriptors
-model.descriptor_for=descriptor for
-model.project=Project
-model.log=log
-model.deleted=deleted
-model.status=status
-model.start=start
-model.failed=failed
-model.done=done
-model.working=working
-model.progress=progress
-model.error=error
-model.warning=warning
-model.informational=informational
-model.markers=markers
-model.invocation=invocation
-model.pattern=pattern
-model.input=input
-model.output=output
-model.details=details
-model.contents=contents
-model.contents&arguments=Contents and Arguments
-model.parent=parent
-model.arguments=arguments
-model.Commands=Commands
-model.device=device
-model.directory=directory
-model.folder=folder
-model.file=file
-model.Filesystem_Objects=Filesystem Objects
-model.Container_Object=Container Object
-model.Directories=Directories
-model.Details=Details
-model.miners=miners
-model.miner=miner
-model.state=state
-model.ticket=ticket
-model.valid=valid
-model.invalid=invalid
-model.abstracted_by=abstracted by
-model.abstracts=abstracts
-model.incomplete=incomplete
-model.Miner_Details=Miner Details
-model.Hosts=Hosts
-model.Details=Details
-model.Tools=Tools
-model.Schema=Schema
-model.Logged_Commands=Logged Commands
-model.Cancel=Cancel
-model.Get_Schema=Get Schema
-model.Show_Ticket=Show Ticket
-model.Init_Miners=Init Miners
-model.Set_Host=Set Host
-model.Exit=Exit
-model.Connect_to=Connect to
-model.Disconnect_from=Disconnect from
-model.Delete_Connection=Delete Connection
-model.time=time
-model.property=property
-model.start_time=start time
-model.command_time=command time
-model.start=start
-model.transient=transient
-model.Transient_Objects=Transient Objects
-model.Data=Data
-model.No_input=No input
-model.Open=Open
-model.Close=Close
-model.Refresh=Refresh
-model.Query=Query
-model.Cancellable=Cancellable
\ No newline at end of file
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 2a221eea4..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java
+++ /dev/null
@@ -1,350 +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;
-
-
-/**
- * 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.
- */
-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/DefaultByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultByteConverter.java
deleted file mode 100644
index c2e41b3fa..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultByteConverter.java
+++ /dev/null
@@ -1,91 +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;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @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;
-	}
-
-}
\ No newline at end of file
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 4fa6beb0e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java
+++ /dev/null
@@ -1,161 +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;
-
-/**
- * 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 Thread
-{
-
-
-	protected int _waitIncrement;
-	protected DataStore _dataStore;
-	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)
-	{
-		_dataStore = 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;
-
-			/* 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()
-	{
-		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();
-	}
-}
\ No newline at end of file
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/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/IDataStoreProvider.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java
deleted file mode 100644
index 5604287af..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java
+++ /dev/null
@@ -1,22 +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 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/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 c20f9717d..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, 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 org.eclipse.dstore.core.util.ExternalLoader;
-
-/**
- * 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 ExternalLoader getExternalLoader();     
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java
deleted file mode 100644
index 47ca0e001..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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 ISchemaProvider
-{
-
-
-    public ISchemaRegistry getSchemaRegistry();
-    public ISchemaExtender getSchemaExtender();    
-}
\ No newline at end of file
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 27188290f..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, 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 org.eclipse.dstore.core.util.ExternalLoader;
-
-/**
- * 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>ExternalLoader</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 ExternalLoader getLoaderFor(String qualifiedClassName);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java
deleted file mode 100644
index 3ec32b76a..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java
+++ /dev/null
@@ -1,91 +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;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.util.ExternalLoader;
-
-/**
- * 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 ExternalLoader getLoaderFor(String source)
-	{
-		for (int i = 0; i < _extenders.size(); i++)
-		{
-			ISchemaExtender extender = (ISchemaExtender) _extenders.get(i);
-			ExternalLoader loader = extender.getExternalLoader();
-			if (loader.canLoad(source))
-			{
-				return loader;
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file
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 72a5cf9c6..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java
+++ /dev/null
@@ -1,260 +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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.util.DataElementRemover;
-
-/**
- * <p>
- * Abtract 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>
- */
-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 synchronized 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();
-					if (child.isSpirit()) DataElementRemover.addToRemovedCount();
-					child.clear();
-					if (parent != null)
-					{
-						parent.removeNestedData(child);
-					}
-				  _dataStore.addToRecycled(child);
-				}
-			}
-
-			deletedList.clear();
-		}
-		
-		
-	}
-
-	/**
-	 * 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);
-				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();
-		
-}
\ No newline at end of file
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 1d2e3d4aa..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
+++ /dev/null
@@ -1,432 +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.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.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.core.util.ExternalLoader;
-import org.eclipse.dstore.core.util.Sender;
-import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
-
-/**
- * ConnectionEstablisher is responsible for managing the server DataStore and 
- * facilitating the communication between client and server DataStores.
- *
- */
-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;
-
-	
-	/**
-	 * 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);
-	}
-
-	
-	/**
-	 * Starts the run loop for the ConnectionEstablisher.
-	 */
-	public void start()
-	{
-		run();
-	}
-
-
-
-	/**
-	 * Returns the DataStore.
-	 *
-	 * @return the DataStore
-	 */
-	public DataStore getDataStore()
-	{
-		return _dataStore;
-	}
-
-	/**
-	 * Tells the connection establisher to clean up and shutdown
-	 */
-	public void finished(ServerReceiver receiver)
-	{
-		_updateHandler.removeSenderWith(receiver.socket());
-		_receivers.remove(receiver);
-		//if (_receivers.size() == 0)
-		{
-			_continue = false;
-			_commandHandler.finish();
-			_updateHandler.finish();
-			_dataStore.finish();
-			System.out.println(ServerReturnCodes.RC_FINISHED);
-			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);
-				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$
-				_continue = false;
-			}
-		}
-	}
-
-	
-	
-	
-	private ServerSocket createSocket(String portStr) 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);		
-						}
-						catch (Exception e)
-						{
-							e.printStackTrace();
-						}
-					}
-					else
-					{
-						serverSocket = new ServerSocket(i);
-					}
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);					
-				}
-				if (serverSocket != null && serverSocket.getLocalPort() > 0)
-				{
-					return serverSocket;
-				}
-			}
-		}
-		else
-		{
-			port = Integer.parseInt(portStr);
-	
-			
-			// create server socket from port
-			if (_dataStore.usingSSL() && sslContext != null)
-			{
-				try
-				{
-					serverSocket = sslContext.getServerSocketFactory().createServerSocket(port);		
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);
-				}
-			}
-			else
-			{
-				try
-				{
-					serverSocket = new ServerSocket(port);
-				}
-				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)
-	{
-		_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);
-
-		_receivers = new ArrayList();
-		_continue = true;
-
-		try
-		{
-			
-			_serverSocket = createSocket(portStr);
-			if (_serverSocket == null)
-			{
-				System.err.println(ServerReturnCodes.RC_BIND_ERROR);
-				_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());
-				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);
-			_continue = false;
-		}
-		catch (BindException e)
-		{
-			System.err.println(ServerReturnCodes.RC_BIND_ERROR);
-			_continue = false;
-		}
-		catch (IOException e)
-		{
-			System.err.println(ServerReturnCodes.RC_GENERAL_IO_ERROR);
-			_continue = false;
-		}
-		catch (SecurityException e)
-		{
-			System.err.println(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);
-
-			writer.println(DataStoreAttributes.DATASTORE_VERSION);
-			writer.flush();
-	   	}
-	   	catch (IOException e)
-	   	{
-	   		System.out.println(e);
-	   	}
-	   	
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java
deleted file mode 100644
index 92650b3bc..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java
+++ /dev/null
@@ -1,419 +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.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.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.ISchemaExtender;
-import org.eclipse.dstore.core.model.ISchemaRegistry;
-import org.eclipse.dstore.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
-			{
-				ExternalLoader 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);
-					}
-				}
-			}
-			catch (NoClassDefFoundError e)
-			{
-				e.printStackTrace();
-				handleNoClassFound(e.getMessage().replace('/','.'));
-			}
-			catch (ClassNotFoundException e)
-			{
-				e.printStackTrace();
-				handleNoClassFound(name);
-			}					
-			catch (InstantiationException e)
-			{
-				e.printStackTrace();
-			}
-			catch (IllegalAccessException e)
-			{
-				e.printStackTrace();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-		else
-		{
-		}
-		return miner;
-	}
-	
-	private void handleNoClassFound(String name)
-	{
-		_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 ExternalLoader getLoaderFor(String source)
-	{
-		ExternalLoader remoteLoader = getExternalRemoteLoader();
-		
-		// for now we always return the RemoteClassLoader
-		
-		//if (remoteLoader.canLoad(source))
-		if(true)
-		{
-			//System.out.println("using RemoteClassLoader");
-			return remoteLoader;
-		}
-		
-		for (int i = 0; i < _loaders.size(); i++)
-		{
-			ExternalLoader loader = (ExternalLoader) _loaders.get(i);
-			if (loader.canLoad(source))
-			{
-			//	System.out.println("using local loader");
-				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();
-		}
-	}
-}
\ No newline at end of file
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 a522f62fa..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java
+++ /dev/null
@@ -1,160 +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.server;
-
-import java.util.StringTokenizer;
-
-/**
- * Server is the standard way of instantiating and controlling a remote DataStore.
- * The server runs a ConnectionEstablisher which manages client connections to
- * the DataStore.
- *
- */
-public class Server
-{
-
-	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);
-				System.exit(-1);
-			}
-		}
-		catch (Exception e)
-		{			
-			// version is bad
-			System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR);
-			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);
-	}
-	
-  
-	/**
-	 * Runs the server by starting the ConnectionEstablisher  
-	 */
-	public void run()
-	{
-		_establisher.start();
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java
deleted file mode 100644
index 301aa9f27..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java
+++ /dev/null
@@ -1,72 +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.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)
-		{
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java
deleted file mode 100644
index bfa5d10cb..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java
+++ /dev/null
@@ -1,495 +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.server;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.miners.miner.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;
-
-/**
- * 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
-{
-
-
-	private ArrayList _loaders;
-	private MinerLoader _minerLoader;
-
-	/**
-	 * 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);
-			}
-			
-			// 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();
-
-			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();
-					_dataStore.getHashMap().remove(host.getId());
-					host.setAttribute(DE.A_ID, "host." + serverTicket.getName()); //$NON-NLS-1$
-
-					_dataStore.getHashMap().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);		
-				miner.initMiner(status);
-				//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() 
-	{
-	}
-	
-
-	
-}
\ No newline at end of file
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 0011900c7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
+++ /dev/null
@@ -1,662 +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.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.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 conntect 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;
-			try
-			{
-				user = _reader.readLine();
-				password = _reader.readLine();
-				_port = _reader.readLine();
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-				_port = "0"; //$NON-NLS-1$
-			}
-
-			
-			
-			if (_serverPortRange != null && (_port == null || _port.equals("0"))) //$NON-NLS-1$
-			{
-				_port = _serverPortRange;
-			}		
-
-			{
-				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
-						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 = 4035;
-
-	/**
-	 * 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) {
-							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$
-					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$
-					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) {
-						e.printStackTrace();
-					}
-				} 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$
-				e.printStackTrace();
-				System.exit(-1);
-			} catch (IOException e) {
-				System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$
-				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 4035).
-	 *            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();
-		}
-	}
-}
\ 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 9cd802c1a..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
+++ /dev/null
@@ -1,91 +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.server;
-
-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.
- */
-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()
-	{
-	    super.finish();
-	    _connection.finished(this);
-	}
-
-	/**
-	 * @see Receiver#finish()
-	 */
-	public void handleError(Throwable e)
-	{
-		System.out.println("RECEIVER ERROR"); //$NON-NLS-1$
-	//	e.printStackTrace();
-		System.out.println(e);
-		_connection.finished(this);
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java
deleted file mode 100644
index 746935836..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java
+++ /dev/null
@@ -1,39 +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.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$
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java
deleted file mode 100644
index 29bf607b1..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java
+++ /dev/null
@@ -1,147 +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.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;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java
deleted file mode 100644
index 9d563ce77..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java
+++ /dev/null
@@ -1,462 +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.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.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())
-		{
-			sendUpdates();
-		}
-	}
-
-	/**
-	 * 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;
-		notifyInput();
-	}
-
-	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;
-		notifyInput();
-	}
-
-	public synchronized void waitForInput()
-	{
-		if (_dataObjects.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null)
-		{
-			super.waitForInput();
-		}
-	}
-}
\ No newline at end of file
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 9d29f3511..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java
+++ /dev/null
@@ -1,310 +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;
-
-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.
- */
-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;
-    }
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java
deleted file mode 100644
index 23d0e6567..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java
+++ /dev/null
@@ -1,195 +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;
-
-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 * 1000;
-	private int _expiryTime = DEFAULT_EXPIRY_TIME * 1000;
-	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 DataElementRemover(DataStore dataStore)
-	{
-		super();
-		_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 (_dataStore.isDoSpirit() && _dataStore == element.getDataStore())
-			{
-				QueueItem item = new QueueItem(element, System.currentTimeMillis());
-				_queue.add(item);
-			}
-		}
-	}
-	
-	public void handle()
-	{
-		clearQueue();
-	}
-	
-	public synchronized void clearQueue()
-	{
-		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$
-			
-			while (_queue.size() > 0 && System.currentTimeMillis() - ((QueueItem) _queue.getFirst()).timeStamp > _expiryTime)
-			{
-				DataElement toBeDisconnected = ((QueueItem) _queue.removeFirst()).dataElement;
-				if (!toBeDisconnected.isSpirit()) 
-				{
-					toBeDisconnected.setSpirit(true);
-					_dataStore.refresh(toBeDisconnected);
-					disconnected++;
-					numDisconnected++;
-				}
-				else
-				{
-					//_dataStore.memLog(toBeDisconnected.toString());
-				}
-				_dataStore.getHashMap().remove(toBeDisconnected.getId());
-			}
-			_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$
-		}
-	}
-	
-	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(_waitIncrement);
-				Thread.yield();
-			}
-			catch (InterruptedException e)
-			{
-				e.printStackTrace();
-				finish();
-				return;
-			}
-			handle();
-		}
-	}
-}
-
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java
deleted file mode 100644
index dbeeaafb1..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java
+++ /dev/null
@@ -1,106 +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;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.RemoteClassLoader;
-
-
-/**
- * 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
-{
-
-	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);
-		}
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java
deleted file mode 100644
index e5c4c4bfb..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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;
-
-import org.eclipse.dstore.core.model.DataElement;
-
-public interface ISender
-{
-
-
-  public void sendDocument(String document);
-  public void sendDocument(DataElement objectRoot, int depth);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java
deleted file mode 100644
index d963f0e35..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java
+++ /dev/null
@@ -1,165 +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;
-
-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;
-		}
-	}
-
-}
\ No newline at end of file
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 0acf47b5a..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java
+++ /dev/null
@@ -1,166 +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;
-
-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;
-
-/**
- * This class is used for receiving data from a socket in the DataStore 
- * communication layer.
- */
-public abstract class Receiver extends Thread
-{
-
-
-	private Socket _socket;
-
-	protected DataStore _dataStore;
-
-	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)
-	{
-		 setName("DStore Receiver"+getName()); //$NON-NLS-1$
-		_socket = socket;
-		_dataStore = dataStore;
-		_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);
-		}
-	}
-
-	/**
-	 * 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()
-	{
-		try
-		{
-			while (!_canExit)
-			{
-				handleInput();
-			}
-		}
-		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);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java
deleted file mode 100644
index 3229c9114..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java
+++ /dev/null
@@ -1,337 +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;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-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
-		{
-			int bufferSize = _socket.getSendBufferSize();
-
-			_socket.setSendBufferSize(bufferSize);
-			_xmlGenerator.setBufferSize(bufferSize);
-		}
-		catch (SocketException e)
-		{
-		}
-		try
-		{
-			_outFile = new PrintStream(_socket.getOutputStream());
-			_outData = new BufferedWriter(new OutputStreamWriter(_socket.getOutputStream(), DE.ENCODING_UTF_8));
-
-			_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) 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)
-			{
-
-				_xmlGenerator.empty();
-				_xmlGenerator.generate(objectRoot, depth);
-				_xmlGenerator.flushData();
-			}
-
-		}
-
-//		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();
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java
deleted file mode 100644
index d8bc24338..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java
+++ /dev/null
@@ -1,71 +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;
-
-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;
-	}
-}
\ No newline at end of file
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/XMLgenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLgenerator.java
deleted file mode 100644
index 6e240c990..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLgenerator.java
+++ /dev/null
@@ -1,676 +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;
-
-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();
-					indent();
-					append(text.toString());
-					nextLine();
-					indent();
-					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;
-				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;
-				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() && !_generateBuffer)
-			{
-			}
-			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);
-		}		
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java
deleted file mode 100644
index 72cfb7d7e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java
+++ /dev/null
@@ -1,1048 +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;
-
-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 int IO_SOCKET_READ_TIMEOUT = 3600000;
-	public static final 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 _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$
-	
-	
-	/**
-	 * Constructor
-	 * @param dataStore the associated DataStore
-	 */
-	public XMLparser(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-		_tagStack = new Stack();
-		_objStack = new Stack();
-		_maxBuffer = 100000;
-		_byteBuffer = new byte[_maxBuffer];
-	}
-
-	/**
-	 * 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;
-		
-//		// hack to deal with platform inconsistencies
-//		// only needed on the server side
-//		if (!_dataStore.isVirtual())
-//		{
-//			try
-//			{
-//				synchronized (reader)
-//				{
-//					int first = reader.read();
-//					
-//					if (first != 10) {
-//						written = 1;
-//						buffer[0] = (byte) first;
-//					}
-//					else {
-//						System.out.println("First byte is 10!");
-//					}
-//				}
-//			}
-//			catch (IOException e)
-//			{
-//				_dataStore.trace(e);
-//			}
-//		}
-
-		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 (_firstTime)
-				{
-					_initialKart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT);
-					_firstTime = false;
-					if (VERBOSE_KEEPALIVE) System.out.println("Starting initial KeepAlive thread."); //$NON-NLS-1$
-					_initialKart.start();
-					continue;
-				}
-				else if (_initialKart != null && !_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 (_isKeepAliveCompatible)
-				{	
-					socket.setSoTimeout(IO_SOCKET_READ_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$
-							continue;
-						}
-						else
-						{
-							_kart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT);
-							if (VERBOSE_KEEPALIVE) System.out.println("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$
-							_kart.start();
-							continue;
-						}
-					}
-				}
-				else
-				{
-					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)
-					{
-						done = true;
-					}
-
-					_byteBuffer[offset] = aByte;
-					offset++;  
-				}
-			}
-		}
-		catch (IOException e)
-		{
-			_dataStore.trace(e);
-			done = true;
-
-			handlePanic(e);
-
-			return null;
-		}
-
-		if (offset > 0)
-		{
-			String result = null;
-			try
-			{
-				result = new String(_byteBuffer, 0, offset, DE.ENCODING_UTF_8);
-			}
-			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;
-		while (!done)
-		{
-			String xmlTag = readLine(reader, socket);
-			
-			if (xmlTag != null)
-			{
-				String trimmedTag = xmlTag.trim();
-				
-				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())
-					{
-						// end of children of parent
-						// find all spirits that match non-spirits
-						List toDelete = new ArrayList();
-						for (int s= 0; s < parent.getNestedSize(); s++)
-						{
-							DataElement element = parent.get(s);
-							if (element.isSpirit())
-							{
-								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(); 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(compare);
-									}
-								}
-							}
-						}
-						
-						// 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;
-		}
-
-		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$
-			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;
-		
-		public KeepAliveRequestThread(long timeout)
-		{
-			_timeout = timeout;
-			_failed = false;
-		}
-		
-		public void run()
-		{
-			_dataStore.sendKeepAliveRequest();
-			try
-			{
-				sleep(_timeout);
-			}
-			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;
-		}
-	}
-
-}
\ No newline at end of file
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 352a6f6c3..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java
+++ /dev/null
@@ -1,128 +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.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;
-
-
-
-public class DStoreKeyStore
-{
-	public static DStoreKeyStore _instance = null;
-
-	public DStoreKeyStore()
-	{
-		_instance = this;
-	}
-
-	public static DStoreKeyStore getInstance()
-	{
-		if (_instance == null)
-		{
-			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/DStoreSSLContext.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreSSLContext.java
deleted file mode 100644
index f4f39ca73..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreSSLContext.java
+++ /dev/null
@@ -1,74 +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.util.ssl;
-
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-
-public class DStoreSSLContext
-{
-
-	public static SSLContext getServerSSLContext(String filePath, String password)
-	{
-		SSLContext serverContext = null;
-
-		try
-		{
-			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$
-			serverContext.init(kmf.getKeyManagers(), null, null);
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-
-		return serverContext;
-	}
-	
-	public static SSLContext getClientSSLContext(String filePath, String password, DataStoreTrustManager trustManager)
-	{
-		SSLContext clientContext = null;
-
-		try
-		{
-			trustManager.setKeystore(filePath, password);			
-			clientContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$
-			TrustManager[] mgrs = new TrustManager[1];
-			mgrs[0] = trustManager;
-			
-			
-			clientContext.init(null, mgrs, null);
-			}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-	
-		return clientContext;		
-	}
-	
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java
deleted file mode 100644
index 7d15105a7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java
+++ /dev/null
@@ -1,150 +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.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 javax.net.ssl.X509TrustManager;
-
-
-public class DataStoreTrustManager implements X509TrustManager
-{
-	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;
-	}
-
-
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/.classpath b/rse/plugins/org.eclipse.dstore.extra/.classpath
deleted file mode 100644
index b7464f3ca..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/.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.dstore.extra/.cvsignore b/rse/plugins/org.eclipse.dstore.extra/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.dstore.extra/.project b/rse/plugins/org.eclipse.dstore.extra/.project
deleted file mode 100644
index ceed1c764..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.dstore.extra</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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.extra/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
deleted file mode 100644
index e38897e5f..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.dstore.extra
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.dstore.extra.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.views
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.dstore.extra,
- org.eclipse.dstore.internal.extra;x-internal:=true
diff --git a/rse/plugins/org.eclipse.dstore.extra/about.html b/rse/plugins/org.eclipse.dstore.extra/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/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 2, 2006</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.extra/build.properties b/rse/plugins/org.eclipse.dstore.extra/build.properties
deleted file mode 100644
index 505946d14..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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 = .,\
-               about.html,\
-               META-INF/,\
-               dstore_extra_server.jar,\
-               plugin.properties
-source.. = src/
-output.. = bin/
-source.dstore_extra_server.jar = server/
-output.dstore_extra_server.jar = server.bin/
diff --git a/rse/plugins/org.eclipse.dstore.extra/plugin.properties b/rse/plugins/org.eclipse.dstore.extra/plugin.properties
deleted file mode 100644
index b0de04f4c..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE DStore Platform Support
-providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java
deleted file mode 100644
index dc40b3b93..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.extra;
-
-import java.util.List;
-
-
-public class DomainEvent 
-{
-
-
-  public static final int UNKNOWN= 0; 
-  public static final int INSERT= 1;
-  public static final int REMOVE= 2;
-  public static final int STRUCTURE_CHANGE= 3;
-  public static final int NON_STRUCTURE_CHANGE= 4;
-  public static final int FILE_CHANGE=5;
-  
-
-  public static final int FIRST_CUSTOM_CHANGE= 10;
-  public static final int LAST_CUSTOM_CHANGE= 255;
-  
-  public static final int MASK= 0xFF;
-  public static final int REVEAL= 0x100;
-  public static final int SELECT= 0x200;
-  
-  public static final int INSERT_REVEAL= INSERT | REVEAL;
-  public static final int INSERT_REVEAL_SELECT= INSERT_REVEAL | SELECT;
-  
-  private IDataElement _parent;
-  private int    _type;
-  
-  public DomainEvent(int type, IDataElement parent, Object property) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-  public DomainEvent(int type, IDataElement parent, Object property, IDataElement child) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-
-  public DomainEvent(IDomainNotifier source, int type, IDataElement parent, Object property) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-
-  public boolean equals(Object event)
-  {
-      return (((DomainEvent)event).getParent() == getParent());    
-  }
-
-    public String getId()
-    {
-	return _parent.getId();
-    }
-  
-  public String getName()
-  {
-    return _parent.getName();
-    
-  }
-  
-  public int getType()
-  {
-    return _type;    
-  }
-  
-  public IDataElement getParent()
-      {
-        return _parent;
-      }
-
-  public List getChildren()
-      {
-        return _parent.getNestedData();
-      } 
-
-  public int getChildrenCount()
-      {
-        return _parent.getNestedSize();
-      }
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
deleted file mode 100644
index b3e419e10..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.extra;
-
-import java.util.List;
-
-import org.eclipse.dstore.internal.extra.IElement;
-
-public interface IDataElement extends IElement
-{
-
-
-    String getName();
-    String getType();
-    String getId();
-    List getNestedData();
-    int getNestedSize();
-
-
-    Object getElementProperty(Object obj);
-    List getAssociated(String key);
-    boolean isOfType(String typeStr);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java
deleted file mode 100644
index ae3639d16..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.extra;
-
-
-public interface IDomainListener
-{
-
-
-    public boolean listeningTo(DomainEvent e);  
-    public void domainChanged(DomainEvent e);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java
deleted file mode 100644
index bfd5428c1..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.extra;
-
-
-public interface IDomainNotifier
-{
-
-
-  public void addDomainListener(IDomainListener listener);
-  public void fireDomainChanged(DomainEvent event);
-  public boolean hasDomainListener(IDomainListener listener);
-  public void removeDomainListener(IDomainListener listener);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
deleted file mode 100644
index fa138564d..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.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.internal.extra;
-
-import org.eclipse.dstore.extra.IDataElement;
-
-
-
-public class DataElementActionFilter 
-{
-
-
-    private static String                  _type = "type";
-    private static DataElementActionFilter _instance;
-    
-    public static DataElementActionFilter getInstance() 
-    {
-	if (_instance == null)
-	    _instance = new DataElementActionFilter();
-	return _instance;
-    }
-    
-    /**
-     * @see IActionFilter#testAttribute(Object, String, String)
-     */
-    public boolean testAttribute(Object target, String name, String value) 
-    {
-	if (name.equals(_type)) 
-	    {
-		IDataElement le = (IDataElement)target;
-		if (le.getType().equals(value) || le.isOfType(value))
-		    {
-			return true;
-		    }
-	    }       
-	
-	return false;
-    }
-
-    public static boolean matches(Class aClass)
-    {
-	return false;
-    }
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java
deleted file mode 100644
index a03533b81..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
-
-public class DesktopElement
-{
-
-  
-    public static boolean matches(Class aClass)
-    {
-	return false;
-    }
-    
-    public static Object getPlatformAdapter(Object obj, Class aClass)
-    {
-	return null;
-    }  
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java
deleted file mode 100644
index 970e82240..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
-
-import org.eclipse.dstore.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainListener;
-import org.eclipse.dstore.extra.IDomainNotifier;
-
-public class DomainNotifier implements IDomainNotifier 
-{
-
-
-    public DomainNotifier()
-      {
-      }
-  
-    public void enable(boolean on)
-    { 
-    }
-
-    public boolean isEnabled()
-    {
-        return false;
-    }
-
-  public void addDomainListener(IDomainListener listener)
-      {
-      }
-
-
-  public void fireDomainChanged(DomainEvent event)
-      {
-      }	
-
-  public boolean hasDomainListener(IDomainListener listener)
-      {
-	  return false;
-      }
-
-  public void removeDomainListener(IDomainListener listener)
-      {
-      }
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java
deleted file mode 100644
index 2644fcea9..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
-
-public interface IDesktopElement
-{
-
-  
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
deleted file mode 100644
index b3c241da7..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
- 
-public interface IElement
-{
-
-
-  public Object getElementProperty(Object key);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java
deleted file mode 100644
index c26d0c0c5..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
-
-public interface IPropertySource 
-{
-
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java
deleted file mode 100644
index 0d57f0ef0..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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.internal.extra;
-
-import org.eclipse.dstore.extra.IDataElement;
- 
-public class PropertySource
-{
-
-
-  public PropertySource(IDataElement element)
-  {
-  }
-  
-  public static boolean matches(Class key)
-  {
-	  return false;
-  }
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore b/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore
deleted file mode 100644
index 2053777fa..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/serverruntime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dstore_extra_server.jar
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/Activator.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/Activator.java
deleted file mode 100644
index 367ae369f..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/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.extra;
-
-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;
-	}
-
-	/**
-	 * @return the shared instance of this plugin.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java
deleted file mode 100644
index 503e82505..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java
+++ /dev/null
@@ -1,102 +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.extra;
-
-import java.util.List;
-
-
-public class DomainEvent 
-{
-
-
-  public static final int UNKNOWN= 0; 
-  public static final int INSERT= 1;
-  public static final int REMOVE= 2;
-  public static final int STRUCTURE_CHANGE= 3;
-  public static final int NON_STRUCTURE_CHANGE= 4;
-  public static final int FILE_CHANGE=5;
-  
-
-  public static final int FIRST_CUSTOM_CHANGE= 10;
-  public static final int LAST_CUSTOM_CHANGE= 255;
-  
-  public static final int MASK= 0xFF;
-  public static final int REVEAL= 0x100;
-  public static final int SELECT= 0x200;
-  
-  public static final int INSERT_REVEAL= INSERT | REVEAL;
-  public static final int INSERT_REVEAL_SELECT= INSERT_REVEAL | SELECT;
-  
-  private IDataElement _parent;
-  private int    _type;
-  
-  public DomainEvent(int type, IDataElement parent, Object property) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-  public DomainEvent(int type, IDataElement parent, Object property, IDataElement child) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-
-  public DomainEvent(IDomainNotifier source, int type, IDataElement parent, Object property) 
-      {
-	_type = type;	
-        _parent = parent;
-      }
-
-
-  public boolean equals(Object event)
-  {
-      return (((DomainEvent)event).getParent() == getParent());    
-  }
-
-    public String getId()
-    {
-	return _parent.getId();
-    }
-  
-  public String getName()
-  {
-    return _parent.getName();
-    
-  }
-  
-  public int getType()
-  {
-    return _type;    
-  }
-  
-  public IDataElement getParent()
-      {
-        return _parent;
-      }
-
-  public List getChildren()
-      {
-        return _parent.getNestedData();
-      } 
-
-  public int getChildrenCount()
-      {
-        return _parent.getNestedSize();
-      }
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
deleted file mode 100644
index 836fbaeeb..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
+++ /dev/null
@@ -1,37 +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.extra;
-
-import java.util.List;
-
-import org.eclipse.dstore.internal.extra.IElement;
-
-public interface IDataElement extends IElement
-{
-
-
-    String getName();
-    String getType();
-    String getId();
-    List getNestedData();
-    int getNestedSize();
-
-    Object getElementProperty(Object obj);
-    List getAssociated(String key);
-
-    boolean isOfType(String typeStr);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java
deleted file mode 100644
index 17f0b2f5c..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java
+++ /dev/null
@@ -1,25 +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.extra;
-
-
-public interface IDomainListener
-{
-
-    public boolean listeningTo(DomainEvent e);  
-    public void domainChanged(DomainEvent e);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java
deleted file mode 100644
index f1e60daee..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java
+++ /dev/null
@@ -1,28 +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.extra;
-
-
-public interface IDomainNotifier
-{
-
-
-  public void addDomainListener(IDomainListener listener);
-  public void fireDomainChanged(DomainEvent event);
-  public boolean hasDomainListener(IDomainListener listener);
-  public void removeDomainListener(IDomainListener listener);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
deleted file mode 100644
index 5314d8e37..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
+++ /dev/null
@@ -1,69 +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.internal.extra;
-
-import org.eclipse.dstore.extra.IDataElement;
-
-public class DataElementActionFilter implements org.eclipse.ui.IActionFilter {
-
-
-	// constants to be used by Eclipse Filtering and Enablement Support.
-	private static String _type = "type"; //$NON-NLS-1$
-	private static String _name = "name"; //$NON-NLS-1$
-	private static DataElementActionFilter _instance;
-
-	public static DataElementActionFilter getInstance() {
-		if (_instance == null)
-			_instance = new DataElementActionFilter();
-		return _instance;
-	}
-
-	/**
-	 * Supports Eclipse filtering and enablement.
-	 * 
-	 * The above contribution uses the RSE pop-up extension point to contribute an action 
-	 * to any single RSE object but not anything beginning with SPECIAL.
-	 * @see IDataElementActionFilter#testAttribute(Object, String, String)
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-		if (name.equals(_type) && target instanceof IDataElement) {
-			// support for "type" filter
-			IDataElement le = (IDataElement) target;
-			if (le.getType().equals(value) || le.isOfType(value))
-				return true;
-		} else if (name.equals(_name) && target instanceof IDataElement) {
-			// support for "name" filter.
-			IDataElement le = (IDataElement) target;
-			if (value.endsWith("*")) {  //$NON-NLS-1$
-				// we have a wild card test, and * is the last character in the value
-				if (le
-					.getName()
-					.startsWith(value.substring(0, value.length() - 1)))
-					return true;
-			} else if (le.getName().equals(value))
-				return true;
-		}
-
-		// type and name filter do not match, or we have a filter we do not support.
-		return false;
-	}
-
-	public static boolean matches(Class aClass) {
-		return (aClass == org.eclipse.ui.IActionFilter.class);
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java
deleted file mode 100644
index 428c1021c..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java
+++ /dev/null
@@ -1,83 +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.internal.extra;
-
-import java.util.List;
-
-import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-public class DesktopElement implements org.eclipse.ui.model.IWorkbenchAdapter
-{
-
-  
-  private IDataElement _element;
-  
-  public DesktopElement (IDataElement e)
-  {
-    _element = e;    
-  }
-
-  public IDataElement toElement(Object object)
-      {
-        IDataElement element = null;
-        if (object instanceof IDataElement)
-        {
-          element = (IDataElement)object;
-        }        
-        else
-        {
-          element = _element;
-        }
-        return element;
-      }
-  
-  public Object[] getChildren(Object o) 
-  {
-    IDataElement element = toElement(o);
-    
-   
-    List objs = element.getAssociated("contents"); //$NON-NLS-1$
-    return objs.toArray();
-  }
-
-  public ImageDescriptor getImageDescriptor(Object object) 
-  {
-      return null;
-  }
-
-  public String getLabel(Object o) 
-  {
-    return (String)_element.getElementProperty("value"); //$NON-NLS-1$
-  }
-
-  public Object getParent(Object o) 
-  {
-      return null;
-  }
-  
-  public static boolean matches(Class aClass)
-  {
-    return (aClass == org.eclipse.ui.model.IWorkbenchAdapter.class);    
-  }
-
-    public static Object getPlatformAdapter(Object obj, Class aClass)
-    {
-	return org.eclipse.core.runtime.Platform.getAdapterManager().getAdapter(obj, aClass);
-    }  
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java
deleted file mode 100644
index 19be85855..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java
+++ /dev/null
@@ -1,122 +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.internal.extra;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainListener;
-import org.eclipse.dstore.extra.IDomainNotifier;
-
-public class DomainNotifier implements IDomainNotifier
-{
-
-
-	private ArrayList _listeners;
-
-	private boolean _enabled;
-	
-/*
-	public class FireMainThread extends Job
-	{
-		public boolean _isWorking;
-
-		private DomainEvent _event;
-		
-		public FireMainThread(DomainEvent event)
-		{
-			super("DStore Events Fired");
-			_isWorking = false;
-			_event = event;
-			setPriority(Job.INTERACTIVE);
-		}
-
-		public IStatus run(IProgressMonitor monitor)
-		{
-			_isWorking = true;
-
-			if (_event.getType() != DomainEvent.FILE_CHANGE)
-			{
-				for (int i = 0; i < _listeners.size(); i++)
-				{
-					IDomainListener listener = (IDomainListener) _listeners.get(i);
-					if ((listener != null) && listener.listeningTo(_event))
-					{
-						listener.domainChanged(_event);
-					}
-				}
-			}
-
-			_isWorking = false;
-			return Status.OK_STATUS;
-		}
-	}
-*/
-	public DomainNotifier()
-	{
-		_listeners = new ArrayList();
-		_enabled = false;
-	}
-
-	
-
-	public void enable(boolean on)
-	{
-		_enabled = on;
-	}
-
-	public boolean isEnabled()
-	{
-		return _enabled;
-	}
-
-	public void addDomainListener(IDomainListener listener)
-	{
-		if (!_listeners.contains(listener))
-		{
-			_listeners.add(listener);
-		}
-	}
-
-	
-	public void fireDomainChanged(DomainEvent event)
-	{
-		if (_enabled)
-		{
-			for (int i = 0; i < _listeners.size(); i++)
-			{
-				IDomainListener listener = (IDomainListener) _listeners.get(i);
-				if ((listener != null) && listener.listeningTo(event))
-				{
-					listener.domainChanged(event);
-				}
-			}
-			//FireMainThread fireJob = new FireMainThread(event);
-			//fireJob.schedule();
-		}
-	}
-
-	public boolean hasDomainListener(IDomainListener listener)
-	{
-		return _listeners.contains(listener);
-	}
-
-	public void removeDomainListener(IDomainListener listener)
-	{
-		_listeners.remove(listener);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java
deleted file mode 100644
index b81fefa01..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java
+++ /dev/null
@@ -1,23 +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.internal.extra;
-
-public interface IDataElementActionFilter extends org.eclipse.ui.IActionFilter 
-{
-
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java
deleted file mode 100644
index 547011af3..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java
+++ /dev/null
@@ -1,24 +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.internal.extra;
-
- 
-public interface IDesktopElement extends org.eclipse.ui.model.IWorkbenchAdapter
-{
-
-  
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
deleted file mode 100644
index 06c458e66..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.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.dstore.internal.extra;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-public interface IElement extends IAdaptable
-{
-
-
-  public Object getElementProperty(Object key);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java
deleted file mode 100644
index 3e6f79042..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java
+++ /dev/null
@@ -1,23 +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.internal.extra;
-
-public interface IPropertySource extends org.eclipse.ui.views.properties.IPropertySource
-{
-
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java
deleted file mode 100644
index 83fe874df..000000000
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java
+++ /dev/null
@@ -1,151 +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.internal.extra;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-public class PropertySource implements IPropertySource
-{
-
-
-  private IDataElement   _dataElement;
-  private HashMap        _properties;
-  private IPropertyDescriptor[] _descriptors;
-  
-  public PropertySource(IDataElement element)
-  {
-    _dataElement = element;
-    
-    _properties = new HashMap();
-    
-    IDataElement descriptor = (IDataElement)element.getElementProperty("descriptor"); //$NON-NLS-1$
-    
-    List attributes = null;
-    int attributesSize = 0;
-    if (descriptor != null)
-	{
-	    attributes = descriptor.getAssociated("attributes"); //$NON-NLS-1$
-	    attributesSize = attributes.size();
-	}
-	
-	_descriptors = new IPropertyDescriptor[attributesSize + 2];
-	_descriptors[0] = new TextPropertyDescriptor("type", "type"); //$NON-NLS-1$ //$NON-NLS-2$
-	_descriptors[1] = new TextPropertyDescriptor("name", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-	if (attributes != null)
-	{
-		for (int i = 0; i < attributesSize; i++)
-	    {
-			IDataElement attribute = (IDataElement)attributes.get(i);
-			List types = attribute.getAssociated("attributes"); //$NON-NLS-1$
-			    
-			String type = null;
-			if (types.size() > 0)
-			  type = ((IDataElement)types.get(0)).getName();
-			else
-			  type = "String"; //$NON-NLS-1$
-			
-			_properties.put(attribute.getName(), type);
-			_descriptors[i+2] = new TextPropertyDescriptor(attribute.getName(), attribute.getName());
-	    }
-	}
-    
-  }
-
-  public static boolean matches(Class aClass)
-  {
-    return (aClass == org.eclipse.ui.views.properties.IPropertySource.class);    
-  }
-  
-
-  public Object getEditableValue()
-  {
-    return this;
-  }
-
-  public IPropertyDescriptor[] getPropertyDescriptors()
-  {
-    return _descriptors;
-  }
-
-  public Object getPropertyValue(Object name)
-    {
-	return getPropertyValue((String)name);
-    }
-
-  public Object getPropertyValue(String name)
-  {
-      Object result = null;
-            
-      // find the appropriate attribute
-      List attributes = _dataElement.getAssociated("attributes"); //$NON-NLS-1$
-      for (int i = 0; i < attributes.size(); i++)
-	  {
-	      IDataElement attribute = (IDataElement)attributes.get(i);
-	      if (attribute.getType().equals(name))
-		  {
-		      result = attribute.getElementProperty("value"); //$NON-NLS-1$
-		  }
-	  }
-	  
-	  if (result == null)
-	  {
-	  	String type = (String)_properties.get(name);
-	  	
-	  	if (type != null && type.equals("Integer")) //$NON-NLS-1$
-	  	  result = "0"; //$NON-NLS-1$
-	  	else if (type != null && type.equals("Float")) //$NON-NLS-1$
-	  	  result = "0.0"; //$NON-NLS-1$
-	  	else
-	  	  result = _dataElement.getElementProperty(name);
-	  }
-	  
-      return result;
-  }
-
-  public boolean isPropertySet(Object property)
-  {
-      return isPropertySet((String)property);
-  }
-
-  public boolean isPropertySet(String property)
-  {
-    return false;
-  }
-
-  public void resetPropertyValue(Object property)
-    {
-    }
-
-  public void resetPropertyValue(String property)
-  {
-  }
-
-  public void setPropertyValue(Object name, Object value)
-    {
-	setPropertyValue((String)name, value);
-    }
-
-  public void setPropertyValue(String name, Object value)
-  {
-  }
-
-}
\ No newline at end of file
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 96589beab..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project
+++ /dev/null
@@ -1,28 +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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
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 d141d3395..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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 5a1bfb6cb..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.connectorservice.dstore.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.services.dstore,
- org.eclipse.dstore.core,
- org.eclipse.dstore.extra,
- org.eclipse.rse.ui,
- org.eclipse.rse.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.connectorservice.dstore,
- org.eclipse.rse.connectorservice.dstore.util
-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 460233046..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 2, 2006</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 a3d40201a..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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 = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-source.. = src/
-output.. = bin/
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 c5486c631..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE DStore Connector Service
-providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java
deleted file mode 100644
index efd7676d3..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java
+++ /dev/null
@@ -1,76 +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;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.ui.ISystemPreferencesConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-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;
-	
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception 
-	{
-		super.start(context);
-        IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-    	store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IUniversalDStoreConstants.DEFAULT_PREF_SOCKET_TIMEOUT);
-		store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
-		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
-		
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.java
deleted file mode 100644
index 99c4c4d96..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.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.rse.connectorservice.dstore;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ConnectorServiceResources extends NLS
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.connectorservice.dstore.ConnectorServiceResources";//$NON-NLS-1$
-
-	public static String DStore_ConnectorService_Label;
-	public static String DStore_ConnectorService_Description;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, ConnectorServiceResources.class);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.properties
deleted file mode 100644
index 3985a0b35..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.properties
+++ /dev/null
@@ -1,21 +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.
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# 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.
\ No newline at end of file
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 6e9019c4b..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
+++ /dev/null
@@ -1,1347 +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;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import java.util.Vector;
-
-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.dstore.core.client.ClientConnection;
-import org.eclipse.dstore.core.client.ClientSSLProperties;
-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.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-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.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.SystemBasePlugin;
-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.AbstractConnectorService;
-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.environment.EnvironmentMiner;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.ISystemPreferencesConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemPropertyResources;
-import org.eclipse.rse.ui.actions.DisplayHidableSystemMessageAction;
-import org.eclipse.rse.ui.actions.DisplaySystemMessageAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-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 AbstractConnectorService implements IDataStoreProvider
-{
-	
-	private ClientConnection clientConnection = null;
-	private ConnectionStatusListener _connectionStatusListener = null;
-
-	// 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 Hashtable restrictedTypes = null;
-	private IServerLauncher starter;	
-
-	
-	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);
-	}
-	
-	
-	
-	/*
-	 * Set the subsystem, when its not known at constructor time
-	 *
-	public void setSubSystem(SubSystem ss)
-	{
-		super.setSubSystem(ss);
-		setDaemonLaunchEnabled((SubSystemImpl)ss, false);		    	
-	}*/
-	
-	
-	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
-			{
-				getPrimarySubSystem().connect();
-			}
-			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(EnvironmentMiner.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
-		{
-			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)
-	 */
-	public 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
-				clearPasswordCache(false); // 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();
-	}
-	
-//	/**
-//	 * Specify if you support connecting to a running daemon  
-//	 * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)}
-//	 *  or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} 
-//	 */	
-//	public void setDaemonLaunchEnabled(SubSystem subsystemImpl, boolean enable) {
-//		enableServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL, enable);
-//	}
-
-//	/**
-//	 * Return if you support connecting to a running daemon  
-//	 * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} 
-//	 *  or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}
-//	 */		
-//	public boolean getDaemonLaunchEnabled(SubSystem subsystemImpl) {
-//		return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL); 
-//	}
-
-//	/**
-//	 * Specify if you support remotely launching a server script 
-//	 * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} 
-//	 *  or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} 
-//	 */		
-//	public void setRexecLaunchEnabled(SubSystem subsystemImpl, boolean enable) {
-//		enableServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL, enable);
-//	}
-
-	/**
-	 * Return if you support remotely launching a server script 
-	 * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} 
-	 *  or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}
-	 */			
-	public boolean getRexecLaunchEnabled(SubSystem subsystemImpl) {
-		return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL);
-	}
-
-//	/**
-//	 * Specify if you support connecting to a server already running 
-//	 * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} 
-//	 *  or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} 
-//	 */			
-//	public void setNoLaunchEnabled(SubSystem subsystemImpl, boolean enable) {
-//		enableServerLaunchType(subsystemImpl, ServerLaunchType.RUNNING_LITERAL, enable);
-//	}
-
-	/**
-	 * Return if you support connecting to a server already running 
-	 * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} 
-	 *  or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} 
-	 */			
-	public boolean getNoLaunchEnabled(SubSystem subsystemImpl) {
-		return isEnabledServerLaunchType(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;
-	}
-	
-
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#connect(IProgressMonitor)
-	 */
-	protected synchronized void internalConnect(IProgressMonitor monitor) throws Exception
-	{
-	    if (isConnected()) {
-	        return;
-	    }
-	    
-		// 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()));
-
-//		ISubSystem ss = getPrimarySubSystem();
-		getPrimarySubSystem();
-		IRemoteServerLauncher serverLauncher = getDStoreServerLauncher(); 
-		
-		ServerLaunchType serverLauncherType = null;
-		boolean autoDetectSSL = true;
-		if (serverLauncher != null)
-		{
-		    serverLauncherType = serverLauncher.getServerLaunchType();
-		    autoDetectSSL = serverLauncher.getAutoDetectSSL();
-		}
-		else
-		{
-		  //  System.out.println("server launcher is null");
-		}
-
-		//long t1 = System.currentTimeMillis();
-		SystemMessage msg = null;	
-		boolean launchFailed = false;
-
-		// get Socket Timeout Value Preference
-		int timeout = getSocketTimeOutValue();
-		
-		if (serverLauncherType == ServerLaunchType.REXEC_LITERAL)
-		{	
-			if (monitor != null)
-			{
-				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_REXEC);
-				monitor.subTask(cmsg.getLevelOneText());	
-			}
-			
-			SystemSignonInformation info = getPasswordInformation();
-			
-			// 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);
-			if (autoDetectSSL) timeout = 3000;
-			else setSSLProperties(isUsingSSL());
-
-			int iServerPort = launchUsingRexec(monitor, info, serverLauncher);
-			
-			if(iServerPort != 0)
-			{				
-				clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
-				
-				if (monitor != null)
-				{
-					SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
-					cmsg.makeSubstitution(clientConnection.getPort());
-					monitor.subTask(cmsg.getLevelOneText());
-				}
-				
-				// connect to launched server
-				connectStatus = clientConnection.connect(null, timeout);
-				if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) && autoDetectSSL)
-				{
-					if (setSSLProperties(true))
-					{
-						iServerPort = launchUsingRexec(monitor, info, serverLauncher);
-						if (iServerPort != 0)
-						{
-							clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
-							connectStatus = clientConnection.connect(null, timeout);
-						}
-					}
-				}
-			}
-			else
-			{
-				launchFailed = true;
-				connectStatus = new ConnectionStatus(false);
-				msg = starter.getErrorMessage();
-				String errorMsg = null;
-				if (msg == null)
-				{
-					errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText();
-				}
-				else
-				{
-					errorMsg = msg.getLevelTwoText();
-				}
-				connectStatus.setMessage(errorMsg);
-			}
-		}
-		// Start the server via the daemon
-		else if (serverLauncherType == ServerLaunchType.DAEMON_LITERAL)
-		{
-			if (monitor != null)
-			{
-				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_DAEMON);
-				monitor.subTask(cmsg.getLevelOneText());		
-			}
-
-			// 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()));
-			SystemSignonInformation info = getPasswordInformation();
-			int daemonPort = 0;
-			if (serverLauncher != null)
-				daemonPort = serverLauncher.getDaemonPort();
-			
-			/* String daemonPortStr = getSubSystem().getVendorAttribute("Remote", "DAEMON_PORT");
-			if (daemonPortStr != null && daemonPortStr.length() > 0)
-			{
-				daemonPort = Integer.parseInt(daemonPortStr);
-			}*/
-			
-			// DKM - changed to use protected member so that others can override
-			//launchStatus = clientConnection.launchServer(info.getUserid(), info.getPassword(), daemonPort);
-			boolean usedSSL = false;
-			launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
-			if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage()))
-			{
-				if (setSSLProperties(true))
-				{
-					usedSSL = true;
-					launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
-				}
-			}
-			
-			if (!launchStatus.isConnected())
-			{
-				String launchMsg = launchStatus.getMessage();
-				// If password has expired and must be changed
-				if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-				{
-					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(info.getUserid(), newPasswordInfo.newPassword, newPasswordInfo.savePassword);
-						info = getPasswordInformation();
-					}
-					if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
-					{
-						internalConnect(monitor);
-						return;
-					}
-				}
-				else if (launchMsg != null && isPortOutOfRange(launchMsg))
-				{
-					launchFailed = true;
-					
-					SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_PORT_OUT_RANGE);
-					int colonIndex = launchMsg.indexOf(':');
-					String portRange = launchMsg.substring(colonIndex + 1);
-					cmsg.makeSubstitution(portRange);
-					
-					ShowConnectMessage msgAction = new ShowConnectMessage(cmsg);
-					Display.getDefault().asyncExec(msgAction);
-					return;
-				}
-				else
-				{
-					launchFailed = true;
-					SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null); //$NON-NLS-1$
-				}
-			}
-			if (launchStatus.isConnected())
-			{
-				if (monitor != null)
-				{
-					SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
-					cmsg.makeSubstitution(clientConnection.getPort());
-					monitor.subTask(cmsg.getLevelOneText());
-				}
-				// 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 
-						 )		
-						)
-				{
-					if (conE instanceof SSLHandshakeException)
-					{
-						List certs = connectStatus.getUntrustedCertificates();
-						if (certs != null && certs.size() > 0)
-						{	
-							ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-							if (provider != null)
-							{
-								if (provider.importCertificates(certs, getHostName()))
-								{
-									connect(monitor);
-									return;
-								}
-								else
-								{
-									throw new InterruptedException();
-								}
-							}
-						}
-						
-					}
-					launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
-					if (!launchStatus.isConnected())
-					{
-						launchFailed = true;
-					}
-					else
-					{
-						if (setSSLProperties(!usedSSL))
-						{
-							connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
-						}
-					}
-				}
-				if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
-				{					
-					importCertsAndReconnect(connectStatus, monitor);
-					return;
-				}
-
-				/*
-				if (connectStatus != null && connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_UPDATE))
-				{
-					// offer to update it
-					clientConnection.getDataStore().queryInstall();
-				}
-				*/
-			}
-			else
-			{
-				connectStatus = new ConnectionStatus(false);
-				connectStatus.setMessage(
-					RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText());
-			}
-		}
-		else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL)
-		{
-			if (monitor != null)
-			{
-				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
-				cmsg.makeSubstitution(clientConnection.getPort());
-				monitor.subTask(cmsg.getLevelOneText());
-			}
-			// connection directly
-			boolean useSSL = isUsingSSL();
-			setSSLProperties(useSSL);
-			connectStatus = clientConnection.connect(null, timeout);
-		}
-		// server launcher type is unknown
-		else
-		{
-			SystemSignonInformation info = getPasswordInformation();
-			connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
-			if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage()))
-			{
-				if (setSSLProperties(true))
-				{
-					connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
-					if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
-					{
-						importCertsAndReconnect(connectStatus, monitor);
-						return;
-					}
-				}
-			}
-
-		}
-
-		// if connected
-		if (connectStatus != null && connectStatus.isConnected())
-		{
-			IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-			if (clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_SSL))
-			{
-				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_USING_SSL);
-				msg.makeSubstitution(getHostName());
-				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_SSL);
-				Display.getDefault().syncExec(msgAction);
-				if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
-				{
-					internalDisconnect(monitor);
-					throw new InterruptedException();
-				}
-			}
-			else if (!clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL))
-			{
-				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_NOT_USING_SSL);
-				msg.makeSubstitution(getHostName());
-				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL);
-				Display.getDefault().syncExec(msgAction);
-				if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
-				{
-					internalDisconnect(monitor);
-					throw new InterruptedException();
-				}
-			}
-	
-			DataStore dataStore = clientConnection.getDataStore();
-
-			_connectionStatusListener = new ConnectionStatusListener(dataStore.getStatus(), this);
-			dataStore.getDomainNotifier().addDomainListener(_connectionStatusListener);
-			
-		
-			
-			// DKM: dataStore needs a miners location
-			//		for now, I'll use dstore.miners as default location
-			//		(I've inserted the universal miner in it's minerFile.dat file)		
-
-			// DY:  defect 46811 The minerFile.dat does not exist in this directory which causes a
-			// java.io.FileNotFoundException to be printed to the console (not very 
-			// encouraging for the end user.)  So I'm setting it to the current directory (.)
-			// which should be where the code is run from
-			//dataStore.addMinersLocation("org.eclipse.dstore.miners");
-			
-			
-			StatusMonitor statusMonitor = StatusMonitorFactory.getInstance().getStatusMonitorFor(this, dataStore);
-			
-			if (launchStatus != null && launchStatus.isConnected())
-			{
-				//dataStore.showTicket(launchStatus.getTicket()); // send security token to server, this must be done first
-				DataElement ticket = dataStore.createTicket(launchStatus.getTicket());
-				dataStore.queryShowTicket(ticket);
-				//statusMonitor.waitForUpdate(ticketStatus);					
-			}
-			else
-			{
-				dataStore.showTicket(null);
-			}
-			
-	        if (dataStore.isDoSpirit()) dataStore.queryServerSpiritState();
-
-			// 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))
-				{
-					
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CLIENT_OLDER_WARNING);
-					msg.makeSubstitution(getHostName());
-				}
-				else if (message.startsWith(ClientConnection.SERVER_OLDER))
-				{
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_OLDER_WARNING);
-					msg.makeSubstitution(getHostName());
-				}
-				ShowConnectMessage msgAction = new ShowConnectMessage(msg);
-				Display.getDefault().asyncExec(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
-				store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, IUniversalDStoreConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES);
-				boolean cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
-				
-				dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, cacheRemoteClasses ? "true" : "false"); //$NON-NLS-1$  //$NON-NLS-2$
-			}
-			else
-			{						
-				dataStore.addMinersLocation("."); //$NON-NLS-1$
-				// older servers initialized in one shot
-				DataElement schemaStatus = dataStore.getSchema();
-		 
-		         // Initialzie the miners
-		         if (monitor != null)
-		         {
-		            SystemMessage imsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_INITIALIZING_SERVER);
-		            monitor.subTask(imsg.getLevelOneText());
-		         }
-		         DataElement initStatus = dataStore.initMiners();	         
-		         statusMonitor.waitForUpdate(schemaStatus);
-		         statusMonitor.waitForUpdate(initStatus);
-			}
-			//long t2 = System.currentTimeMillis();
-			//System.out.println("connect time = "+(t2 - t1));
-		}
-		else
-		{
-			// if daemon launch failed because of an SSL problem
-		    if (launchFailed && launchStatus != null && 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()))
-							{
-								internalConnect(monitor);
-								return;
-							}
-						}				
-					}
-					else
-					{
-					
-						msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_SSL_EXCEPTION);
-						msg.makeSubstitution(launchStatus.getMessage());
-					}
-				} 	
-		    }
-		    
-		    // 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();
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED_EXCEPTION);
-					msg.makeSubstitution(getHostName(), ""+serverLauncher.getDaemonPort(), exception); //$NON-NLS-1$
-				}
-				else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1)
-				{
-					if (launchFailed)
-				    {
-				        clearPasswordCache(true);
-				    }
-				
-					// Display error message
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_AUTH_FAILED);
-					msg.makeSubstitution(getHostName());
-					DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg);
-					Display.getDefault().syncExec(msgAction);
-
-					// Re-prompt for password
-					connectException = null;
-					Display.getDefault().syncExec(new Runnable()
-					{
-						public void run()
-						{
-							try
-							{
-								promptForPassword(true);
-							}
-							catch (InterruptedException e)
-							{
-								connectException = e;
-							}
-						}
-					});
-
-					// Check if the user cancelled the prompt
-					if (connectException instanceof InterruptedException)
-					{
-						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)))
-				{
-					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)
-				{					
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED);
-					msg.makeSubstitution(getHostName(), clientConnection.getPort(), launchMsg);
-				}
-			}
-			
-			// if connection failed for known reason
-			else if (connectStatus != null && !connectStatus.isConnected())
-			{
-				if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_SERVER_UPDATE))
-				{
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_UPDATE);
-					msg.makeSubstitution(getHostName());
-				}
-				else if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_PROTOCOL))
-				{
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_PROTOCOL);
-					msg.makeSubstitution(getHostName());
-				}
-				else
-				{
-					Throwable exception = connectStatus.getException();
-					if (exception != null)
-					{
-						msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
-						msg.makeSubstitution(getHostName(), exception);
-					}
-				}
-			}
-			
-			// if connect failed for unknown reason
-			else if (connectStatus == null)
-			{
-				SystemBasePlugin.logError("Failed to connect to remote system", null); //$NON-NLS-1$
-				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
-				msg.makeSubstitution(getHostName());
-			}
-
-			// 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$
-				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
-				msg.makeSubstitution(getHostName());
-			}
-
-			clientConnection.disconnect();
-			clientConnection = null;
-			
-			// yantzi: artemis 6.0, check for invalid login (user ID / pwd) and reprompt for signon information
-			if (msg != null && msg.getFullMessageID().startsWith(ISystemMessages.MSG_COMM_INVALID_LOGIN))
-			{
-				if (launchFailed)
-			    {
-			        clearPasswordCache(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
-						{
-							promptForPassword(true);
-						}
-						catch (InterruptedException e)
-						{
-							connectException = e;
-						}
-					}
-				});
-
-				// Check if the user cancelled the prompt
-				if (connectException instanceof InterruptedException)
-				{
-					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; 
-			}
-
-			throw new SystemMessageException(msg);
-		}
-	}
-	
-	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(IProgressMonitor monitor, SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties) throws Exception
-	{
-		IServerLauncher starter = getRemoteServerLauncher();
-		starter.setSignonInformation(info);
-		starter.setServerLauncherProperties(serverLauncherProperties);
-
-		String serverPort = (String)starter.launch(monitor);	
-		if (monitor.isCanceled())
-		{
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.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;
-	}
-
-	/**
-	 * Show any warning messages returned by host api calls.
-	 * @param shell Parent UI
-	 * @param warnings Vector of String or toString()'able messages.
-	 */
-	public void showWarningMsgs(Shell shell, Vector warnings)
-	{
-		for (int idx = 0; idx < warnings.size(); idx++)
-		{
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W);
-			msg.makeSubstitution((warnings.elementAt(idx)).toString());
-			SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
-			msgDlg.open();
-		}
-	}
-
-	/**
-	 * @return The DataStore currently being used by this connection.
-	 */
-	public DataStore getDataStore()
-	{
-		if (clientConnection != null)
-		{
-			return clientConnection.getDataStore();
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#getPasswordInformation()
-	*/
-//	public SystemSignonInformation getPasswordInformation()
-//	{
-//		// For Windows we want to avoid the signon prompt (because we never
-//		// really authenticate with the remote system and this would be deceiving 
-//		// for the end user
-//
-//		if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS))
-//		{
-//			String userid = getPrimarySubSystem().getUserId();
-//			if (userid == null)
-//			{
-//				userid = "remoteuser"; //$NON-NLS-1$
-//			}
-//			SystemSignonInformation info = new SystemSignonInformation(getPrimarySubSystem().getHost().getHostName(),
-//																	   userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS); //$NON-NLS-1$
-//			return info;
-//		}
-//		else
-//		{
-//			return super.getPasswordInformation();
-//		}
-//	}
-
-	/**
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#isPasswordCached()
-	 */
-//	public boolean isPasswordCached()
-//	{
-//		// For Windows we never prompt for userid / password so we don't need 
-//		// to clear the password cache
-//		if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS))
-//		{
-//			return false;
-//		}
-//		else
-//		{
-//			return super.isPasswordCached();
-//		}
-//	}
-
-	public boolean hasRemoteServerLauncherProperties() 
-	{
-		return getRemoteServerLauncherProperties() != 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();
-		String systemType = host.getSystemType();
-		if (systemType.equals(IRSESystemType.SYSTEMTYPE_WINDOWS)) {
-			result = false;
-		}
-		return result;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserid()
-	 */
-	public boolean supportsUserId() {
-		boolean result = super.supportsUserId();
-		IHost host = getHost();
-		String systemType = host.getSystemType();
-		if (systemType.equals(IRSESystemType.SYSTEMTYPE_WINDOWS)) {
-			result = false;
-		}
-		return result;
-	}
-	
-	
-}
\ No newline at end of file
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 ddb043edf..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java
+++ /dev/null
@@ -1,113 +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;
-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;
-
-
-
-/**
- * IConnectorService manager class.
- * There should be only one of these instantiated.
- * Use getTheUniversalSystemManager 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 cmd 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 getTheUniversalSystemManager instead.
-     */
-    private DStoreConnectorServiceManager()
-    {
-    }
-    
-    /**
-     * Return singleton instance of this class
-     */
-    public static DStoreConnectorServiceManager getTheUniversalSystemManager()
-    {
-    	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 3fdd57004..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
+++ /dev/null
@@ -1,70 +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;
-/**
- * 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$
-
-	//public static final String ICON_SYSTEM_LIBRARY_ROOT = "system400Library";		
-	//public static final String ICON_SYSTEM_LIBRARY      = ICON_SYSTEM_LIBRARY_ROOT + ICON_EXT;
-	//public static final String ICON_SYSTEM_LIBRARY_ID   = PREFIX + ICON_SYSTEM_LIBRARY_ROOT + ICON_SUFFIX;
-	
-    // -------------------------
-	// 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$
-    public static final boolean DEFAULT_PREF_CACHE_REMOTE_CLASSES = true;
-    
-        // Socket timeout preference
-    public static final String RESID_PREF_SOCKET_TIMEOUT = RESID_PREF_PREFIX + "sockettimeout"; //$NON-NLS-1$
-    public static final int DEFAULT_PREF_SOCKET_TIMEOUT = 300000;
-
-    public static final String RESID_PREF_DO_KEEPALIVE = RESID_PREF_PREFIX + "dokeepalive"; //$NON-NLS-1$
-    public static final boolean DEFAULT_PREF_DO_KEEPALIVE = true;
-}
\ No newline at end of file
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/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java
deleted file mode 100644
index 73faa55c4..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java
+++ /dev/null
@@ -1,1201 +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;
-
-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.dstore.core.client.ClientConnection;
-import org.eclipse.dstore.core.client.ConnectionStatus;
-import org.eclipse.rse.core.SystemBasePlugin;
-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.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-
-/**
- * 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 = IUniversalDStoreConstants.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().equals("Windows") ? '\\' : '/';			 //$NON-NLS-1$
-		if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar)
-			cwd += separatorChar;
-	    // set script...
-	    this.invocation = ((IRemoteServerLauncher)propertyInfo).getServerScript();  
-	}
-	
-	/**
-	 * 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 = 600;  //  60 second to connect
-			
-			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) {
-				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
-				msg.makeSubstitution(signonInfo.getHostname(), ""); //$NON-NLS-1$
-				_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 ){
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
-			msg.makeSubstitution(signonInfo.getHostname(), hostMessage);
-			_errorMessage = msg;
-		} else {
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
-			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), hostMessage); //$NON-NLS-1$
-			_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. 
-	 * @see #getErrorMessage()
-	 * @param monitor a monitor for showing progress
-	 * @param connectPort the port to use for launching the server
-	 * @return Anything you want.
-	 */
-	public Object connect(IProgressMonitor monitor, int connectPort) throws Exception
-	{
-		clientConnection.setPort(Integer.toString(connectPort));
-				
-		if (monitor != null)
-		{
-			SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
-			cmsg.makeSubstitution(clientConnection.getPort());
-			monitor.subTask(cmsg.getLevelOneText());
-		}
-				
-		// 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;
-	}
-}
\ 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 ac4ffd124..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
+++ /dev/null
@@ -1,272 +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 java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-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.rse.core.SystemBasePlugin;
-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.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-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;
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
-			msg.makeSubstitution(_connection.getPrimarySubSystem().getHost().getAliasName());
-			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 = RSEUIPlugin.getDefault().getSystemRegistry();    	    
-	            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();
-		}
-	}
-
-	/**
-	 * @see IDomainListener#getShell()
-	 */
-	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)
-    {
-         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR,shell,RSEUIPlugin.getResourceBundle(),
-         //                             ISystemMessages.MSG_DISCONNECT_FAILED,
-         //                             hostName, exc.getMessage()); 	
-         //RSEUIPlugin.logError("Disconnect failed",exc); // temporary
-    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_FAILED).makeSubstitution(hostName,exc));
-    	 msgDlg.setException(exc);
-    	 msgDlg.open();
-    }	
-    /**
-     * 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)
-    {
-         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(),
-         //                             ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName);
-    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_CANCELLED).makeSubstitution(hostName));
-    	 msgDlg.open();
-    }
-}
\ No newline at end of file
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 48bd559f8..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java
+++ /dev/null
@@ -1,456 +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 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.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainListener;
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
-import org.eclipse.rse.core.subsystems.ICommunicationsListener;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-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 IDomainListener#getShell()
-	 */
-	public Shell getShell() 
-	{
-		// dy:  DomainNotifier (which calls this method) requires the shell not be disposed
-		//if (shell == null) {
-		if (_shell == null || _shell.isDisposed())
-		{
-			FindShell findShell = new FindShell();
-			Display.getDefault().syncExec(findShell);
-			_shell = findShell.shell;
-		}
-		return _shell;
-	}
-
-	/**
-	 * @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 = 600; //default. sleep(100ms) for 600 times  		
-      if ( wait > 0 )
-        WaitThreshold = wait*10; // 1 second means 10 sleep(100ms)
-      else if ( wait == -1 ) // force a diagnostic
-	  		 WaitThreshold = -1;
-         
-      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
-				{
-				    Thread.sleep(100);
-
-				    if (WaitThreshold > 0) // update timer count if
-                        // threshold not reached
-                        --WaitThreshold; // decrement the timer count
-                   
-				  if (WaitThreshold == 0)
-				    {
-				        // no diagnostic factory but there is a timeout
-				        return status;  // returning the undone status object
-				    }
-                    else if (_networkDown)
-                    {
-                        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 
-				{
-                    Thread.sleep(100);
-                    
-                    if (WaitThreshold > 0) // update timer count if
-                        // threshold not reached
-                        --WaitThreshold; // decrement the timer count
-
-                   if (WaitThreshold == 0)
-				    {
-				        // no diagnostic factory but there is a timeout
-				        return status;  // returning the undone status object
-				    }
-                    else if (_networkDown)
-                    {
-    					dispose();
-    					throw new InterruptedException();
-                    }
-                }
-			}		
-		}
-
-	
-		return status;
-	}
-
-
-    /**
-     * Start diagnostic 
-     *
-     * @param diagnostic 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	
-    }
-
-
-}
\ No newline at end of file
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.local/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.local/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/.cvsignore b/rse/plugins/org.eclipse.rse.connectorservice.local/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/.project b/rse/plugins/org.eclipse.rse.connectorservice.local/.project
deleted file mode 100644
index 323499d47..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.connectorservice.local</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.connectorservice.local/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
deleted file mode 100644
index ed84800c6..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.connectorservice.local
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.internal.connectorservice.local.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.internal.connectorservice.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/about.html b/rse/plugins/org.eclipse.rse.connectorservice.local/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/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 2, 2006</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.local/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties
deleted file mode 100644
index ca59f60e9..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties
+++ /dev/null
@@ -1,16 +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 = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-source.. = src/
-output.. = bin/
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties
deleted file mode 100644
index 19c7ee707..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE Local Connector Service
-providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java
deleted file mode 100644
index 11bcc2b66..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java
+++ /dev/null
@@ -1,70 +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.internal.connectorservice.local;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class Activator extends AbstractUIPlugin {
-
-	//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;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.connectorservice.local", path); //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.java
deleted file mode 100644
index fa0fda1be..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.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.rse.internal.connectorservice.local;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ConnectorServiceResources extends NLS
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.local.ConnectorServiceResources";//$NON-NLS-1$
-
-	public static String Local_ConnectorService_Label;
-	public static String Local_ConnectorService_Description;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, ConnectorServiceResources.class);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.properties
deleted file mode 100644
index 34b8564c6..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.properties
+++ /dev/null
@@ -1,21 +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.
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-Local_ConnectorService_Label=Local Connector Service
-Local_ConnectorService_Description=The Local Connector Service uses the Java API to connect to the local host.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java
deleted file mode 100644
index 83b97fbaf..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java
+++ /dev/null
@@ -1,25 +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.internal.connectorservice.local;
-
-/**
- * This is the interface all our subsystems in a local connection implement.
- */
-public interface ILocalSubSystem 
-{
-	String copyright = "(c) Copyright IBM Corporation 2001, 2003. "; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java
deleted file mode 100644
index 75b69955f..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java
+++ /dev/null
@@ -1,131 +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.internal.connectorservice.local;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
- 
-/**
- * System class required by the remote systems framework.
- * This represents the live connection at tool runtime.
- * Since we don't really have such a thing for local files, this
- * is pretty well empty.
- */
-public class LocalConnectorService extends AbstractConnectorService
-{
-		
-	/**
-	 * Constructor when we don't have a subsystem yet.
-	 * Call setSubSystem after. 
-	 */
-	public LocalConnectorService(IHost host)
-	{
-		super(ConnectorServiceResources.Local_ConnectorService_Label, ConnectorServiceResources.Local_ConnectorService_Description, host, 0);
-	}
-	
-	
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#disconnect(IProgressMonitor)
-	 */
-	public void internalDisconnect(IProgressMonitor monitor) throws Exception
-	{
-		fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT);
-
-		 // Fire comm event to signal state changed
- 		notifyDisconnection();
-	}
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#connect(IProgressMonitor)
-	 */
-	protected void internalConnect(IProgressMonitor monitor) throws Exception
-	{
-	}
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected()
-	 */
-	public boolean isConnected()
-	{
-		return true;
-	}
-	
-    /**
-     * Return the version, release, modification of the operating system.
-     * <p>
-     * Returns System.getProperty("os.version")
-     */
-    public String getVersionReleaseModification()
-    {
-    	return System.getProperty("os.version"); //$NON-NLS-1$
-    }	
-    /**
-     * Return the home directory of the operating system for the current user, if available.
-     * <p>
-     * Returns System.getProperty("user.home")
-     */
-    public String getHomeDirectory()
-    {
-    	return System.getProperty("user.home"); //$NON-NLS-1$
-    }        
-    /**
-     * Return the temp directory of the operating system for the current user, if available.
-     * <p>
-     * Returns System.getProperty("java.io.tmpdir")
-     */
-    public String getTempDirectory()
-    {
-    	return System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
-    }
-
-
-
-
-	public boolean hasRemoteServerLauncherProperties() 
-	{
-		return false;
-	}
-
-	public boolean supportsRemoteServerLaunching() 
-	{
-		return false;
-	}
-
-	public boolean supportsServerLaunchProperties()
-	{
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword()
-	 */
-	public boolean supportsPassword() {
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserId()
-	 */
-	public boolean supportsUserId() {
-		return false;
-	}    
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java
deleted file mode 100644
index 5496c837b..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java
+++ /dev/null
@@ -1,115 +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.internal.connectorservice.local;
-
-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;
-
-
-/**
- * IConnectorService manager class.
- * There should be only one of these instantiated.
- * Use getTheLocalSystemManager 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 cmd subsystems can share the same system object.
- */
-public class LocalConnectorServiceManager extends AbstractConnectorServiceManager
-{
- 	private static LocalConnectorServiceManager inst = null;
-  
-    /**
-     * Private constructor to ensure not instantiated this way.
-     * Use getTheLocalSystemManager instead.
-     */
-    private LocalConnectorServiceManager()
-    {
-    }
-    
-    /**
-     * Return singleton instance of this class
-     */
-    public static LocalConnectorServiceManager getTheLocalSystemManager()
-    {
-    	if (inst == null)
-    	  inst = new LocalConnectorServiceManager();
-    	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.
-     */
-    public IConnectorService createConnectorService(IHost host)
-    {
- 	   	IConnectorService connectorService =  new LocalConnectorService(host);
- 	   	return connectorService;
-    }    
-
-    /**
-     * 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 ILocalSubSystem.class
-     */
-    public Class getSubSystemCommonInterface(ISubSystem subsystem)
-    {
-    	return ILocalSubSystem.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 ILocalSubSystem
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem)
-	{
-		return (otherSubSystem instanceof ILocalSubSystem);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.cvsignore b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.options b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.options
deleted file mode 100644
index e846377b8..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.rse.connectorservice.ssh/debug = true
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.project b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.project
deleted file mode 100644
index dfdb5f84d..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.connectorservice.ssh</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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 2e54f84b7..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 15 10:45:58 EST 2007
-eclipse.preferences.version=1
-encoding//src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties=8859_1
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d141d3395..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Jan 30 22:33:44 CET 2007
-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=enabled
-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.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.ssh/.settings/org.eclipse.jdt.ui.prefs b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 07346397c..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Jul 07 11:19:10 CEST 2006
-eclipse.preferences.version=1
-internal.default.compliance=user
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;org.eclipse.rse;
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e15ff461..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.connectorservice.ssh; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.internal.connectorservice.ssh.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services.ssh,
- org.eclipse.rse.services,
- org.eclipse.rse.core,
- org.eclipse.rse.ui,
- org.eclipse.ui,
- com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.internal.connectorservice.ssh;x-friends:="org.eclipse.rse.subsystems.files.ssh,org.eclipse.rse.subsystems.shells.ssh"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html b/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html
deleted file mode 100644
index 460233046..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/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 2, 2006</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.ssh/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties
deleted file mode 100644
index 82d6b8b0e..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 = META-INF/,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               .
-source.. = src/
-output.. = bin/
-javacWarnings.. = -discouraged
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif
deleted file mode 100644
index 061b6e226..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif
deleted file mode 100644
index 3faca4474..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/wizban/keylock.gif b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/wizban/keylock.gif
deleted file mode 100644
index 2efb6ffb5..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/wizban/keylock.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties
deleted file mode 100644
index 7f0dccf0b..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-# Copyright (c) 2006 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 SSH Connector Service
-providerName = Eclipse.org
-
-SshSystemName=SSH Only
-SshSystemDescription=Connection for SSH access to remote systems
-
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml
deleted file mode 100644
index fbce7ade9..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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 
--->
-<?eclipse version="3.1"?>
-<plugin>
-	<extension point="org.eclipse.rse.core.systemTypes">
-		<systemType
-        	description="%SshSystemDescription"
-	        icon="icons/full/obj16/systemcommands_obj.gif"
-    	    iconLive="icons/full/obj16/systemcommandslive_obj.gif"
-        	id="org.eclipse.rse.systemtype.ssh"
-	        name="SSH Only"/>
-	</extension>
-</plugin> 
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java
deleted file mode 100644
index 8de589422..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java
+++ /dev/null
@@ -1,113 +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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.rse.connectorservice.ssh"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	//<tracing code>----------------------------------------------------
-
-	private static Boolean fTracingOn = null;
-	public static boolean isTracingOn() {
-		if (fTracingOn==null) {
-			String id = plugin.getBundle().getSymbolicName();
-			String val = Platform.getDebugOption(id + "/debug"); //$NON-NLS-1$
-			if ("true".equals(val)) { //$NON-NLS-1$
-				fTracingOn = Boolean.TRUE;
-			} else {
-				fTracingOn = Boolean.FALSE;
-			}
-		}
-		return fTracingOn.booleanValue();
-	}
-	public static String getTimestamp() {
-		try {
-			DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
-			return formatter.format(new Date());
-		} catch (Exception e) {
-			// If there were problems writing out the date, ignore and
-			// continue since that shouldn't stop us from logging the rest
-			// of the information
-		}
-		return Long.toString(System.currentTimeMillis());
-	}
-	public static void trace(String msg) {
-		if (isTracingOn()) {
-			String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg; //$NON-NLS-1$ //$NON-NLS-2$
-			System.out.println(fullMsg);
-			System.out.flush();
-		}
-	}
-
-	//</tracing code>---------------------------------------------------
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java
deleted file mode 100644
index 1af76bfca..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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) - extracted from various team.cvs plugins
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-
-/**
- * Defines the constants used by the terminal.ssh Plugin
- */
-public interface ISshConstants {
-
-    // These are from ISSHContants
-    public static final String KEY_SSH2HOME="CVSSSH2PreferencePage.SSH2HOME"; //$NON-NLS-1$
-    public static final String KEY_PRIVATEKEY="CVSSSH2PreferencePage.PRIVATEKEY"; //$NON-NLS-1$
-
-    // These are from ICVSUIConstants
-    public static final String PREF_USE_PROXY = "proxyEnabled"; //$NON-NLS-1$
-    public static final String PREF_PROXY_TYPE = "proxyType"; //$NON-NLS-1$
-    public static final String PREF_PROXY_HOST = "proxyHost"; //$NON-NLS-1$
-    public static final String PREF_PROXY_PORT = "proxyPort"; //$NON-NLS-1$
-    public static final String PREF_PROXY_AUTH = "proxyAuth"; //$NON-NLS-1$
-    
-    // These are from CVSProviderPlugin
-    public static final String PROXY_TYPE_HTTP = "HTTP"; //$NON-NLS-1$
-    public static final String PROXY_TYPE_SOCKS5 = "SOCKS5"; //$NON-NLS-1$
-    public static final String HTTP_DEFAULT_PORT="80"; //$NON-NLS-1$
-    public static final String SOCKS5_DEFAULT_PORT="1080"; //$NON-NLS-1$
-
-    // These are from cvs.ui.IHelpContextIds
-	public static final String CVSUIPREFIX = "org.eclipse.team.cvs.ui."; //$NON-NLS-1$
-	public static final String HELP_USER_VALIDATION_DIALOG = CVSUIPREFIX + "user_validation_dialog_context"; //$NON-NLS-1$
-	public static final String HELP_KEYBOARD_INTERACTIVE_DIALOG = CVSUIPREFIX + "keyboard_interactive_dialog_context"; //$NON-NLS-1$
-
-	// These are from TeamUIImages
-	public final String IMG_KEY_LOCK = "icons/full/wizban/keylock.gif"; //$NON-NLS-1$
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java
deleted file mode 100644
index 1a710f261..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java
+++ /dev/null
@@ -1,23 +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 (Wind River) - initial API and implementation 
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-/** 
- * Markup Interface for subsystems using the SshConnectorService.
- *
- * By implementing this interface, subsystems can be recognized
- * as being able to share a single ssh connector service between
- * multiple different subsystems.
- */
-public interface ISshSubSystem {
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java
deleted file mode 100644
index 79d7ca615..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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:
- * Atsuhiko Yamanaka, JCraft,Inc. - initial API and implementation.
- * IBM Corporation - ongoing maintenance
- * Martin Oberhuber (Wind River) - copied and adapted from team.cvs.ui
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A dialog for keyboad-interactive authentication for the ssh2 connection.
- */
-public class KeyboardInteractiveDialog extends TrayDialog {
-  // widgets
-  private Text[] texts;
-
-  protected String domain;
-  protected String destination;
-  protected String name;
-  protected String instruction;
-  protected String lang;
-  protected String[] prompt;
-  protected boolean[] echo;
-  private String message;
-  private String[] result;
-
-  /**
-   * Creates a nwe KeyboardInteractiveDialog.
-   *
-   * @param parentShell the parent shell
-   * @param connectionId an id for the connection
-   * @param destination the location
-   * @param name the name
-   * @param instruction the instruction
-   * @param prompt the titles for textfields
-   * @param echo '*' should be used or not
-   */
-  public KeyboardInteractiveDialog(Shell parentShell,
-				   String connectionId,
-				   String destination,
-				   String name,
-				   String instruction,
-				   String[] prompt,
-				   boolean[] echo){
-    super(parentShell);
-    this.domain=connectionId;
-    this.destination=destination;
-    this.name=name;
-    this.instruction=instruction;
-    this.prompt=prompt;
-    this.echo=echo;
-    this.message=NLS.bind(SshConnectorResources.KeyboardInteractiveDialog_message, new String[] { destination+(name!=null && name.length()>0 ? ": "+name : "") }); //NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ 
-  }
-  /**
-   * @see Window#configureShell
-   */
-  protected void configureShell(Shell newShell) {
-    super.configureShell(newShell);
-    newShell.setText(message);
-  }
-  /**                                                                                           
-   * @see Window#create                                                                         
-   */
-  public void create() {
-    super.create();
-    if(texts.length>0){
-      texts[0].setFocus();
-    }
-  }
-  /**                                                                                           
-   * @see Dialog#createDialogArea                                                               
-   */
-  protected Control createDialogArea(Composite parent) {
-    Composite main=new Composite(parent, SWT.NONE);
-    GridLayout layout=new GridLayout();
-    layout.numColumns=3;
-    main.setLayout(layout);
-    main.setLayoutData(new GridData(GridData.FILL_BOTH));
-    
-	// set F1 help
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(main, ISshConstants.HELP_KEYBOARD_INTERACTIVE_DIALOG);
-	
-    if (message!=null) {
-      Label messageLabel=new Label(main, SWT.WRAP);
-      messageLabel.setText(message);
-      GridData data=new GridData(GridData.FILL_HORIZONTAL);
-      data.horizontalSpan=3;
-      messageLabel.setLayoutData(data);
-    }
-    if(domain!=null){
-      Label label = new Label(main, SWT.WRAP);
-      label.setText(NLS.bind(SshConnectorResources.KeyboardInteractiveDialog_labelConnection, new String[] { domain })); 
-      GridData data=new GridData(GridData.FILL_HORIZONTAL);
-      data.horizontalSpan=3;
-      label.setLayoutData(data);
-    }
-    if (instruction!=null && instruction.length()>0) {
-      Label messageLabel=new Label(main, SWT.WRAP);
-      messageLabel.setText(instruction);
-      GridData data=new GridData(GridData.FILL_HORIZONTAL);
-      data.horizontalSpan=3;
-      messageLabel.setLayoutData(data);
-    }
-    createPasswordFields(main);
-    return main;
-  }
-  /**                                                                                           
-   * Creates the widgets that represent the entry area.                          
-   *                                                                                            
-   * @param parent  the parent of the widgets                                                   
-   */
-  protected void createPasswordFields(Composite parent) {
-    texts=new Text[prompt.length];
-
-    for(int i=0; i<prompt.length; i++){
-      new Label(parent, SWT.NONE).setText(prompt[i]);
-      texts[i]=new Text(parent, SWT.BORDER);
-      GridData data=new GridData(GridData.FILL_HORIZONTAL);
-      data.widthHint=convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
-      texts[i].setLayoutData(data);
-
-      if(!echo[i]){
-	texts[i].setEchoChar('*');
-      }
-      new Label(parent, SWT.NONE);
-    }
-
-  }
-  /**                                                                                           
-   * Returns the entered values, or null                                          
-   * if the user canceled.                                                                      
-   *                                                                                            
-   * @return the entered values
-   */
-  public String[] getResult() {
-    return result;
-  }
-  /**                                                                                           
-   * Notifies that the ok button of this dialog has been pressed.                               
-   * <p>                                                                                        
-   * The default implementation of this framework method sets                                   
-   * this dialog's return code to <code>Window.OK</code>                                        
-   * and closes the dialog. Subclasses may override.                                            
-   * </p>                                                                                       
-   */
-  protected void okPressed() {
-    result=new String[prompt.length];
-    for(int i=0; i<texts.length; i++){
-      result[i]=texts[i].getText();
-    }
-    super.okPressed();
-  }
-  /**                                                                                           
-   * Notifies that the cancel button of this dialog has been pressed.                               
-   * <p>                                                                                        
-   * The default implementation of this framework method sets                                   
-   * this dialog's return code to <code>Window.CANCEL</code>                                        
-   * and closes the dialog. Subclasses may override.                                            
-   * </p>                                                                                       
-   */
-  protected void cancelPressed() {
-    result=null;
-    super.cancelPressed();
-  }
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java
deleted file mode 100644
index fddef56d1..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java
+++ /dev/null
@@ -1,45 +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: 
- * Martin Oberhuber (Wind River) - initial API and implementation 
- * Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SshConnectorResources extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.ssh.SshConnectorResources"; //$NON-NLS-1$
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, SshConnectorResources.class);
-	}
-	private SshConnectorResources() {
-	}
-
-	public static String SshConnectorService_Name;
-	public static String SshConnectorService_Description;
-	
-	public static String SshConnectorService_ErrorDisconnecting;
-	public static String SshConnectorService_Info;
-	public static String SshConnectorService_Warning;
-
-	//These are from org.eclipse.team.cvs.ui.CVSUIMessages
-	public static String UserValidationDialog_required;
-	public static String UserValidationDialog_labelUser;
-	public static String UserValidationDialog_labelPassword;
-	public static String UserValidationDialog_password;
-	public static String UserValidationDialog_user;
-	public static String UserValidationDialog_5;
-	public static String UserValidationDialog_6;
-	public static String UserValidationDialog_7;
-
-	public static String KeyboardInteractiveDialog_message;
-	public static String KeyboardInteractiveDialog_labelConnection;
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties
deleted file mode 100644
index 8041534f2..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties
+++ /dev/null
@@ -1,34 +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: 
-# Martin Oberhuber (Wind River) - initial API and implementation 
-# Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
-################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-SshConnectorService_Name=SSH Connector Service
-SshConnectorService_Description=SSH Connector Service Description
-
-SshConnectorService_ErrorDisconnecting=ConnectionStatusListener:  Error disconnecting
-SshConnectorService_Warning=Warning
-SshConnectorService_Info=Info
-
-#These are from cvs.ui/messages.properties
-UserValidationDialog_required=Password Required
-UserValidationDialog_labelUser={0}
-UserValidationDialog_labelPassword={1}
-UserValidationDialog_password=&Password:
-UserValidationDialog_user=&User name:
-UserValidationDialog_5=Connection:
-UserValidationDialog_6=&Save password
-UserValidationDialog_7=Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
-
-KeyboardInteractiveDialog_message=Keyboard Interactive authentication for {0}
-KeyboardInteractiveDialog_labelConnection=Enter values for the following connection: {0}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
deleted file mode 100644
index 55b695aa5..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
+++ /dev/null
@@ -1,726 +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: 
- * Martin Oberhuber (Wind River) - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Proxy;
-import com.jcraft.jsch.ProxyHTTP;
-import com.jcraft.jsch.ProxySOCKS5;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SocketFactory;
-import com.jcraft.jsch.UIKeyboardInteractive;
-import com.jcraft.jsch.UserInfo;
-
-import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemSignonInformation;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-import org.eclipse.rse.internal.services.ssh.ISshSessionProvider;
-import org.eclipse.rse.services.RemoteUtil;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-
-/** 
- * Create SSH connections.
- */
-public class SshConnectorService extends AbstractConnectorService implements ISshSessionProvider
-{
-	private static final int SSH_DEFAULT_PORT = 22;
-	private static final int CONNECT_DEFAULT_TIMEOUT = 60; //seconds
-	private static JSch jsch=new JSch();
-    private Session session;
-    private SessionLostHandler fSessionLostHandler;
-
-	public SshConnectorService(IHost host) {
-		//TODO the port parameter doesnt really make sense here since
-		//it will be overridden when the subsystem initializes (through
-		//setPort() on our base class -- I assume the port is meant to 
-		//be a local port.
-		super(SshConnectorResources.SshConnectorService_Name, SshConnectorResources.SshConnectorService_Description, host, 0);
-		fSessionLostHandler = null;
-	}
-
-	//----------------------------------------------------------------------
-	// <copied from org.eclipse.team.cvs.ssh2>
-	//----------------------------------------------------------------------
-	private static String current_ssh_home = null;
-	private static String current_pkeys = ""; //$NON-NLS-1$
-	static String SSH_HOME_DEFAULT = null;
-	static {
-		String ssh_dir_name = ".ssh"; //$NON-NLS-1$
-		
-		// Windows doesn't like files or directories starting with a dot.
-		if (Platform.getOS().equals(Platform.OS_WIN32)) {
-			ssh_dir_name = "ssh"; //$NON-NLS-1$
-		}
-		SSH_HOME_DEFAULT = System.getProperty("user.home"); //$NON-NLS-1$
-		if (SSH_HOME_DEFAULT != null) {
-		    SSH_HOME_DEFAULT = SSH_HOME_DEFAULT + java.io.File.separator + ssh_dir_name;
-		}
-	}
-
-	private static IPreferenceStore fCvsSsh2PreferenceStore;
-    static IPreferenceStore getCvsSsh2PreferenceStore() {
-        if (fCvsSsh2PreferenceStore == null) {
-        	fCvsSsh2PreferenceStore = new ScopedPreferenceStore(new InstanceScope(),"org.eclipse.team.cvs.ssh2"); //$NON-NLS-1$
-        }
-        return fCvsSsh2PreferenceStore;
-    }
-
-	private static IPreferenceStore fCvsUIPreferenceStore;
-    static IPreferenceStore getCvsUIPreferenceStore() {
-        if (fCvsUIPreferenceStore == null) {
-        	fCvsUIPreferenceStore = new ScopedPreferenceStore(new InstanceScope(),"org.eclipse.team.cvs.ui"); //$NON-NLS-1$
-        }
-        return fCvsUIPreferenceStore;
-    }
-
-	// Load ssh prefs from Team/CVS for now.
-	// TODO do our own preference page.
-	static void loadSshPrefs(JSch jsch)
-	{
-		IPreferenceStore store = getCvsSsh2PreferenceStore();
-		String ssh_home = store.getString(ISshConstants.KEY_SSH2HOME);
-		String pkeys = store.getString(ISshConstants.KEY_PRIVATEKEY);
-
-		try {
-			if (ssh_home.length() == 0)
-				ssh_home = SSH_HOME_DEFAULT;
-
-			if (current_ssh_home == null || !current_ssh_home.equals(ssh_home)) {
-				loadKnownHosts(jsch, ssh_home);
-				current_ssh_home = ssh_home;
-				current_pkeys = ""; //$NON-NLS-1$
-			}
-
-			if (!current_pkeys.equals(pkeys)) {
-				java.io.File file;
-				String[] pkey = pkeys.split(","); //$NON-NLS-1$
-				String[] _pkey = current_pkeys.split(","); //$NON-NLS-1$
-				current_pkeys = ""; //$NON-NLS-1$
-				for (int i = 0; i < pkey.length; i++) {
-					file = new java.io.File(pkey[i]);
-					if (!file.isAbsolute()) {
-						file = new java.io.File(ssh_home, pkey[i]);
-					}
-					if (file.exists()) {
-						boolean notyet = true;
-						for (int j = 0; j < _pkey.length; j++) {
-							if (pkey[i].equals(_pkey[j])) {
-								notyet = false;
-								break;
-							}
-						}
-						if (notyet)
-							jsch.addIdentity(file.getPath());
-						if (current_pkeys.length() == 0) {
-							current_pkeys = pkey[i];
-						} else {
-							current_pkeys += ("," + pkey[i]); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-		}
-
-	}
-
-    static void loadKnownHosts(JSch jsch, String ssh_home){
-		try {
-		  java.io.File file;
-		  file=new java.io.File(ssh_home, "known_hosts"); //$NON-NLS-1$
-		  jsch.setKnownHosts(file.getPath());
-		} catch (Exception e) {
-		}
-	}
-    
-    private static final String INFO_PROXY_USER = "org.eclipse.team.cvs.core.proxy.user"; //$NON-NLS-1$ 
-    private static final String INFO_PROXY_PASS = "org.eclipse.team.cvs.core.proxy.pass"; //$NON-NLS-1$ 
-
-    static Proxy loadSshProxyPrefs() {
-    	//TODO Use official Platform prefs when bug 154100 is fixed
-    	IPreferenceStore store = getCvsUIPreferenceStore();
-		boolean useProxy = store.getBoolean(ISshConstants.PREF_USE_PROXY);
-        Proxy proxy = null;
-		if (useProxy) {
-			String _type = store.getString(ISshConstants.PREF_PROXY_TYPE);
-			String _host = store.getString(ISshConstants.PREF_PROXY_HOST);
-			String _port = store.getString(ISshConstants.PREF_PROXY_PORT);
-
-			boolean useAuth = store.getBoolean(ISshConstants.PREF_PROXY_AUTH);
-			String _user = ""; //$NON-NLS-1$
-			String _pass = ""; //$NON-NLS-1$
-			
-			// Retrieve username and password from keyring.
-			if(useAuth){
-				Map authInfo = null;
-				try {
-				    URL FAKE_URL = new URL("http://org.eclipse.team.cvs.proxy.auth");//$NON-NLS-1$ 
-					authInfo = Platform.getAuthorizationInfo(FAKE_URL, "proxy", ""); //$NON-NLS-1$ //$NON-NLS-2$
-				} catch(MalformedURLException e) {
-					//should never happen
-			}
-				if (authInfo==null) authInfo=Collections.EMPTY_MAP;
-				_user=(String)authInfo.get(INFO_PROXY_USER);
-				_pass=(String)authInfo.get(INFO_PROXY_PASS);
-				if (_user==null) _user=""; //$NON-NLS-1$
-				if (_pass==null) _pass=""; //$NON-NLS-1$
-			}
-
-			String proxyhost = _host + ":" + _port; //$NON-NLS-1$
-			if (_type.equals(ISshConstants.PROXY_TYPE_HTTP)) {
-				proxy = new ProxyHTTP(proxyhost);
-				if (useAuth) {
-					((ProxyHTTP) proxy).setUserPasswd(_user, _pass);
-				}
-			} else if (_type.equals(ISshConstants.PROXY_TYPE_SOCKS5)) {
-				proxy = new ProxySOCKS5(proxyhost);
-				if (useAuth) {
-					((ProxySOCKS5) proxy).setUserPasswd(_user, _pass);
-				}
-			}
-		}
-		return proxy;
-    }
-
-	public static class SimpleSocketFactory implements SocketFactory {
-		InputStream in = null;
-		OutputStream out = null;
-		public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-			Socket socket = null;
-			socket = new Socket(host, port);
-			return socket;
-		}
-		public InputStream getInputStream(Socket socket) throws IOException {
-			if (in == null)
-				in = socket.getInputStream();
-			return in;
-		}
-		public OutputStream getOutputStream(Socket socket) throws IOException {
-			if (out == null)
-				out = socket.getOutputStream();
-			return out;
-		}
-	}
-	
-	public static class ResponsiveSocketFactory extends SimpleSocketFactory {
-		private IProgressMonitor monitor;
-		public ResponsiveSocketFactory(IProgressMonitor monitor) {
-			this.monitor = monitor;
-		}
-		public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-			Socket socket = null;
-			//Allows to cancel the socket creation operation if necessary.
-			//Waits for the timeout specified in CVS Preferences, maximum.
-			socket = RemoteUtil.createSocket(host, port, CONNECT_DEFAULT_TIMEOUT, monitor);
-			// Null out the monitor so we don't hold onto anything
-			// (i.e. the SSH2 session will keep a handle to the socket factory around
-			monitor = new NullProgressMonitor();
-			// Set the socket timeout
-			//socket.setSoTimeout(getSshTimeoutInMillis());
-			// We want blocking read() calls in ssh to never terminate
-			socket.setSoTimeout(0);
-			return socket;
-		}
-	}
-
-	//----------------------------------------------------------------------
-	// </copied from org.eclipse.team.cvs.ssh2>
-	//----------------------------------------------------------------------
-
-	protected void internalConnect(IProgressMonitor monitor) throws Exception
-    {
-    	//We could share the preferences from ssh2, or use RSE
-    	//ConnectorService Properties / Server Launcher Properties
-    	
-        //jsch.setKnownHosts("/home/foo/.ssh/known_hosts");
-		loadSshPrefs(jsch);
-        String host = getHostName();
-        String user = getUserId();
-
-        Proxy proxy = loadSshProxyPrefs();
-        session=jsch.getSession(user, host, SSH_DEFAULT_PORT);
-        if (proxy != null) {
-            session.setProxy(proxy);
-        }
-        //session.setTimeout(getSshTimeoutInMillis());
-        session.setTimeout(0); //never time out on the session
-        String password=""; //$NON-NLS-1$
-        SystemSignonInformation ssi = getPasswordInformation();
-        if (ssi!=null) {
-        	password = getPasswordInformation().getPassword();
-        }
-        session.setPassword(password);
-        MyUserInfo userInfo = new MyUserInfo(user, password);
-        session.setUserInfo(userInfo);
-        session.setSocketFactory(new ResponsiveSocketFactory(monitor));
-
-        //java.util.Hashtable config=new java.util.Hashtable();
-        //config.put("StrictHostKeyChecking", "no");
-        //session.setConfig(config);
-        userInfo.aboutToConnect();
-        try {
-        	Activator.trace("SshConnectorService.connecting..."); //$NON-NLS-1$
-        	//wait for 60 sec maximum during connect
-            session.connect(CONNECT_DEFAULT_TIMEOUT * 1000);
-        	Activator.trace("SshConnectorService.connected"); //$NON-NLS-1$
-        } catch (JSchException e) {
-        	Activator.trace("SshConnectorService.connect failed: "+e.toString()); //$NON-NLS-1$
-            if (session.isConnected())
-                session.disconnect();
-            throw e;
-        }
-        userInfo.connectionMade();
-        fSessionLostHandler = new SessionLostHandler(this);
-        notifyConnection();
-    }
-
-	public void internalDisconnect(IProgressMonitor monitor) throws Exception
-	{
-		//TODO Will services like the sftp service be disconnected too? Or notified?
-    	Activator.trace("SshConnectorService.disconnect"); //$NON-NLS-1$
-		try
-		{
-			if (session != null) {
-				// Is disconnect being called because the network (connection) went down?
-				boolean sessionLost = (fSessionLostHandler!=null && fSessionLostHandler.isSessionLost());
-				// no more interested in handling session-lost, since we are disconnecting anyway
-				fSessionLostHandler = null;
-				// handle events
-				if (sessionLost) {
-					notifyError();
-				} 
-				else {
-					// Fire comm event to signal state about to change
-					fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT);
-				}
-
-				if (session.isConnected()) {
-					session.disconnect();
-				}
-				
-				// Fire comm event to signal state changed
-				notifyDisconnection();
-				//TODO MOB - keep the session to avoid NPEs in services (disables gc for the session!)
-				// session = null;
-				// DKM - no need to clear uid cache
-				clearPasswordCache(false); // clear in-memory password
-				//clearUserIdCache(); // Clear any cached local user IDs
-			}
-		}
-		catch (Exception exc)
-		{
-			throw new java.lang.reflect.InvocationTargetException(exc);
-		}
-	}
-
-	//TODO avoid having jsch type "Session" in the API.
-	//Could be done by instanciating SshShellService and SshFileService here,
-	//and implementing IShellService getShellService() 
-	//and IFileService getFileService().
-    public Session getSession() {
-    	return session;
-    }
-
-    /**
-     * Handle session-lost events.
-     * This is generic for any sort of connector service.
-     * Most of this is extracted from dstore's ConnectionStatusListener.
-     * 
-     * TODO should be refactored to make it generally available, and allow
-     * dstore to derive from it.
-     */
-	public static class SessionLostHandler implements Runnable, IRunnableWithProgress
-	{
-		private IConnectorService _connection;
-		private boolean fSessionLost;
-		
-		public SessionLostHandler(IConnectorService cs)
-		{
-			_connection = cs;
-			fSessionLost = false;
-		}
-		
-		/** 
-		 * Notify that the connection has been lost. This may be called 
-		 * multiple times from multiple subsystems. The SessionLostHandler
-		 * ensures that actual user feedback and disconnect actions are
-		 * done only once, on the first invocation.
-		 */
-		public void sessionLost()
-		{
-			//avoid duplicate execution of sessionLost
-			boolean showSessionLostDlg=false;
-			synchronized(this) {
-				if (!fSessionLost) {
-					fSessionLost = true;
-					showSessionLostDlg=true;
-				}
-			}
-			if (showSessionLostDlg) {
-				//invokes this.run() on dispatch thread
-				Display.getDefault().asyncExec(this);
-			}
-		}
-		
-		public synchronized boolean isSessionLost() {
-			return fSessionLost;
-		}
-		
-		public void run()
-		{
-			Shell shell = getShell();
-			//TODO need a more correct message for "session lost"
-			//TODO allow users to reconnect from this dialog
-			//SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_CANCELLED);
-			msg.makeSubstitution(_connection.getPrimarySubSystem().getHost().getAliasName());
-			SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg);
-			dialog.open();
-			try
-			{
-				//TODO I think we should better use a Job for disconnecting?
-				//But what about error messages?
-				IRunnableContext runnableContext = getRunnableContext(getShell());
-				// will do this.run(IProgressMonitor mon)
-		    	//runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress
-		    	runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress
-		    	_connection.reset();
-				ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry();    	    
-	            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(SshConnectorResources.SshConnectorService_ErrorDisconnecting, e);
-			}
-		}
-
-		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();
-			}
-		}
-
-		public Shell getShell() {
-			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;
-		}
-
-	    /**
-		 * 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)
-	    {
-	         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR,shell,RSEUIPlugin.getResourceBundle(),
-	         //                             ISystemMessages.MSG_DISCONNECT_FAILED,
-	         //                             hostName, exc.getMessage()); 	
-	         //RSEUIPlugin.logError("Disconnect failed",exc); // temporary
-	    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-	    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_FAILED).makeSubstitution(hostName,exc));
-	    	 msgDlg.setException(exc);
-	    	 msgDlg.open();
-	    }	
-
-	    /**
-	     * 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)
-	    {
-	         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(),
-	         //                             ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName);
-	    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-	    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_CANCELLED).makeSubstitution(hostName));
-	    	 msgDlg.open();
-	    }
-	}
-
-    /** 
-     * Notification from sub-services that our session was lost.
-     * Notify all subsystems properly.
-     * TODO allow user to try and reconnect?
-     */
-    public void handleSessionLost() {
-    	Activator.trace("SshConnectorService: handleSessionLost"); //$NON-NLS-1$
-    	if (fSessionLostHandler!=null) {
-    		fSessionLostHandler.sessionLost();
-    	}
-	}
-
-	protected static Display getStandardDisplay() {
-    	Display display = Display.getCurrent();
-    	if( display==null ) {
-    		display = Display.getDefault();
-    	}
-    	return display;
-    }
-    
-    private static class MyUserInfo implements UserInfo, UIKeyboardInteractive {
-    	private String fPassphrase;
-    	private String fPassword;
-    	private int fAttemptCount;
-    	private final String fUser;
-
-		public MyUserInfo(String user, String password) {
-			fUser = user;
-			fPassword = password;
-		}
-		public String getPassword() {
-			return fPassword;
-		}
-		public boolean promptYesNo(final String str) {
-			//need to switch to UI thread for prompting
-			final boolean[] retval = new boolean[1];
-			getStandardDisplay().syncExec(new Runnable() {
-				public void run() {
-					retval[0] = MessageDialog.openQuestion(null, SshConnectorResources.SshConnectorService_Warning, str); 
-				}
-			});
-			return retval[0]; 
-		}
-		private String promptSecret(final String message) {
-			final String[] retval = new String[1];
-			final String finUser = fUser;
-			getStandardDisplay().syncExec(new Runnable() {
-				public void run() {
-					UserValidationDialog uvd = new UserValidationDialog(null, null,
-							finUser, message);
-					uvd.setUsernameMutable(false);
-					if (uvd.open() == Window.OK) {
-						retval[0] = uvd.getPassword();
-					} else {
-						retval[0] = null;
-					}
-				}
-			});
-			return retval[0];
-		}
-		public String getPassphrase() {
-			return fPassphrase;
-		}
-		public boolean promptPassphrase(String message) {
-			fPassphrase = promptSecret(message);
-			return (fPassphrase!=null);
-		}
-		public boolean promptPassword(final String message) {
-			String _password = promptSecret(message);
-			if (_password!=null) {
-				fPassword=_password;
-				return true;
-			}
-			return false;
-		}
-		public void showMessage(final String message) {
-			getStandardDisplay().syncExec(new Runnable() {
-				public void run() {
-					MessageDialog.openInformation(null, SshConnectorResources.SshConnectorService_Info, message);
-				}
-			});
-		}
-		public String[] promptKeyboardInteractive(final String destination, 
-				final String name, final String instruction,
-				final String[] prompt, final boolean[] echo)
-		{
-		    if (prompt.length == 0) {
-		        // No need to prompt, just return an empty String array
-		        return new String[0];
-		    }
-			try{
-			    if (fAttemptCount == 0 && fPassword != null && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
-			        // Return the provided password the first time but always prompt on subsequent tries
-			        fAttemptCount++;
-			        return new String[] { fPassword };
-			    }
-			    final String[][] finResult = new String[1][];
-			    getStandardDisplay().syncExec(new Runnable() {
-			    	public void run() {
-			    		KeyboardInteractiveDialog dialog = new KeyboardInteractiveDialog(null, 
-			    			null, destination, name, instruction, prompt, echo);
-			    		dialog.open();
-			    		finResult[0]=dialog.getResult();
-		    		}
-			    });
-			    String[] result=finResult[0];
-                if (result == null) 
-                    return null; // canceled
-			    if (result.length == 1 && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
-			        fPassword = result[0];
-			    }
-			    fAttemptCount++;
-				return result;
-			}
-			catch(OperationCanceledException e){
-				return null;
-			}
-		}
-        /**
-         * Callback to indicate that a connection is about to be attempted
-         */
-        public void aboutToConnect() {
-            fAttemptCount = 0;
-        }
-        /**
-         * Callback to indicate that a connection was made
-         */
-        public void connectionMade() {
-            fAttemptCount = 0;
-        }
-		
-	}
-    
-	public boolean isConnected() {
-		if (session!=null) {
-			if (session.isConnected()) {
-				return true;
-			} else if (fSessionLostHandler!=null) {
-				Activator.trace("SshConnectorService.isConnected: false -> sessionLost"); //$NON-NLS-1$
-				fSessionLostHandler.sessionLost();
-			}
-		}
-		return false;
-	}
-
-	public boolean hasRemoteServerLauncherProperties() {
-		return false;
-	}
-
-	public boolean supportsRemoteServerLaunching() {
-		return false;
-	}
-
-	public boolean supportsServerLaunchProperties() {
-		return false;
-	}
-
-	/**
-	 * @return false
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#requiresPassword()
-	 */
-	public boolean requiresPassword() {
-		return false;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java
deleted file mode 100644
index ab0d87b40..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java
+++ /dev/null
@@ -1,68 +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) - Adapted from LocalConnectorServiceManager.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-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;
-
-/**
- * ConnectorService manager class.
- * 
- * 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 cmd subsystems can share the same 
-*  ConnectorService object.
- */
-public class SshConnectorServiceManager extends AbstractConnectorServiceManager {
-
-	private static SshConnectorServiceManager fInstance;
-
-	private SshConnectorServiceManager() {
-		super();
-	}
-
-    /**
-     * Return singleton instance of this class
-     * @return the singleton instance
-     */
-    public static SshConnectorServiceManager getInstance()
-    {
-    	if (fInstance == null)
-    	  fInstance = new SshConnectorServiceManager();
-    	return fInstance;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.model.IHost)
-	 */
-	public IConnectorService createConnectorService(IHost host) {
-    	IConnectorService service =  new SshConnectorService(host);
-    	return service;
-	}
-
-	public boolean sharesSystem(ISubSystem otherSubSystem) {
-		return (otherSubSystem instanceof ISshSubSystem);
-	}
-
-	public Class getSubSystemCommonInterface(ISubSystem subsystem) {
-		return ISshSubSystem.class;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java
deleted file mode 100644
index ce0a2a2e0..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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) - copied from org.eclipse.team.cvs.ui
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.ssh;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-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.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A dialog for prompting for a username and password
- */
-public class UserValidationDialog extends TrayDialog {
-	// widgets
-	protected Text usernameField;
-	protected Text passwordField;
-	protected Button allowCachingButton;
-
-	protected String domain;
-	protected String defaultUsername;
-	protected String password = null;
-	protected boolean allowCaching = false;
-	protected Image keyLockImage;
-	
-	// whether or not the username can be changed
-	protected boolean isUsernameMutable = true;
-	protected String username = null;
-	protected String message = null;
-
-	/**
-	 * Creates a new UserValidationDialog.
-	 * 
-	 * @param parentShell  the parent shell
-	 * @param location  the location
-	 * @param defaultName  the default user name
-	 * @param message  a mesage to display to the user
-	 */
-	public UserValidationDialog(Shell parentShell, String location, String defaultName, String message) {
-		super(parentShell);
-        setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.defaultUsername = defaultName;
-		this.domain = location;
-		this.message = message;
-	}
-	/**
-	 * @see Window#configureShell
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(SshConnectorResources.UserValidationDialog_required); 
-		// set F1 help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ISshConstants.HELP_USER_VALIDATION_DIALOG);	
-	}
-	/**
-	 * @see Window#create
-	 */
-	public void create() {
-		super.create();
-		// add some default values
-		usernameField.setText(defaultUsername);
-	
-		if (isUsernameMutable) {
-			// give focus to username field
-			usernameField.selectAll();
-			usernameField.setFocus();
-		} else {
-			usernameField.setEditable(false);
-			passwordField.setFocus();
-		}
-	}
-
-	/**
-	 * @see Dialog#createDialogArea
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		
-		top.setLayout(layout);
-		top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	
-		Composite imageComposite = new Composite(top, SWT.NONE);
-		layout = new GridLayout();
-		imageComposite.setLayout(layout);
-		imageComposite.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-
-		Composite main = new Composite(top, SWT.NONE);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		main.setLayout(layout);
-		main.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label imageLabel = new Label(imageComposite, SWT.NONE);
-		keyLockImage = Activator.getImageDescriptor(ISshConstants.IMG_KEY_LOCK).createImage();
-		imageLabel.setImage(keyLockImage);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		imageLabel.setLayoutData(data);
-		
-		if (message != null) {
-			Label messageLabel = new Label(main, SWT.WRAP);
-			messageLabel.setText(message);
-			data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			data.horizontalSpan = 3;
-			data.widthHint = 300;
-			messageLabel.setLayoutData(data);
-		}
-		if (domain != null) {
-			Label d = new Label(main, SWT.WRAP);
-			d.setText(SshConnectorResources.UserValidationDialog_5); 
-			data = new GridData();
-			d.setLayoutData(data);
-			Label label = new Label(main, SWT.WRAP);
-			if (isUsernameMutable) {
-				label.setText(NLS.bind(SshConnectorResources.UserValidationDialog_labelUser, new String[] { domain })); 
-			} else {
-				label.setText(NLS.bind(SshConnectorResources.UserValidationDialog_labelPassword, (new Object[]{defaultUsername, domain}))); 
-			}
-			data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			data.horizontalSpan = 2;
-			data.widthHint = 300;
-			label.setLayoutData(data);
-		}
-		createUsernameFields(main);
-		createPasswordFields(main);
-		
-		if(domain != null) {
-			allowCachingButton = new Button(main, SWT.CHECK);
-			allowCachingButton.setText(SshConnectorResources.UserValidationDialog_6); 
-			data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			data.horizontalSpan = 3;
-			allowCachingButton.setLayoutData(data);
-			allowCachingButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					allowCaching = allowCachingButton.getSelection();
-				}
-			});
-			Composite warningComposite = new Composite(main, SWT.NONE);
-			layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginHeight = 0;
-			layout.marginHeight = 0;
-			warningComposite.setLayout(layout);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 3;
-			warningComposite.setLayoutData(data);
-			Label warningLabel = new Label(warningComposite, SWT.NONE);
-			warningLabel.setImage(getImage(DLG_IMG_MESSAGE_WARNING));
-			warningLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING));
-			Label warningText = new Label(warningComposite, SWT.WRAP);
-			warningText.setText(SshConnectorResources.UserValidationDialog_7); 
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.widthHint = 300;
-			warningText.setLayoutData(data);
-		}
-		
-        Dialog.applyDialogFont(parent);
-        
-		return main;
-	}
-	
-	/**
-	 * Creates the three widgets that represent the password entry area.
-	 * 
-	 * @param parent  the parent of the widgets
-	 */
-	protected void createPasswordFields(Composite parent) {
-		new Label(parent, SWT.NONE).setText(SshConnectorResources.UserValidationDialog_password); 
-		
-		passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
-		passwordField.setLayoutData(data);
-	}
-	/**
-	 * Creates the three widgets that represent the user name entry area.
-	 * 
-	 * @param parent  the parent of the widgets
-	 */
-	protected void createUsernameFields(Composite parent) {
-		new Label(parent, SWT.NONE).setText(SshConnectorResources.UserValidationDialog_user); 
-		
-		usernameField = new Text(parent, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
-		usernameField.setLayoutData(data);
-	}
-	
-	/**
-	 * Returns the password entered by the user, or null
-	 * if the user canceled.
-	 * 
-	 * @return the entered password
-	 */
-	public String getPassword() {
-		return password;
-	}
-	
-	/**
-	 * Returns the username entered by the user, or null
-	 * if the user canceled.
-	 * 
-	 * @return the entered username
-	 */
-	public String getUsername() {
-		return username;
-	}
-	
-	/**
-	 * Returns <code>true</code> if the save password checkbox was selected.
-	 * @return <code>true</code> if the save password checkbox was selected and <code>false</code>
-	 * otherwise.
-	 */
-	public boolean getAllowCaching() {
-		return allowCaching;
-	}
-	
-	/**
-	 * Notifies that the ok button of this dialog has been pressed.
-	 * <p>
-	 * The default implementation of this framework method sets
-	 * this dialog's return code to <code>Window.OK</code>
-	 * and closes the dialog. Subclasses may override.
-	 * </p>
-	 */
-	protected void okPressed() {
-		password = passwordField.getText();
-		username = usernameField.getText();
-	
-		super.okPressed();
-	}
-	/**
-	 * Sets whether or not the username field should be mutable.
-	 * This method must be called before create(), otherwise it
-	 * will be ignored.
-	 * 
-	 * @param value  whether the username is mutable
-	 */
-	public void setUsernameMutable(boolean value) {
-		isUsernameMutable = value;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#close()
-	 */
-	public boolean close() {
-		if(keyLockImage != null) {
-			keyLockImage.dispose();
-		}
-		return super.close();
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/.classpath b/rse/plugins/org.eclipse.rse.core/.classpath
deleted file mode 100644
index 8d1938ee2..000000000
--- a/rse/plugins/org.eclipse.rse.core/.classpath
+++ /dev/null
@@ -1,8 +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="src" path="persistence"/>
-	<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 c2582431c..000000000
--- a/rse/plugins/org.eclipse.rse.core/.project
+++ /dev/null
@@ -1,28 +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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
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 40380a91e..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Dec 08 11:30:09 CST 2006
-eclipse.preferences.version=1
-encoding//persistence/org/eclipse/rse/internal/persistence/messages.properties=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 e706a1d30..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Tue Jan 30 22:23:48 CET 2007
-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.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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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 0e497cd53..000000000
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.rse.logging,
- org.eclipse.rse.services
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.core,
- org.eclipse.rse.core.filters,
- org.eclipse.rse.core.model,
- org.eclipse.rse.core.references,
- org.eclipse.rse.core.subsystems,
- org.eclipse.rse.internal.references;x-internal:=true,
- 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 460233046..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 2, 2006</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 fdd61ff0d..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=eclipse32.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 4f8e0a0b7..000000000
--- a/rse/plugins/org.eclipse.rse.core/about.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# 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=Remote System Explorer Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2006.  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 fabd11b67..000000000
--- a/rse/plugins/org.eclipse.rse.core/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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 = META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.properties,\
-               about.html,\
-               .,\
-               schema/,\
-               about.ini,\
-               about.mappings,\
-               eclipse32.png
-source.. = src/,\
-	persistence/
-output.. = bin/
-
-javacSource=1.4
-javacTarget=1.4
diff --git a/rse/plugins/org.eclipse.rse.core/eclipse32.png b/rse/plugins/org.eclipse.rse.core/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/rse/plugins/org.eclipse.rse.core/eclipse32.png
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/Messages.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/Messages.java
deleted file mode 100644
index a33c0db3f..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/Messages.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
- * 
- * Contributors:
- * David Dykstal (IBM) - initial API and implementation
- ********************************************************************************/
-package org.eclipse.rse.internal.persistence;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.rse.internal.persistence.messages"; //$NON-NLS-1$
-	public static String PropertyFileProvider_LoadingTaskName;
-	public static String PropertyFileProvider_SavingTaskName;
-	public static String PropertyFileProvider_UnexpectedException;
-	public static String RSEPersistenceManager_DeleteProfileJobName;
-	public static String SaveRSEDOMJob_SavingProfileJobName;
-	public static String SerializingProvider_UnexpectedException;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
deleted file mode 100644
index 633e1529a..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
+++ /dev/null
@@ -1,831 +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 the initial implementation:
- * David McKnight, David Dykstal.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-package org.eclipse.rse.internal.persistence;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-import org.eclipse.rse.persistence.dom.IRSEDOMConstants;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-import org.eclipse.rse.persistence.dom.RSEDOMNode;
-import org.eclipse.rse.persistence.dom.RSEDOMNodeAttribute;
-
-/**
- * This is class is used to restore an RSE DOM from disk and import it into RSE.
- * It stores the DOM as a tree of folders and .properties files.
- */
-public class PropertyFileProvider implements IRSEPersistenceProvider {
-
-	private static final String NULL_VALUE_STRING = "null"; //$NON-NLS-1$
-	private static final String PROPERTIES_FILE_NAME = "node.properties"; //$NON-NLS-1$
-
-	/* 
-	 * Metatype names 
-	 * each entry is an array. The first is the preferred name.
-	 * The other names are acceptable alternates.
-	 * Names must not contain periods or whitespace.
-	 * Lowercase letters, numbers and dashes (-) are preferred.
-	 */
-	private static final String[] MT_ATTRIBUTE_TYPE = new String[] { "04-attr-type", "attr-type" }; //$NON-NLS-1$ //$NON-NLS-2$
-	private static final String[] MT_ATTRIBUTE = new String[] { "03-attr", "attr" }; //$NON-NLS-1$ //$NON-NLS-2$
-	private static final String[] MT_CHILD = new String[] { "06-child", "child" }; //$NON-NLS-1$ //$NON-NLS-2$
-	private static final String[] MT_NODE_TYPE = new String[] { "01-type", "01-node-type", "n-type" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	private static final String[] MT_NODE_NAME = new String[] { "00-name", "00-node-name", "n-name" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	private static final String[] MT_REFERENCE = new String[] { "05-ref", "ref" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-	/* Type abbreviations */
-	private static final String AB_SUBSYSTEM = "SS"; //$NON-NLS-1$
-	private static final String AB_SERVICE_LAUNCHER = "SL"; //$NON-NLS-1$
-	private static final String AB_PROPERTY_SET = "PS"; //$NON-NLS-1$
-	private static final String AB_PROPERTY = "P"; //$NON-NLS-1$
-	private static final String AB_HOST = "H"; //$NON-NLS-1$
-	private static final String AB_FILTER_STRING = "FS"; //$NON-NLS-1$
-	private static final String AB_FILTER_POOL_REFERENCE = "FPR"; //$NON-NLS-1$
-	private static final String AB_FILTER_POOL = "FP"; //$NON-NLS-1$
-	private static final String AB_FILTER = "F"; //$NON-NLS-1$
-	private static final String AB_CONNECTOR_SERVICE = "CS"; //$NON-NLS-1$
-	private static final String AB_PROFILE = "PRF"; //$NON-NLS-1$
-
-	private Pattern period = Pattern.compile("\\."); //$NON-NLS-1$
-	private Pattern suffixPattern = Pattern.compile("_(\\d+)$"); //$NON-NLS-1$
-	private Pattern unicodePattern = Pattern.compile("#(\\p{XDigit}+)#"); //$NON-NLS-1$
-
-	private Map typeQualifiers = getTypeQualifiers();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#getSavedProfileNames()
-	 */
-	public String[] getSavedProfileNames() {
-		List names = new Vector(10);
-		IFolder providerFolder = getProviderFolder();
-		try {
-			IResource[] profileCandidates = providerFolder.members();
-			for (int i = 0; i < profileCandidates.length; i++) {
-				IResource profileCandidate = profileCandidates[i];
-				if (profileCandidate.getType() == IResource.FOLDER) {
-					String candidateName = profileCandidate.getName();
-					String[] parts = split(candidateName, 2);
-					if (parts[0].equals(AB_PROFILE)) {
-						String name = thaw(parts[1]);
-						names.add(name);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		String[] result = new String[names.size()];
-		names.toArray(result);
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#saveRSEDOM(org.eclipse.rse.persistence.dom.RSEDOM, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean saveRSEDOM(RSEDOM dom, IProgressMonitor monitor) {
-		IFolder providerFolder = getProviderFolder();
-		try {
-			int n = countNodes(dom);
-			if (monitor != null) monitor.beginTask(Messages.PropertyFileProvider_SavingTaskName, n);
-			saveNode(dom, providerFolder, monitor);
-			if (monitor != null) monitor.done();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#deleteProfile(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus deleteProfile(String profileName, IProgressMonitor monitor) {
-		IStatus result = Status.OK_STATUS;
-		IFolder profileFolder = getProfileFolder(profileName);
-		if (profileFolder.exists()) {
-			try {
-				profileFolder.delete(IResource.FORCE, monitor);
-			} catch (CoreException e) {
-				result = new Status(IStatus.ERROR, null, 0, Messages.PropertyFileProvider_UnexpectedException, e);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Saves a node from the DOM to the file system.
-	 * @param node The node to save.
-	 * @param parentFolder The folder in which to save this node. The node will be a
-	 * subfolder of this folder.
-	 * @param monitor The progress monitor. If the monitor has been cancel then
-	 * this method will do nothing and return null.
-	 * @return The name of the folder saving this node. Can be used for constructing 
-	 * references to children. May return null if the monitor has been canceled.
-	 */
-	private String saveNode(RSEDOMNode node, IFolder parentFolder, IProgressMonitor monitor) {
-		if (monitor != null && monitor.isCanceled()) return null;
-		String nodeFolderName = getSaveFolderName(node);
-		IFolder nodeFolder = getFolder(parentFolder, nodeFolderName);
-		Properties properties = getProperties(node, false, monitor);
-		RSEDOMNode[] children = node.getChildren();
-		Set childFolderNames = new HashSet();
-		for (int i = 0; i < children.length; i++) {
-			RSEDOMNode child = children[i];
-			String index = getIndexString(i);
-			if (!isNodeEmbedded(child)) {
-				String key = combine(MT_REFERENCE[0], index);
-				String childFolderName = saveNode(child, nodeFolder, monitor);
-				if (childFolderName != null) properties.put(key, childFolderName);
-				childFolderNames.add(childFolderName);
-			}
-		}
-		removeFolders(nodeFolder, childFolderNames);
-		String propertiesFileName = PROPERTIES_FILE_NAME;
-		IFile propertiesFile = nodeFolder.getFile(propertiesFileName);
-		writeProperties(properties, "RSE DOM Node", propertiesFile); //$NON-NLS-1$
-		return nodeFolderName;
-	}
-
-	/**
-	 * Removes childFolders from the parent folder that are not in the keep set.
-	 * Typically used to clean renamed nodes from the tree on a save operation.
-	 * @param parentFolder The folder whose subfolders are to be examined.
-	 * @param keepSet The names of the folders that should be kept. Others are discarded.
-	 */
-	private void removeFolders(IFolder parentFolder, Set keepSet) {
-		try {
-			IResource[] children = parentFolder.members();
-			for (int i = 0; i < children.length; i++) {
-				IResource child = children[i];
-				if (child.getType() == IResource.FOLDER) {
-					String childFolderName = child.getName();
-					if (!keepSet.contains(childFolderName)) {
-						child.delete(true, null);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns the name of a folder that can be used to store a node of a particular 
-	 * type. Since this is a folder, its name must conform to the rules of the file
-	 * system. The names are derived from the name and type of the node. Note that the 
-	 * actual name of the node is also stored as a property so we need not attempt
-	 * to recover the node name from the folder name.
-	 * @param node The node that will eventually be stored in this folder.
-	 * @return The name of the folder to store this node.
-	 */
-	private String getSaveFolderName(RSEDOMNode node) {
-		String type = node.getType();
-		type = (String) typeQualifiers.get(type);
-		String name = node.getName();
-		name = freeze(name);
-		String result = combine(type, name);
-		return result;
-	}
-
-	private static final String VALID = "abcdefghijklmnopqrstuvwxyz0123456789-._"; //$NON-NLS-1$
-	private static final String UPPER = "ABCDEFGHIJKLMNOPQRTSUVWXYZ"; //$NON-NLS-1$
-
-	/**
-	 * Transforms an arbitrary name into one that can be used in any file system
-	 * that supports long names. The transformation appends a number to the name
-	 * that captures the case of the letters in the name. If a character falls
-	 * outside the range of understood characters, it is converted to its hexadecimal unicode
-	 * equivalent. Spaces are converted to underscores.
-	 * @param name The name to be transformed
-	 * @return The transformed name
-	 * @see #thaw(String)
-	 */
-	private String freeze(String name) {
-		int p = name.indexOf(':');
-		if (p >= 0) {
-			name = name.substring(p + 1);
-		}
-		StringBuffer buf = new StringBuffer(name.length());
-		char[] chars = name.toCharArray();
-		long suffix = 0;
-		for (int i = 0; i < chars.length; i++) {
-			char c = chars[i];
-			suffix *= 2;
-			if (VALID.indexOf(c) >= 0) {
-				buf.append(c);
-			} else if (UPPER.indexOf(c) >= 0) { // if uppercase
-				buf.append(Character.toLowerCase(c));
-				suffix += 1;
-			} else if (c == ' ') { // if space
-				buf.append('_');
-				suffix += 1;
-			} else { // if out of range
-				buf.append('#');
-				buf.append(Integer.toHexString(c));
-				buf.append('#');
-			}
-		}
-		name = buf.toString() + "_" + Long.toString(suffix); //$NON-NLS-1$
-		return name;
-	}
-
-	/**
-	 * Recovers an arbitrary name from its frozen counterpart.
-	 * @param name The name to be transformed
-	 * @return The transformed name
-	 * @see #freeze(String)
-	 */
-	private String thaw(String name) {
-		String result = name;
-		Matcher m = suffixPattern.matcher(name);
-		if (m.find()) {
-			String root = name.substring(0, m.start());
-			String suffix = m.group(1);
-			long caseCode = Long.parseLong(suffix);
-			root = thawUnicode(root);
-			root = thawCase(root, caseCode);
-			result = root;
-		}
-		return result;
-	}
-
-	private String thawUnicode(String name) {
-		Matcher m = unicodePattern.matcher(name);
-		StringBuffer b = new StringBuffer();
-		int p0 = 0;
-		while (m.find()) {
-			int p1 = m.start();
-			String chunk0 = name.substring(p0, p1);
-			String digits = m.group(1);
-			int codePoint = Integer.valueOf(digits, 16).intValue();
-			char ch = (char) codePoint;
-			String chunk1 = Character.toString(ch);
-			b.append(chunk0);
-			b.append(chunk1);
-			p0 = m.end();
-		}
-		b.append(name.substring(p0));
-		String result = b.toString();
-		return result;
-	}
-
-	private String thawCase(String name, long caseCode) {
-		StringBuffer b = new StringBuffer();
-		char[] chars = name.toCharArray();
-		for (int i = chars.length - 1; i >= 0; i--) {
-			char ch = chars[i];
-			boolean shift = (caseCode & 1L) == 1;
-			if (shift) {
-				ch = (ch == '_') ? ' ' : Character.toUpperCase(ch);
-			}
-			b.append(ch);
-			caseCode = caseCode >> 1;
-		}
-		String result = b.reverse().toString();
-		return result;
-	}
-
-	private Map getTypeQualifiers() {
-		Map typeQualifiers = new HashMap();
-		typeQualifiers.put(IRSEDOMConstants.TYPE_CONNECTOR_SERVICE, AB_CONNECTOR_SERVICE);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_FILTER, AB_FILTER);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_FILTER_POOL, AB_FILTER_POOL);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_FILTER_POOL_REFERENCE, AB_FILTER_POOL_REFERENCE);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_FILTER_STRING, AB_FILTER_STRING);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_HOST, AB_HOST);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_PROFILE, AB_PROFILE);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_PROPERTY, AB_PROPERTY);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_PROPERTY_SET, AB_PROPERTY_SET);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_SERVER_LAUNCHER, AB_SERVICE_LAUNCHER);
-		typeQualifiers.put(IRSEDOMConstants.TYPE_SUBSYSTEM, AB_SUBSYSTEM);
-		return typeQualifiers;
-	}
-
-	/**
-	 * Write a set of properties to a file.
-	 * @param properties The Properties object to write.
-	 * @param header The header to include in the properties file.
-	 * @param file The IFile which will contain the properties.
-	 * @param monitor The progress monitor.
-	 */
-	private void writeProperties(Properties properties, String header, IFile file) {
-		//		System.out.println("writing "+file.getFullPath()+"...");
-		ByteArrayOutputStream outStream = new ByteArrayOutputStream(500);
-		PrintWriter out = new PrintWriter(outStream);
-		out.println("# " + header); //$NON-NLS-1$
-		Map map = new TreeMap(properties);
-		Set keys = map.keySet();
-
-		for (Iterator z = keys.iterator(); z.hasNext();) {
-			String key = (String) z.next();
-			String value = (String) map.get(key);
-			String keyvalue = key + "=" + escapeValue(value); //$NON-NLS-1$
-			//			System.out.println("writing "+keyvalue);
-			out.println(keyvalue);
-		}
-		out.close();
-		//		System.out.println("...wrote "+file.getFullPath());
-		ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray());
-		try {
-			if (!file.exists()) {
-				file.create(inStream, true, null);
-			} else {
-				file.setContents(inStream, true, true, null);
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Tests if a node's definition should be embedded in its parent's definition or
-	 * if it should be a separate definition. The test is usually based on node type.
-	 * Currently only filter strings are embedded in their parent filter definition.
-	 * @param node The node to be tested.
-	 * @return true if the node is to be embedded.
-	 */
-	private boolean isNodeEmbedded(RSEDOMNode node) {
-		Set embeddedTypes = new HashSet();
-		embeddedTypes.add(IRSEDOMConstants.TYPE_FILTER);
-		embeddedTypes.add(IRSEDOMConstants.TYPE_CONNECTOR_SERVICE);
-		boolean result = embeddedTypes.contains(node.getType());
-		return result;
-	}
-
-	/**
-	 * Transforms an integer into its five digit counterpart complete with leading 
-	 * zeroes.
-	 * @param i an integer from 0 to 99999.
-	 * @return a string equivalent from "00000" to "99999"
-	 */
-	private String getIndexString(int i) {
-		assert (i >= 0 && i <= 99999);
-		String index = "00000" + Integer.toString(i); //$NON-NLS-1$
-		index = index.substring(index.length() - 5);
-		return index;
-	}
-
-	/**
-	 * "Fixes" a value. Values in Properties objects may not be null. Changes all
-	 * null values to the string "null" and escapes the characters in other values.
-	 * @param value The value to check.
-	 * @return The fixed value
-	 */
-	private String fixValue(String value) {
-		if (value == null) return NULL_VALUE_STRING;
-		return value;
-	}
-
-	/**
-	 * Escapes the characters in the supplied string according to the rules
-	 * for properties files.
-	 * @param value The value to examine.
-	 * @return The equivalent value with escapes.
-	 */
-	private String escapeValue(String value) {
-		StringBuffer buffer = new StringBuffer(value.length() + 20);
-		char[] characters = value.toCharArray();
-		for (int i = 0; i < characters.length; i++) {
-			char c = characters[i];
-			if (c == '\\') {
-				buffer.append("\\\\"); //$NON-NLS-1$
-			} else if (c == '\t') {
-				buffer.append("\\t"); //$NON-NLS-1$
-			} else if (c == '\f') {
-				buffer.append("\\f"); //$NON-NLS-1$
-			} else if (c == '\n') {
-				buffer.append("\\n"); //$NON-NLS-1$
-			} else if (c == '\r') {
-				buffer.append("\\r"); //$NON-NLS-1$
-			} else if ((c < '\u0020' && c > '\u007E')) {
-				String cString = "0000" + Integer.toHexString(c); //$NON-NLS-1$
-				cString = cString.substring(cString.length() - 4);
-				cString = "\\u" + cString; //$NON-NLS-1$
-				buffer.append(cString);
-			} else if ("=!#:".indexOf(c) >= 0) { //$NON-NLS-1$
-				buffer.append('\\');
-				buffer.append(c);
-			} else {
-				buffer.append(c);
-			}
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * Constructs a properties object containing all the properties for this node.
-	 * The following properties exist:
-	 * name property, type property, embedded child properties, and referenced 
-	 * child properties. Each property has its own key format in the Properties
-	 * object.  
-	 * @param node The node to extract the properties from.
-	 * @param force Force children to be embedded rather than reference.
-	 * @param monitor The progress monitor. The work count is increased by one each time
-	 * this method is invoked.
-	 * @return The Properties object containing that node definition.
-	 */
-	private Properties getProperties(RSEDOMNode node, boolean force, IProgressMonitor monitor) {
-		Properties properties = new Properties();
-		properties.put(MT_NODE_NAME[0], node.getName());
-		properties.put(MT_NODE_TYPE[0], node.getType());
-		properties.putAll(getAttributes(node));
-		RSEDOMNode[] children = node.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			RSEDOMNode child = children[i];
-			String index = getIndexString(i);
-			if (force || isNodeEmbedded(child)) {
-				String prefix = combine(MT_CHILD[0], index);
-				Properties childProperties = getProperties(child, true, monitor);
-				Enumeration e = childProperties.keys();
-				while (e.hasMoreElements()) {
-					String key = (String) e.nextElement();
-					String value = childProperties.getProperty(key);
-					String newKey = combine(prefix, key);
-					properties.put(newKey, value);
-				}
-			}
-		}
-		if (monitor != null) monitor.worked(1);
-		return properties;
-	}
-
-	/**
-	 * Constructs a Properties object from the attributes present in a DOM node.
-	 * @param node The node containing the attributes. Keys for attributes are of the
-	 * form "attribute.[attribute-name]". If the attribute has a type then there
-	 * will also be an "attribute-type.[attribute-name]" property.
-	 * [attribute-name] may contain periods but must not be null.
-	 * @return The newly constructed Properties object.
-	 */
-	private Properties getAttributes(RSEDOMNode node) {
-		Properties properties = new Properties();
-		RSEDOMNodeAttribute[] attributes = node.getAttributes();
-		for (int i = 0; i < attributes.length; i++) {
-			RSEDOMNodeAttribute attribute = attributes[i];
-			String attributeName = attribute.getKey();
-			String propertyKey = combine(MT_ATTRIBUTE[0], attributeName);
-			properties.put(propertyKey, fixValue(attribute.getValue()));
-			String attributeType = attribute.getType();
-			if (attributeType != null) {
-				propertyKey = combine(MT_ATTRIBUTE_TYPE[0], attributeName);
-				properties.put(propertyKey, attributeType);
-			}
-		}
-		return properties;
-	}
-
-	/**
-	 * Count the number of nodes in a tree rooted in the supplied node. The
-	 * supplied node is counted so the mininum result is one.
-	 * @param node The root of the tree.
-	 * @return The node count.
-	 */
-	private int countNodes(RSEDOMNode node) {
-		RSEDOMNode[] children = node.getChildren();
-		int result = 1;
-		for (int i = 0; i < children.length; i++) {
-			RSEDOMNode child = children[i];
-			result += countNodes(child);
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#loadRSEDOM(org.eclipse.rse.model.ISystemProfileManager, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RSEDOM loadRSEDOM(String profileName, IProgressMonitor monitor) {
-		RSEDOM dom = null;
-		IFolder profileFolder = getProfileFolder(profileName);
-		if (profileFolder.exists()) {
-			//System.out.println("loading from " + profileFolder.getFullPath().toString() + "...");
-			int n = countPropertiesFiles(profileFolder);
-			if (monitor != null) monitor.beginTask(Messages.PropertyFileProvider_LoadingTaskName, n);
-			dom = (RSEDOM) loadNode(null, profileFolder, monitor);
-			if (monitor != null) monitor.done();
-		} else {
-			//System.out.println(profileFolder.getFullPath().toString() + " does not exist.");
-		}
-		return dom;
-	}
-
-	/**
-	 * Counts the number of properties files in this folder and below. This provides
-	 * a lower bound to the number of nodes that have to be created from this 
-	 * persistent form of a DOM.
-	 * @param folder
-	 * @return the number of properties files found.
-	 */
-	private int countPropertiesFiles(IFolder folder) {
-		int result = 0;
-		IFile propertiesFile = folder.getFile(PROPERTIES_FILE_NAME);
-		if (propertiesFile.exists()) {
-			result += 1;
-			try {
-				IResource[] members = folder.members();
-				for (int i = 0; i < members.length; i++) {
-					IResource member = members[i];
-					if (member.getType() == IResource.FOLDER) {
-						IFolder childFolder = (IFolder) member;
-						result += countPropertiesFiles(childFolder);
-					}
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Loads a node from a folder.
-	 * @param parent The parent of the node to be created. If null then this node is assumed to
-	 * be a DOM root node (RSEDOM).
-	 * @param nodeFolder The folder in which the node.properties file of this node is found.
-	 * @param monitor The monitor used to report progress and cancelation. If the monitor is
-	 * in canceled state then it this does method does nothing and returns null. If the monitor
-	 * is not canceled then its work count is incremented by one.
-	 * @return The newly loaded node.
-	 */
-	private RSEDOMNode loadNode(RSEDOMNode parent, IFolder nodeFolder, IProgressMonitor monitor) {
-		RSEDOMNode node = null;
-		if (monitor == null || !monitor.isCanceled()) {
-			Properties properties = loadProperties(nodeFolder);
-			if (properties != null) {
-				node = makeNode(parent, nodeFolder, properties, monitor);
-			}
-			if (monitor != null) monitor.worked(1);
-		}
-		return node;
-	}
-
-	/**
-	 * Loads the properties found in the folder. Returns null if no properties
-	 * file was found.
-	 * @param folder The folder in which to look for properties.
-	 * @return The Properties object.
-	 */
-	private Properties loadProperties(IFolder folder) {
-		Properties properties = null;
-		IFile attributeFile = folder.getFile(PROPERTIES_FILE_NAME);
-		if (attributeFile.exists()) {
-			properties = new Properties();
-			try {
-				InputStream inStream = attributeFile.getContents();
-				try {
-					properties.load(inStream);
-					inStream.close();
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return properties;
-	}
-
-	/**
-	 * Makes a new RSEDOMNode from a set of properties. The properties must (at least) include
-	 * a "name" property and a "type" property. Any child nodes are created and attached as well.
-	 * @param parent The parent node of the node to be created.
-	 * @param nodeFolder The folder in which referenced child folders can be found. This will
-	 * almost always be the folder in which the properties for the node to be created were found.
-	 * @param properties The properties from which to create the node.
-	 * @param monitor a monitor to support cancelation and progress reporting.
-	 * @return the newly created DOM node and its children.
-	 */
-	private RSEDOMNode makeNode(RSEDOMNode parent, IFolder nodeFolder, Properties properties, IProgressMonitor monitor) {
-		String nodeType = getProperty(properties, MT_NODE_TYPE);
-		String nodeName = getProperty(properties, MT_NODE_NAME);
-		RSEDOMNode node = (parent == null) ? new RSEDOM(nodeName) : new RSEDOMNode(parent, nodeType, nodeName);
-		node.setRestoring(true);
-		Set keys = properties.keySet();
-		Map attributes = new HashMap();
-		Map attributeTypes = new HashMap();
-		Map childPropertiesMap = new HashMap();
-		Set childNames = new TreeSet(); // child names are 5 digit strings, a tree set is used to maintain ordering
-		Set referenceKeys = new TreeSet(); // ditto for reference keys, "<reference-metatype>.<index>"
-		// since the properties are in no particular  order, we make a first pass to gather info on what's there
-		for (Iterator z = keys.iterator(); z.hasNext();) {
-			String key = (String) z.next();
-			String[] words = split(key, 2);
-			String metatype = words[0];
-			if (find(metatype, MT_ATTRIBUTE)) {
-				String value = properties.getProperty(key);
-				attributes.put(words[1], value);
-			} else if (find(metatype, MT_ATTRIBUTE_TYPE)) {
-				String type = properties.getProperty(key);
-				attributeTypes.put(words[1], type);
-			} else if (find(metatype, MT_REFERENCE)) {
-				referenceKeys.add(key);
-			} else if (find(metatype, MT_CHILD)) {
-				String value = properties.getProperty(key);
-				words = split(words[1], 2);
-				String childName = words[0];
-				childNames.add(childName);
-				String newKey = words[1];
-				Properties p = getProperties(childPropertiesMap, childName);
-				p.put(newKey, value);
-			}
-		}
-		Set attributeNames = attributes.keySet();
-		for (Iterator z = attributeNames.iterator(); z.hasNext();) {
-			String attributeName = (String) z.next();
-			String attributeValue = (String) attributes.get(attributeName);
-			if (attributeValue.equals(NULL_VALUE_STRING)) attributeValue = null;
-			String attributeType = (String) attributeTypes.get(attributeName);
-			node.addAttribute(attributeName, attributeValue, attributeType);
-		}
-		for (Iterator z = childNames.iterator(); z.hasNext();) {
-			String childName = (String) z.next();
-			Properties p = getProperties(childPropertiesMap, childName);
-			makeNode(node, nodeFolder, p, monitor);
-		}
-		for (Iterator z = referenceKeys.iterator(); z.hasNext();) {
-			String key = (String) z.next();
-			String childFolderName = properties.getProperty(key);
-			IFolder childFolder = getFolder(nodeFolder, childFolderName);
-			loadNode(node, childFolder, monitor);
-		}
-		node.setRestoring(false);
-		return node;
-	}
-
-	/**
-	 * Gets a property given a "multi-key"
-	 * @param properties The properties object to search
-	 * @param keys the "multi-key" for that property
-	 * @return The first property found using one of the elements of the multi-key.
-	 */
-	private String getProperty(Properties properties, String[] keys) {
-		String result = null;
-		for (int i = 0; i < keys.length && result == null; i++) {
-			String key = keys[i];
-			result = properties.getProperty(key);
-		}
-		return result;
-	}
-
-	/**
-	 * Finds a key (needle) in an array of values (the haystack)
-	 * @param needle The value to look for
-	 * @param haystack the values to search
-	 * @return true if the value was found
-	 */
-	private boolean find(String needle, String[] haystack) {
-		for (int i = 0; i < haystack.length; i++) {
-			String value = haystack[i];
-			if (value.equals(needle)) return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns a Properties object from the given Map that holds them using the 
-	 * selector String. Creates a new Properties object and places it in the map
-	 * if one does not exist for the selector.
-	 * @param propertiesMap The map in which to look for Properties objects.
-	 * @param selector The name of the Properties object
-	 * @return a Properties object.
-	 */
-	private Properties getProperties(Map propertiesMap, String selector) {
-		Properties p = (Properties) propertiesMap.get(selector);
-		if (p == null) {
-			p = new Properties();
-			propertiesMap.put(selector, p);
-		}
-		return p;
-	}
-
-	/**
-	 * Returns the IFolder in which this persistence provider stores its profiles.
-	 * This will create the folder if the folder was not found.
-	 * @return The folder that was created or found.
-	 */
-	private IFolder getProviderFolder() {
-		IProject project = RSEPersistenceManager.getRemoteSystemsProject();
-		try {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		} catch (Exception e) {
-		}
-		//IFolder providerFolder = getFolder(project, "org.eclipse.rse.dom.properties");
-		IFolder providerFolder = getFolder(project, "dom.properties"); //$NON-NLS-1$
-		return providerFolder;
-	}
-
-	/**
-	 * Returns the IFolder in which a profile is stored. 
-	 * @return The folder that was created or found.
-	 */
-	private IFolder getProfileFolder(String profileName) {
-		String profileFolderName = combine(AB_PROFILE, freeze(profileName));
-		IFolder providerFolder = getProviderFolder();
-		IFolder profileFolder = getFolder(providerFolder, profileFolderName);
-		return profileFolder;
-	}
-
-	/**
-	 * Returns the specified folder of the parent container. If the folder does
-	 * not exist it creates it.
-	 * @param parent the parent container - typically a project or folder
-	 * @param name the name of the folder to find or create
-	 * @return the found or created folder
-	 */
-	private IFolder getFolder(IContainer parent, String name) {
-		IPath path = new Path(name);
-		IFolder folder = parent.getFolder(path);
-		if (!folder.exists()) {
-			try {
-				folder.create(IResource.NONE, true, null);
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return folder;
-	}
-
-	/**
-	 * Convenience method to combine two names into one. The individual names in the
-	 * combined name are separated by periods.
-	 * @param typeName The first name.
-	 * @param nodeName The second name
-	 * @return the combined name.
-	 */
-	private String combine(String typeName, String nodeName) {
-		return combine(new String[] { typeName, nodeName });
-	}
-
-	/**
-	 * The generic method for creating a qualified name from a string of segments.
-	 * The individual names are separated by periods.
-	 * @param names The names to combine
-	 * @return The combined name.
-	 */
-	private String combine(String[] names) {
-		StringBuffer buf = new StringBuffer(100);
-		for (int i = 0; i < names.length; i++) {
-			String name = names[i];
-			if (i > 0) buf.append('.');
-			buf.append(name);
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Splits a combined name into its component parts. The period is used as the name 
-	 * separator. If a limit > 0 is specified the return value will contain at most that
-	 * number of segments. The last segment may, in fact, be split some more.
-	 * @param longName The name to be split
-	 * @param limit The number of parts to split the name into.
-	 * @return The parts of the name.
-	 */
-	private String[] split(String longName, int limit) {
-		return period.split(longName, limit);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
deleted file mode 100644
index c7dd044a1..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
+++ /dev/null
@@ -1,438 +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.internal.persistence;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.rse.core.RSECorePlugin;
-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.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.SystemFilterPoolManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemHostPool;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.persistence.dom.RSEDOMExporter;
-import org.eclipse.rse.internal.persistence.dom.RSEDOMImporter;
-import org.eclipse.rse.logging.Logger;
-import org.eclipse.rse.persistence.IRSEPersistenceManager;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-
-/**
- * The persistence manager controls all aspects of persisting the RSE data model. It will both
- * save and restore this model. There should be only persistence manager in existence. This instance
- * can be retrieved using RSEUIPlugin.getThePersistenceManager.
- * @see RSECorePlugin#getThePersistenceManager() 
- */
-public class RSEPersistenceManager implements IRSEPersistenceManager {
-
-	private static final int STATE_NONE = 0;
-	private static final int STATE_IMPORTING = 1;
-	private static final int STATE_EXPORTING = 2;
-
-	private Map loadedProviders = new HashMap(10);
-	private int _currentState = STATE_NONE;
-	private RSEDOMExporter _exporter;
-	private RSEDOMImporter _importer;
-
-	private static IProject remoteSystemsProject = null;
-	public static final String RESOURCE_PROJECT_NAME = "RemoteSystemsConnections"; //$NON-NLS-1$
-
-	//  private ISystemRegistry _registry;
-	private ISystemProfileManager _profileManager;
-
-	public RSEPersistenceManager(ISystemRegistry registry) {
-		//		_registry = registry;
-		_profileManager = registry.getSystemProfileManager();
-		_exporter = RSEDOMExporter.getInstance();
-		_exporter.setSystemRegistry(registry);
-		_importer = RSEDOMImporter.getInstance();
-		_importer.setSystemRegistry(registry);
-	}
-
-	/**
-	 * Get the default remote systems project.
-	 * @return IProject handle of the project. Use exists() to test existence.
-	 */
-	public static IProject getRemoteSystemsProject() {
-		if (remoteSystemsProject == null) {
-			remoteSystemsProject = ResourcesPlugin.getWorkspace().getRoot().getProject(RESOURCE_PROJECT_NAME);
-		}
-		return remoteSystemsProject;
-	}
-
-	public void registerRSEPersistenceProvider(String id, IRSEPersistenceProvider provider) {
-		loadedProviders.put(id, provider);
-	}
-
-	/**
-	 * Returns the persistence provider denoted by the id. Only one instance of this 
-	 * persistence provider is created.
-	 * @param id The id of the persistence provider, as denoted by the id attribute on its declaration.
-	 * @return an IRSEPersistenceProvider which may be null if this id is not found.
-	 */
-	public IRSEPersistenceProvider getRSEPersistenceProvider(String id) {
-		Logger logger = RSECorePlugin.getDefault().getLogger();
-		IRSEPersistenceProvider provider = (IRSEPersistenceProvider) loadedProviders.get(id);
-		if (provider == null) {
-			IExtensionRegistry registry = Platform.getExtensionRegistry();
-			IConfigurationElement[] providerCandidates = registry.getConfigurationElementsFor("org.eclipse.rse.core", "persistenceProviders"); //$NON-NLS-1$ //$NON-NLS-2$
-			for (int j = 0; j < providerCandidates.length; j++) {
-				IConfigurationElement providerCandidate = providerCandidates[j];
-				if (providerCandidate.getName().equals("persistenceProvider")) { //$NON-NLS-1$
-					String candidateId = providerCandidate.getAttribute("id"); //$NON-NLS-1$
-					if (candidateId != null) {
-						if (candidateId.equals(id)) {
-							try {
-								provider = (IRSEPersistenceProvider) providerCandidate.createExecutableExtension("class"); //$NON-NLS-1$
-							} catch (CoreException e) {
-								logger.logError("Exception loading persistence provider", e); //$NON-NLS-1$
-							}
-						}
-					} else {
-						logger.logError("Missing id attribute in persistenceProvider element", null); //$NON-NLS-1$
-					}
-				} else {
-					logger.logError("Invalid element in persistenceProviders extension point", null); //$NON-NLS-1$
-				}
-			}
-			if (provider == null) {
-				logger.logError("Persistence provider not found.", null); //$NON-NLS-1$
-			}
-			loadedProviders.put(id, provider); // even if provider is null
-		}
-		return provider;
-	}
-
-	/**
-	 * @return the default IRSEPersistenceProvider for this installation.
-	 * TODO: need to determine what this is. Having more than one is problematic.
-	 */
-	public IRSEPersistenceProvider getRSEPersistenceProvider() {
-		IRSEPersistenceProvider provider = getRSEPersistenceProvider("org.eclipse.rse.persistence.PropertyFileProvider"); //$NON-NLS-1$
-		return provider;
-	}
-
-	public boolean restore(ISystemProfileManager profileManager) {
-		return load(profileManager);
-	}
-
-	/**
-	 * Restore a profile of a given name from disk...
-	 */
-	protected ISystemProfile restoreProfile(ISystemProfileManager mgr, String name) throws Exception {
-		/*
-		 * FIXME String fileName = mgr.getRootSaveFileName(name); java.util.List
-		 * ext = null;//FIXME
-		 * getMOFHelpers().restore(SystemResourceManager.getProfileFolder(name),fileName);
-		 *  // should be exactly one profile... Iterator iList = ext.iterator();
-		 * SystemProfile profile = (SystemProfile)iList.next();
-		 * mgr.initialize(profile, name); return profile;
-		 */
-		return null;
-	}
-
-	/**
-	 * Save all profiles to disk
-	 */
-	public boolean commit(ISystemProfileManager profileManager) {
-
-		ISystemProfile[] profiles = profileManager.getSystemProfiles();
-		for (int idx = 0; idx < profiles.length; idx++) {
-			try {
-				commit(profiles[idx]);
-			} catch (Exception exc) {
-				Logger logger = RSECorePlugin.getDefault().getLogger();
-				String profileName = profiles[idx].getName();
-				String message = "Error saving profile " + profileName; //$NON-NLS-1$
-				logger.logError(message, exc);
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public boolean restore(ISystemHostPool connectionPool) {
-		return false;
-	}
-
-	/**
-	 * Restore a connection of a given name from disk...
-	 */
-	protected IHost restoreHost(ISystemHostPool hostPool, String connectionName) throws Exception {
-		/*
-		 * FIXME //System.out.println("in SystemConnectionPoolImpl#restore for
-		 * connection " + connectionName); String fileName =
-		 * getRootSaveFileName(connectionName);
-		 * //System.out.println(".......fileName = " + fileName);
-		 * //System.out.println(".......folderName = " +
-		 * getConnectionFolder(connectionName).getName()); java.util.List ext =
-		 * getMOFHelpers().restore(getConnectionFolder(connectionName),fileName);
-		 *  // should be exactly one profile... Iterator iList = ext.iterator();
-		 * SystemConnection connection = (SystemConnection)iList.next(); if
-		 * (connection != null) { if
-		 * (!connection.getAliasName().equalsIgnoreCase(connectionName)) {
-		 * RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Incorrect
-		 * alias name found in connections.xmi file for " + connectionName+".
-		 * Name was reset"); connection.setAliasName(connectionName); // just in
-		 * case! } internalAddConnection(connection); } return connection;
-		 */
-		return null;
-	}
-
-	public boolean commit(ISystemHostPool connectionPool) {
-		if (connectionPool.isDirty()) {
-			commit(connectionPool.getSystemProfile());
-			connectionPool.setDirty(false);
-		}
-		/*
-		 Host[] connections = connectionPool.getHosts();
-		 for (int idx = 0; idx < connections.length; idx++)
-		 {
-		 if (!saveHost(connectionPool, connections[idx]))
-		 {
-		 return false;
-		 }
-		 }
-		 return true;
-		 */
-		return false; // all persistence should be at profile level
-	}
-
-	public boolean commit(ISystemFilterPoolManager filterPoolManager) {
-		if (filterPoolManager.isDirty()) {
-			commit(filterPoolManager.getSystemProfile());
-			filterPoolManager.setDirty(false);
-		}
-		return false;
-	}
-
-	public boolean commit(ISystemFilterPool filterPool) {
-		if (filterPool.isDirty()) {
-			commit(filterPool.getSystemFilterPoolManager().getSystemProfile());
-			filterPool.setDirty(false);
-		}
-		return false;
-	}
-
-	public boolean restore(ISystemFilterPool filterPool) {
-		//System.out.println("restore filterpool");
-		// DWD function Is this method really needed?
-		return false;
-	}
-
-	public boolean commit(ISystemFilter filter) {
-		// System.out.println("commit filter");
-		// DWD function Is this method really needed?
-		/*
-		 if (filter.isDirty())
-		 {
-		 System.out.println("saving filter: "+filter.getName());
-		 filter.setDirty(false);
-		 }
-		 */
-		/* FIXME
-		 //initMOF();  assume caller did this!
-		 String fileName = getRootSaveFileName(this);
-		 IFolder folder = getFolder(this);
-		 getMOFHelpers().save(folder,fileName, this);        
-		 */
-		return false;
-	}
-
-	public ISystemFilterPool restoreFilterPool(String name) {
-		//System.out.println("restore filter pool "+name);
-		// DWD function is this method really needed?
-		return null;
-	}
-
-	public boolean commit(ISubSystem subSystem) {
-
-		if (subSystem.isDirty()) {
-			//	System.out.println("updated " + subSystem.getName());
-			try {
-				// commit everything for now
-				commit(_profileManager);
-				subSystem.setDirty(false);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			return true;
-		}
-
-		/*
-		 // FIXME
-		 if (subSystem.isDirty())
-		 {
-		 System.out.println("saving subsystem: "+subSystem.getName());
-		 }
-		 */
-		return false;
-	}
-
-	/**
-	 * Creates a filter pool manager for a particular SubSystemConfiguration and SystemProfile. Called
-	 * "restore" for historcal reasons.
-	 * @param profile the profile that will own this ISystemFilterPoolManager. There is one of these per profile.
-	 * @param logger the logging object for logging errors. Each ISystemFilterPoolManager has one of these.
-	 * @param caller The creator/owner of this ISystemFilterPoolManager, this ends up being a SubSystemConfiguration. 
-	 * @param name the name of the manager to restore. File name is derived from it when saving to one file.
-	 * @return the "restored" manager.
-	 */
-	public ISystemFilterPoolManager restoreFilterPoolManager(ISystemProfile profile, Logger logger, ISystemFilterPoolManagerProvider caller, String name) {
-		SystemFilterPoolManager mgr = SystemFilterPoolManager.createManager(profile);
-		mgr.initialize(logger, caller, name); // core data
-		mgr.setWasRestored(false); // managers are not "restored from disk" since they are not persistent of themselves
-		return mgr;
-	}
-
-	/**
-	 * Attempt to save single profile to disk.
-	 */
-	public boolean commit(ISystemProfile profile) {
-		if (profile != null) {
-			return save(profile, false);
-		}
-		return false;
-	}
-
-	public boolean commit(IHost host) {
-		return commit(host.getSystemProfile());
-	}
-
-	/**
-	 * Loads and restores RSE artifacts from the last session
-	 * @param profileManager
-	 * @return true if the profiles are loaded
-	 */
-	private boolean load(ISystemProfileManager profileManager) {
-		boolean successful = true;
-		if (isExporting() || isImporting()) {
-			successful = false;
-		} else {
-			_currentState = STATE_IMPORTING;
-			IProject project = getRemoteSystemsProject();
-			try {
-				if (!project.isSynchronized(IResource.DEPTH_ONE)) project.refreshLocal(IResource.DEPTH_ONE, null);
-				IRSEPersistenceProvider persistenceProvider = getRSEPersistenceProvider();
-				String[] profileNames = persistenceProvider.getSavedProfileNames();
-				for (int i = 0; i < profileNames.length; i++) {
-					String profileName = profileNames[i];
-					RSEDOM dom = importRSEDOM(profileName);
-					if (dom != null) {
-						ISystemProfile restoredProfile = _importer.restoreProfile(profileManager, dom);
-						if (restoredProfile == null) {
-							successful = false;
-						}
-					} else {
-						successful = false;
-					}
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			_currentState = STATE_NONE;
-		}
-		return successful;
-	}
-
-	/**
-	 * Writes the RSE model to a DOM and schedules writing of that DOM to disk.
-	 * May, in fact, update an existing DOM instead of creating a new one.
-	 * If in the process of importing, skip writing.
-	 * @return true if the profile is written to a DOM
-	 */
-	private boolean save(ISystemProfile profile, boolean force) {
-		boolean result = false;
-		if (!isImporting()) {
-			_currentState = STATE_EXPORTING;
-			RSEDOM dom = exportRSEDOM(profile, true); // DWD should do merge, but does not handle deletes properly yet
-			_currentState = STATE_NONE;
-			result = true;
-			if (dom.needsSave()) {
-				Job job = dom.getSaveJob();
-				if (job == null) {
-					job = new SaveRSEDOMJob(dom, getRSEPersistenceProvider());
-					dom.setSaveJob(job);
-				}
-				job.schedule(3000); // five second delay
-			}
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceManager#deleteProfile(java.lang.String)
-	 */
-	public void deleteProfile(final String profileName) {
-		Job job = new Job(Messages.RSEPersistenceManager_DeleteProfileJobName) {
-			protected IStatus run(IProgressMonitor monitor) {
-				IRSEPersistenceProvider provider = getRSEPersistenceProvider();
-				IStatus result = provider.deleteProfile(profileName, monitor);
-				return result;
-			}
-		};
-		job.schedule();
-	}
-
-	public boolean isExporting() {
-		return _currentState == STATE_EXPORTING;
-	}
-
-	public boolean isImporting() {
-		return _currentState == STATE_IMPORTING;
-	}
-
-	//	public void setState(int state) {
-	//		_currentState = state;
-	//	}
-
-	private RSEDOM exportRSEDOM(ISystemProfile profile, boolean force) {
-		RSEDOM dom = _exporter.createRSEDOM(profile, force);
-		return dom;
-	}
-
-	private RSEDOM importRSEDOM(String domName) {
-		RSEDOM dom = null;
-		IRSEPersistenceProvider provider = getRSEPersistenceProvider();
-		if (provider != null) {
-			dom = provider.loadRSEDOM(domName, null);
-		} else {
-			Logger logger = RSECorePlugin.getDefault().getLogger();
-			logger.logError("Persistence provider is not available.", null); //$NON-NLS-1$
-		}
-		return dom;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java
deleted file mode 100644
index 27ab063d3..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java
+++ /dev/null
@@ -1,54 +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.internal.persistence;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-
-public class SaveRSEDOMJob extends WorkspaceJob {
-
-	private RSEDOM _dom;
-	private IRSEPersistenceProvider _provider;
-
-	public SaveRSEDOMJob(RSEDOM dom, IRSEPersistenceProvider provider) {
-		super("Saving Profile"); //$NON-NLS-1$
-		String title = MessageFormat.format(Messages.SaveRSEDOMJob_SavingProfileJobName, new Object[] { dom.getName() });
-		setName(title);
-		_dom = dom;
-		_provider = provider;
-	}
-
-	public IStatus runInWorkspace(IProgressMonitor monitor) {
-		IStatus result = Status.OK_STATUS;
-		synchronized (_dom) { // synchronize on the DOM to prevent its update while writing
-			if (_dom.needsSave()) {
-				_provider.saveRSEDOM(_dom, monitor);
-				_dom.markUpdated();
-			} else {
-				result = Status.CANCEL_STATUS;
-			}
-		}
-		return result;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
deleted file mode 100644
index a87e3a4dd..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
+++ /dev/null
@@ -1,165 +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.internal.persistence;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Vector;
-
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-
-/**
- * This is class is used to restore an RSE DOM from disk and import it into RSE.
- * @author dmcknigh
- *
- */
-public class SerializingProvider implements IRSEPersistenceProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#getSavedProfileNames()
-	 */
-	public String[] getSavedProfileNames() {
-		/*
-		 * We look for folders inside the RemoteSystemsConnections folder that contain
-		 * a single file named folderName.rsedom. We return the array of folder names.
-		 */
-		List names = new Vector(10);
-		try {
-			IProject project = RSEPersistenceManager.getRemoteSystemsProject();
-			IResource[] candidates = project.members();
-			for (int i = 0; i < candidates.length; i++) {
-				IResource candidate = candidates[i];
-				if (candidate.getType() == IResource.FOLDER) {
-					IFolder candidateFolder = (IFolder) candidate;
-					IResource[] children = candidateFolder.members();
-					if (children.length == 1) {
-						IResource child = children[0];
-						if (child.getType() == IResource.FILE) {
-							String profileName = candidateFolder.getName();
-							String domFileName = profileName + ".rsedom"; //$NON-NLS-1$
-							String childName = child.getName();
-							if (childName.equals(domFileName)) {
-								names.add(profileName);
-							}
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		String[] result = new String[names.size()];
-		names.toArray(result);
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#loadRSEDOM(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RSEDOM loadRSEDOM(String profileName, IProgressMonitor monitor) {
-		RSEDOM dom = null;
-		IFile profileFile = getProfileFile(profileName, monitor);
-		if (profileFile.exists()) {
-			//System.out.println("loading "+ profileFile.getLocation().toOSString() + "..."); // DWD debugging
-			try {
-				InputStream iStream = profileFile.getContents();
-
-				ObjectInputStream inStream = new ObjectInputStream(iStream);
-				dom = (RSEDOM) inStream.readObject();
-				inStream.close();
-			} catch (Exception e) {
-				e.printStackTrace();
-				try {
-					profileFile.delete(true, false, monitor);
-				} catch (Exception e2) {
-					e.printStackTrace();
-				}
-
-			}
-		}
-		return dom;
-	}
-
-	private IFile getProfileFile(String domName, IProgressMonitor monitor) {
-		IProject project = RSEPersistenceManager.getRemoteSystemsProject();
-
-		// before loading, make sure the project is in synch
-		try {
-			project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-		} catch (Exception e) {
-		}
-
-		IFolder folder = project.getFolder(domName);
-		if (!folder.exists()) {
-			try {
-				folder.create(true, true, monitor);
-			} catch (Exception e) {
-			}
-		}
-		return folder.getFile(domName + ".rsedom"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.persistence.IRSEPersistenceProvider#saveRSEDOM(org.eclipse.rse.persistence.dom.RSEDOM, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean saveRSEDOM(RSEDOM dom, IProgressMonitor monitor) {
-
-		IFile profileFile = getProfileFile(dom.getName(), monitor);
-		File osFile = profileFile.getLocation().toFile();
-		//	System.out.println("saving "+ osFile.getAbsolutePath() + "..."); // DWD debugging
-		try {
-			OutputStream oStream = new FileOutputStream(osFile);
-			ObjectOutputStream outStream = new ObjectOutputStream(oStream);
-			outStream.writeObject(dom);
-			outStream.close();
-			profileFile.getParent().refreshLocal(IResource.DEPTH_ONE, monitor);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-
-		return true;
-	}
-
-	public IStatus deleteProfile(String profileName, IProgressMonitor monitor) {
-		IStatus result = Status.OK_STATUS;
-		IFile profileFile = getProfileFile(profileName, monitor);
-		if (profileFile.exists()) {
-			try {
-				profileFile.delete(IResource.FORCE | IResource.KEEP_HISTORY, monitor);
-			} catch (CoreException e) {
-				result = new Status(IStatus.ERROR, null, 0, Messages.SerializingProvider_UnexpectedException, e);
-			}
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
deleted file mode 100644
index fb6743e18..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
+++ /dev/null
@@ -1,445 +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.internal.persistence.dom;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IPropertySet;
-import org.eclipse.rse.core.model.IPropertyType;
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.persistence.dom.IRSEDOMConstants;
-import org.eclipse.rse.persistence.dom.IRSEDOMExporter;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-import org.eclipse.rse.persistence.dom.RSEDOMNode;
-
-public class RSEDOMExporter implements IRSEDOMExporter {
-	private static RSEDOMExporter _instance = new RSEDOMExporter();
-	private Map _domMap;
-
-	//	private ISystemRegistry _registry;
-
-	/**
-	 * Constructor to create a new DOM exporter.
-	 */
-	protected RSEDOMExporter() {
-		_domMap = new HashMap();
-	}
-
-	public void setSystemRegistry(ISystemRegistry registry) {
-		//		_registry = registry;
-	}
-
-	/**
-	 * @return the singleton instance of this exporter
-	 */
-	public static RSEDOMExporter getInstance() {
-		return _instance;
-	}
-
-	/**
-	 * Returns the RSEDOM for this profile if it exists
-	 * @param profile the profile for which to get the DOM
-	 * @return the DOM for a particular profile, null if the DOM does not exist
-	 */
-	public RSEDOM getRSEDOM(ISystemProfile profile) {
-		return (RSEDOM) _domMap.get(profile);
-	}
-
-	/**
-	 * Creates the RSE DOM for this profile. After it has found the DOM it will 
-	 * synchronize on the DOM to ensure its integrity while it is being updated.
-	 * @param profile the profile for which to create the DOM
-	 * @param clean indicates whether to create from scratch or merge with existing DOM
-	 * @return The DOM for this profile
-	 */
-	public RSEDOM createRSEDOM(ISystemProfile profile, boolean clean) {
-		RSEDOM dom = getRSEDOM(profile);
-		if (dom == null) {
-			dom = new RSEDOM(profile);
-			_domMap.put(profile, dom);
-			clean = true;
-		}
-		synchronized (dom) {
-			populateRSEDOM(dom, profile, clean);
-		}
-		return dom;
-	}
-
-	/**
-	 * Creates an RSE DOM for use in persistence
-	 * @param dom the root node for the target DOM
-	 * @param profile the profile from which to populate the DOM
-	 * @param clean indicates whether to create from scratch or merge with existing DOM
-	 * @return The DOM, updated with the data from the profile
-	 */
-	public RSEDOM populateRSEDOM(RSEDOM dom, ISystemProfile profile, boolean clean) {
-		// for now we do complete refresh
-		// clean dom for fresh creation
-		if (clean) {
-			dom.clearChildren();
-		}
-
-		if (clean || profile.isDirty() || dom.isDirty()) {
-			dom.clearAttributes();
-			dom.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT_PRIVATE, getBooleanString(profile.isDefaultPrivate()));
-			dom.addAttribute(IRSEDOMConstants.ATTRIBUTE_IS_ACTIVE, getBooleanString(profile.isActive()));
-		}
-
-		// create the dom using the profile
-
-		// create filter pool nodes
-		ISystemFilterPool[] filterPools = profile.getFilterPools();
-		for (int i = 0; i < filterPools.length; i++) {
-			ISystemFilterPool pool = filterPools[i];
-			createNode(dom, pool, clean);
-		}
-
-		// create hosts nodes 
-
-		// old nodes to compare with
-		List missingNodes = new ArrayList();
-		if (!clean) {
-			RSEDOMNode[] oldHostNodes = dom.getChildren(IRSEDOMConstants.TYPE_HOST);
-			for (int o = 0; o < oldHostNodes.length; o++) {
-				missingNodes.add(oldHostNodes[o]);
-			}
-		}
-
-		IHost[] hosts = profile.getHosts();
-		for (int j = 0; j < hosts.length; j++) {
-			IHost host = hosts[j];
-			RSEDOMNode hnode = createNode(dom, host, clean);
-
-			if (!clean) {
-				// remove this one from the missing list
-				missingNodes.remove(hnode);
-			}
-		}
-
-		if (!clean) {
-			// remaining missingNodes are probably deleted now
-			for (int x = 0; x < missingNodes.size(); x++) {
-				dom.removeChild((RSEDOMNode) missingNodes.get(x));
-			}
-		}
-
-		// create generic property set nodes
-		createPropertySetNodes(dom, profile, clean);
-		dom.setDirty(false);
-
-		return dom;
-	}
-
-	/**
-	 * Creates DOM nodes for each associated property set
-	 * @param parent The node of the DOM that needs a property set
-	 * @param modelObject the RSE model object that has the property set.
-	 * @param clean true if we are creating, false if we are merging
-	 * @return an array of DOM nodes - each one being a property set
-	 */
-	public RSEDOMNode[] createPropertySetNodes(RSEDOMNode parent, IRSEModelObject modelObject, boolean clean) {
-		IPropertySet[] propertySets = modelObject.getPropertySets();
-		for (int i = 0; i < propertySets.length; i++) {
-			IPropertySet set = propertySets[i];
-			RSEDOMNode node = new RSEDOMNode(parent, IRSEDOMConstants.TYPE_PROPERTY_SET, set.getName());
-			String[] keys = set.getPropertyKeys();
-			for (int k = 0; k < keys.length; k++) {
-				String key = keys[k];
-				String value = set.getPropertyValue(key);
-				IPropertyType type = set.getPropertyType(key);
-				node.addAttribute(key, value, type.toString());
-			}
-		}
-		return parent.getChildren();
-	}
-
-	/**
-	 * Create a DOM node representing a filter pool
-	 * @param parent the parent DOM node
-	 * @param filterPool the filter pool from which to create a DOM node linked to this parent
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node representing the filter pool
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterPool filterPool, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_FILTER_POOL, filterPool, clean);
-		if (clean || node.isDirty()) {
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE, filterPool.getType());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_ID, filterPool.getId());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_NESTED_FILTERS, getBooleanString(filterPool.supportsNestedFilters()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DELETABLE, getBooleanString(filterPool.isDeletable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT, getBooleanString(filterPool.isDefault()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filterPool.isSetStringsCaseSensitive()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filterPool.supportsDuplicateFilterStrings()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, Integer.toString(filterPool.getRelease()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filterPool.isSetSingleFilterStringOnly()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME, filterPool.getOwningParentName());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filterPool.isNonRenamable()));
-		}
-		ISystemFilter[] filters = filterPool.getSystemFilters();
-		for (int i = 0; i < filters.length; i++) {
-			createNode(node, filters[i], clean);
-		}
-		createPropertySetNodes(node, filterPool, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a filter
-	 * @param parent The parent DOM node for this filter, usually a DOM node for a filter pool
-	 * @param filter the filter for which to create a new node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node representing the filter
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, ISystemFilter filter, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_FILTER, filter, clean);
-		if (clean || node.isDirty()) {
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_ID, filter.getName());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_NESTED_FILTERS, getBooleanString(filter.isSupportsNestedFilters()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELATIVE_ORDER, Integer.toString(filter.getRelativeOrder()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT, getBooleanString(filter.isDefault()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filter.isSetStringsCaseSensitive()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_PROMPTABLE, getBooleanString(filter.isPromptable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filter.supportsDuplicateFilterStrings()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_DELETABLE, getBooleanString(filter.isNonDeletable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filter.isNonRenamable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_CHANGEABLE, getBooleanString(filter.isNonChangable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRINGS_NON_CHANGABLE, getBooleanString(filter.isStringsNonChangable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, Integer.toString(filter.getRelease()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filter.isSetSingleFilterStringOnly()));
-		}
-
-		// add nested filters
-		ISystemFilter[] nestedFilters = filter.getSystemFilters();
-		for (int i = 0; i < nestedFilters.length; i++) {
-			createNode(node, nestedFilters[i], clean);
-		}
-
-		// add filter strings
-		ISystemFilterString[] filterStrings = filter.getSystemFilterStrings();
-		for (int j = 0; j < filterStrings.length; j++) {
-			createNode(node, filterStrings[j], clean);
-		}
-
-		createPropertySetNodes(node, filter, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a filter string
-	 * @param parent the DOM node that is the parent to this filter string. This should be a node for a filter.
-	 * @param filterString The filter string for which the node will be created
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node for the filter string
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterString filterString, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_FILTER_STRING, filterString, clean);
-
-		if (clean || node.isDirty()) {
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING, filterString.getString());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE, filterString.getType());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT, getBooleanString(filterString.isDefault()));
-		}
-
-		createPropertySetNodes(node, filterString, clean);
-		return node;
-	}
-
-	/**
-	 * Create a DOM node representing a host
-	 * @param parent The DOM node that is the parent to this host, usually a node representing a profile
-	 * @param host The host for which to create the DOM node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node for the host
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, IHost host, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_HOST, host, clean);
-
-		if (clean || node.isDirty()) {
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE, host.getSystemType());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OFFLINE, getBooleanString(host.isOffline()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_PROMPTABLE, getBooleanString(host.isPromptable()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_HOSTNAME, host.getHostName());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DESCRIPTION, host.getDescription());
-		}
-
-		IConnectorService[] connectorServices = host.getConnectorServices();
-		for (int i = 0; i < connectorServices.length; i++) {
-			IConnectorService service = connectorServices[i];
-			createNode(node, service, clean);
-		}
-
-		createPropertySetNodes(node, host, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a connector service
-	 * @param parent the DOM node representing the parent for a connector service. This should be a Host
-	 * @param connectorService the connector service for which a DOM node is to be created
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node for the connector service
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, IConnectorService connectorService, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_CONNECTOR_SERVICE, connectorService, clean);
-		if (clean || node.isDirty()) {
-			// store it's attributes
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE, connectorService.getHostType());
-
-			// can't do this til connector service owns the properties (right now it's still subsystem)
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP, connectorService.getName());
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_USE_SSL, getBooleanString(connectorService.isUsingSSL()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_PORT, Integer.toString(connectorService.getPort()));
-		}
-		// store the server launcher
-		// right now subsystem still owns the server launchers
-		//   that will change later
-
-		IServerLauncherProperties serverLauncher = connectorService.getRemoteServerLauncherProperties();
-		if (serverLauncher != null) {
-			createNode(node, serverLauncher, clean);
-		}
-
-		// store each subsystem
-		ISubSystem[] subSystems = connectorService.getSubSystems();
-		for (int i = 0; i < subSystems.length; i++) {
-			createNode(node, subSystems[i], clean);
-		}
-
-		createPropertySetNodes(node, connectorService, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a server launcher
-	 * @param parent the DOM node represnting a parent for a server launcher, usually a connector service
-	 * @param serverLauncher the server launcher from which to create the node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the node representing the server launcher
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, IServerLauncherProperties serverLauncher, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_SERVER_LAUNCHER, serverLauncher, clean);
-
-		if (clean || node.isDirty()) {
-		}
-
-		serverLauncher.saveToProperties();
-		createPropertySetNodes(node, serverLauncher, clean);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a subsystem
-	 * @param parent the DOM node representing the parent for this subsystem, usually a connector service
-	 * @param subSystem the subsystem from which to create the DOM node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node representing the subsystem
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, ISubSystem subSystem, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_SUBSYSTEM, subSystem, clean);
-
-		if (clean || node.isDirty()) {
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_HIDDEN, getBooleanString(subSystem.isHidden()));
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE, subSystem.getSubSystemConfiguration().getId());
-		}
-
-		// create filter pool reference nodes 
-		ISystemFilterPoolReferenceManager refMgr = subSystem.getFilterPoolReferenceManager();
-		if (refMgr != null) {
-			ISystemFilterPoolReference[] references = refMgr.getSystemFilterPoolReferences();
-			for (int i = 0; i < references.length; i++) {
-				ISystemFilterPoolReference ref = references[i];
-				createNode(node, ref, clean);
-			}
-		}
-
-		createPropertySetNodes(node, subSystem, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * Creates a DOM node for a filter pool reference
-	 * @param parent the DOM node representing the parent for a filter pool reference, usually a subsystem
-	 * @param filterPoolReference the reference from which to create a new DOM node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node created for the filter pool reference
-	 */
-	public RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterPoolReference filterPoolReference, boolean clean) {
-		RSEDOMNode node = findOrCreateNode(parent, IRSEDOMConstants.TYPE_FILTER_POOL_REFERENCE, filterPoolReference, clean);
-
-		if (clean || node.isDirty()) {
-			ISystemFilterPool filterPool = filterPoolReference.getReferencedFilterPool();
-			String refId = (filterPool != null) ? filterPool.getId() : "unknown"; //$NON-NLS-1$
-			node.addAttribute(IRSEDOMConstants.ATTRIBUTE_REF_ID, refId);
-		}
-
-		createPropertySetNodes(node, filterPoolReference, clean);
-		node.setDirty(false);
-		return node;
-	}
-
-	/**
-	 * @param parent the DOM node representing the parent of the node we are trying to find
-	 * @param type the type of the DOM node to look for
-	 * @param modelObject the model object for which we are trying to find a matching node
-	 * @param clean true if we are creating, false if we are merging
-	 * @return the DOM node that we found or created
-	 */
-	private RSEDOMNode findOrCreateNode(RSEDOMNode parent, String type, IRSEModelObject modelObject, boolean clean) {
-		RSEDOMNode node = null;
-		String name = modelObject.getName();
-		if (!clean) {
-			node = parent.getChild(type, name);
-			if (node != null && modelObject.isDirty()) {
-				node.clearAttributes();
-				node.setDirty(true);
-			}
-		}
-		boolean newNode = (node == null);
-		if (newNode) {
-			node = new RSEDOMNode(parent, type, name);
-		}
-		return node;
-	}
-
-	/**
-	 * Helper to get either "true" or "false" based on boolean flag
-	 * @param flag the flag which to translate
-	 * @return a string value suitable for the DOM
-	 */
-	private String getBooleanString(boolean flag) {
-		return flag ? IRSEDOMConstants.ATTRIBUTE_TRUE : IRSEDOMConstants.ATTRIBUTE_FALSE;
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
deleted file mode 100644
index da0d80cf5..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
+++ /dev/null
@@ -1,486 +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.internal.persistence.dom;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterConstants;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterStartHere;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IPropertySet;
-import org.eclipse.rse.core.model.IPropertyType;
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.PropertyType;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.core.subsystems.IServiceSubSystem;
-import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.core.subsystems.SubSystemFilterNamingPolicy;
-import org.eclipse.rse.persistence.dom.IRSEDOMConstants;
-import org.eclipse.rse.persistence.dom.IRSEDOMImporter;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-import org.eclipse.rse.persistence.dom.RSEDOMNode;
-import org.eclipse.rse.persistence.dom.RSEDOMNodeAttribute;
-
-public class RSEDOMImporter implements IRSEDOMImporter {
-	private static RSEDOMImporter _instance = new RSEDOMImporter();
-	private ISystemRegistry _registry;
-
-	public static RSEDOMImporter getInstance() {
-		return _instance;
-	}
-
-	public RSEDOMImporter() {
-	}
-
-	public void setSystemRegistry(ISystemRegistry registry) {
-		_registry = registry;
-	}
-
-	/**
-	 * Restores the profile represented by dom
-	 * @param profileManager
-	 * @param dom
-	 * @return the restored profile
-	 */
-	public ISystemProfile restoreProfile(ISystemProfileManager profileManager, RSEDOM dom) {
-		// create the profile
-		String profileName = dom.getName();
-		boolean defaultPrivate = getBooleanValue(dom.getAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT_PRIVATE).getValue());
-		boolean isActive = getBooleanValue(dom.getAttribute(IRSEDOMConstants.ATTRIBUTE_IS_ACTIVE).getValue());
-		ISystemProfile profile = profileManager.createSystemProfile(profileName, isActive);
-
-		if (profile != null) {
-			profile.setDefaultPrivate(defaultPrivate);
-			profileManager.makeSystemProfileActive(profile, isActive);
-			// restore the children for the profile
-			RSEDOMNode[] children = dom.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				RSEDOMNode child = children[i];
-				String type = child.getType();
-				if (type.equals(IRSEDOMConstants.TYPE_HOST)) {
-					restoreHost(profile, child);
-				} else if (type.equals(IRSEDOMConstants.TYPE_FILTER_POOL)) {
-					restoreFilterPool(profile, child);
-				} else if (type.equals(IRSEDOMConstants.TYPE_PROPERTY_SET)) {
-					restorePropertySet(profile, child);
-				}
-			}
-		}
-		return profile;
-	}
-
-	/**
-	 * Restores the host represented by hostNode
-	 */
-	public IHost restoreHost(ISystemProfile profile, RSEDOMNode hostNode) {
-		IHost host = null;
-
-		// get host node attributes
-		String connectionName = hostNode.getName();
-		String systemType = hostNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		String hostName = hostNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_HOSTNAME).getValue();
-		String description = hostNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_DESCRIPTION).getValue();
-		boolean isOffline = getBooleanValue(hostNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_OFFLINE).getValue());
-		boolean isPromptable = getBooleanValue(hostNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_PROMPTABLE).getValue());
-
-		// create host and set it's attributes
-		try {
-			// NOTE create host effectively recreates the subsystems
-			// so instead of creating subsystems on restore, we should be updating their properties
-			host = profile.createHost(systemType, connectionName, hostName, description);
-			host.setOffline(isOffline);
-			host.setPromptable(isPromptable);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// restore children of host
-		RSEDOMNode[] children = hostNode.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			RSEDOMNode child = children[i];
-			String type = child.getType();
-			if (type.equals(IRSEDOMConstants.TYPE_CONNECTOR_SERVICE)) {
-				restoreConnectorService(host, child);
-			} else if (type.equals(IRSEDOMConstants.TYPE_PROPERTY_SET)) {
-				restorePropertySet(profile, child);
-			}
-		}
-
-		return host;
-	}
-
-	/**
-	 * Restore the connector service represented by connectorServiceNode
-	 */
-	public IConnectorService restoreConnectorService(IHost host, RSEDOMNode connectorServiceNode) {
-		// TODO - this should come before subsystems
-		// but currently we're still using old way of creating subsystem first
-		IConnectorService service = null;
-
-		// get attributes of the service
-		//		String name = connectorServiceNode.getName();
-		//		String type = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		//		String group = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP).getValue();
-		boolean useSSL = getBooleanValue(connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_USE_SSL).getValue());
-		RSEDOMNodeAttribute att = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_PORT);
-		int port = 0;
-		if (att != null) {
-			port = getIntegerValue(att.getValue());
-		}
-
-		// first restore subsystems (since right now we need subsystem to get at service
-		RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM);
-		for (int s = 0; s < ssChildren.length; s++) {
-			RSEDOMNode ssChild = ssChildren[s];
-			ISubSystem subSystem = restoreSubSystem(host, ssChild);
-			if (subSystem != null && service == null) {
-				ISubSystemConfiguration factory = subSystem.getSubSystemConfiguration();
-				service = factory.getConnectorService(host);
-				if (service != null) {
-					if (factory.supportsServerLaunchProperties(host)) {
-						IServerLauncherProperties sl = factory.createServerLauncher(service);
-						if (sl != null) {
-							// get server launcher properties
-							// right now we just set them for subsystem, but later that will change
-							RSEDOMNode serverLauncherPropertiesNode = null;
-							RSEDOMNode[] slChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SERVER_LAUNCHER);
-							if (slChildren != null && slChildren.length > 0) {
-								serverLauncherPropertiesNode = slChildren[0];
-								restoreServerLauncher(service, serverLauncherPropertiesNode, sl);
-							}
-						}
-					}
-					service.setPort(port);
-					service.setIsUsingSSL(useSSL);
-				}
-			}
-			if (service != null && subSystem != null) {
-				subSystem.setConnectorService(service);
-			}
-		}
-
-		// restore all property sets
-		RSEDOMNode[] psChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_PROPERTY_SET);
-		for (int p = 0; p < psChildren.length; p++) {
-			RSEDOMNode psChild = psChildren[p];
-			restorePropertySet(service, psChild);
-		}
-		return service;
-	}
-
-	public IServerLauncherProperties restoreServerLauncher(IConnectorService service, RSEDOMNode serverLauncherNode, IServerLauncherProperties sl) {
-		//		 restore all property sets
-		RSEDOMNode[] psChildren = serverLauncherNode.getChildren(IRSEDOMConstants.TYPE_PROPERTY_SET);
-		for (int p = 0; p < psChildren.length; p++) {
-			RSEDOMNode psChild = psChildren[p];
-			restorePropertySet(sl, psChild);
-		}
-		sl.restoreFromProperties();
-		service.setRemoteServerLauncherProperties(sl);
-		return sl;
-	}
-
-	/**
-	 * Restores the subsystem represented by subSystemNode
-	 */
-	public ISubSystem restoreSubSystem(IHost host, RSEDOMNode subSystemNode) {
-		// in most cases (if not all) the subsystem already exists
-		// since createHost() ends up recreating subsystems for each factory		
-		String name = subSystemNode.getName();
-		String type = subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		boolean isHidden = getBooleanValue(subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_HIDDEN).getValue());
-		ISubSystem subSystem = null;
-		ISubSystemConfiguration factory = getSubSystemConfiguration(type);
-		if (factory != null) {
-			if (factory instanceof IServiceSubSystemConfiguration) {
-				IServiceSubSystemConfiguration serviceFactory = (IServiceSubSystemConfiguration) factory;
-				ISubSystem[] existingSubSystems = _registry.getServiceSubSystems(serviceFactory.getServiceType(), host);
-				if (existingSubSystems != null && existingSubSystems.length > 0) {
-					subSystem = existingSubSystems[0];
-					// need to switch factories
-					((IServiceSubSystem) subSystem).switchServiceFactory(serviceFactory);
-				}
-			} else {
-				ISubSystem[] existingSubSystems = _registry.getSubSystems(type, host);
-
-				if (existingSubSystems != null && existingSubSystems.length > 0) {
-					subSystem = existingSubSystems[0];
-				}
-			}
-
-			if (subSystem == null) {
-				// subSystem = factory.createSubSystemInternal(host);
-				ISubSystem[] createdSystems = _registry.createSubSystems(host, new ISubSystemConfiguration[]{factory});
-				subSystem = createdSystems[0];
-			}
-			subSystem.setHidden(isHidden);
-			subSystem.setHost(host);
-			subSystem.setSubSystemConfiguration(factory);
-			subSystem.setName(factory.getName());
-			subSystem.setConfigurationId(factory.getId());
-			subSystem.setWasRestored(true);
-
-			if (factory.supportsFilters()) {
-				ISystemFilterStartHere startHere = _registry.getSystemFilterStartHere();
-				ISystemFilterPoolReferenceManager fprMgr = startHere.createSystemFilterPoolReferenceManager(subSystem, factory, name, new SubSystemFilterNamingPolicy());
-				subSystem.setFilterPoolReferenceManager(fprMgr);
-				ISystemFilterPoolManager defaultFilterPoolManager = factory.getFilterPoolManager(host.getSystemProfile());
-				fprMgr.setDefaultSystemFilterPoolManager(defaultFilterPoolManager);
-			}
-
-			// restore filer pool references
-			RSEDOMNode[] filterPoolReferenceChildren = subSystemNode.getChildren(IRSEDOMConstants.TYPE_FILTER_POOL_REFERENCE);
-			for (int i = 0; i < filterPoolReferenceChildren.length; i++) {
-				RSEDOMNode fprChild = filterPoolReferenceChildren[i];
-				restoreFilterPoolReference(subSystem, fprChild);
-			}
-
-			// restore all property sets
-			RSEDOMNode[] psChildren = subSystemNode.getChildren(IRSEDOMConstants.TYPE_PROPERTY_SET);
-			for (int p = 0; p < psChildren.length; p++) {
-				RSEDOMNode psChild = psChildren[p];
-				restorePropertySet(subSystem, psChild);
-			}
-		}
-		return subSystem;
-	}
-
-	/**
-	 * Restore the filter
-	 */
-	public ISystemFilter restoreFilter(ISystemFilterPool filterPool, RSEDOMNode node) {
-		// get the node attributes for a filter
-		String name = node.getName();
-		boolean supportsNestedFilters = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_NESTED_FILTERS).getValue());
-		int relativeOrder = getIntegerValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_RELATIVE_ORDER).getValue());
-		boolean isDefault = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT).getValue());
-		boolean isSetStringsCaseSensitive = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE).getValue());
-		boolean isPromptable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_PROMPTABLE).getValue());
-		boolean isSetSupportsDuplicateFilterStrings = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS).getValue());
-		boolean isNonDeletable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_NON_DELETABLE).getValue());
-		boolean isNonRenamable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE).getValue());
-		boolean isNonChangable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_NON_CHANGEABLE).getValue());
-		boolean isStringsNonChangable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_STRINGS_NON_CHANGABLE).getValue());
-		int release = getIntegerValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE).getValue());
-		boolean isSetSingleFilterStringOnly = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY).getValue());
-
-		Vector filterStrings = new Vector();
-
-		// create the filter strings
-		RSEDOMNode[] filterStringNodes = node.getChildren(IRSEDOMConstants.TYPE_FILTER_STRING);
-		for (int i = 0; i < filterStringNodes.length; i++) {
-			RSEDOMNode filterStringNode = filterStringNodes[i];
-
-			//  might not have to restore the filter strings this way
-			//restoreFilterString(filter, filterStringNode);
-
-			filterStrings.add(filterStringNode.getName());
-		}
-
-		// create the filter
-		ISystemFilter filter = filterPool.createSystemFilter(name, filterStrings);
-
-		filter.setWasRestored(true);
-
-		// set filter attributes
-		filter.setSupportsNestedFilters(supportsNestedFilters);
-		filter.setRelativeOrder(relativeOrder);
-		filter.setDefault(isDefault);
-		filter.setStringsCaseSensitive(isSetStringsCaseSensitive);
-		filter.setPromptable(isPromptable);
-		filter.setSupportsDuplicateFilterStrings(isSetSupportsDuplicateFilterStrings);
-		filter.setNonDeletable(isNonDeletable);
-		filter.setNonChangable(isNonChangable);
-		filter.setNonRenamable(isNonRenamable);
-		filter.setStringsNonChangable(isStringsNonChangable);
-		filter.setRelease(release);
-		filter.setSingleFilterStringOnly(isSetSingleFilterStringOnly);
-
-		// restore all property sets
-		RSEDOMNode[] psChildren = node.getChildren(IRSEDOMConstants.TYPE_PROPERTY_SET);
-		for (int p = 0; p < psChildren.length; p++) {
-			RSEDOMNode psChild = psChildren[p];
-			restorePropertySet(filter, psChild);
-		}
-		return filter;
-	}
-
-	/**
-	 * Restore the filter pool represented by the node
-	 */
-	public ISystemFilterPool restoreFilterPool(ISystemProfile profile, RSEDOMNode node) {
-		ISystemFilterPool filterPool = null;
-
-		// get the node attributes for a filter pool
-		String name = node.getName();
-		String type = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		String id = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_ID).getValue();
-		boolean supportsNestedFilters = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_NESTED_FILTERS).getValue());
-		boolean isDeletable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_DELETABLE).getValue());
-		boolean isDefault = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT).getValue());
-		boolean isSetStringsCaseSensitive = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE).getValue());
-		boolean isSetSupportsDuplicateFilterStrings = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS).getValue());
-		int release = getIntegerValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE).getValue());
-		boolean isSetSingleFilterStringOnly = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY).getValue());
-		String owningParentName = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME).getValue();
-		boolean isNonRenamable = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE).getValue());
-
-		// create the filter pool and set it's attributes
-		try {
-			ISubSystemConfiguration factory = getSubSystemConfiguration(id);
-			if (factory != null) {
-				ISystemFilterPoolManager mgr = factory.getFilterPoolManager(profile);
-				if (isDefault) {
-					filterPool = mgr.getFirstDefaultSystemFilterPool();
-				} else {
-					filterPool = mgr.getSystemFilterPool(name);
-				}
-				if (filterPool == null) {
-					filterPool = _registry.getSystemFilterPool().createSystemFilterPool(name, supportsNestedFilters, isDeletable, ISystemFilterConstants.TRY_TO_RESTORE_NO);
-
-					if (filterPool != null) {
-						filterPool.setSystemFilterPoolManager(mgr);
-						// add to model
-						mgr.getPools().add(filterPool);
-					}
-				}
-				if (filterPool != null) {
-					filterPool.setType(type);
-					filterPool.setDefault(isDefault);
-					filterPool.setSupportsNestedFilters(supportsNestedFilters);
-					filterPool.setStringsCaseSensitive(isSetStringsCaseSensitive);
-					filterPool.setSupportsDuplicateFilterStrings(isSetSupportsDuplicateFilterStrings);
-					filterPool.setRelease(release);
-					filterPool.setSingleFilterStringOnly(isSetSingleFilterStringOnly);
-					filterPool.setOwningParentName(owningParentName);
-					filterPool.setNonRenamable(isNonRenamable);
-					filterPool.setWasRestored(true);
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// restore children
-		RSEDOMNode[] children = node.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			RSEDOMNode child = children[i];
-			String ctype = child.getType();
-			if (ctype.equals(IRSEDOMConstants.TYPE_FILTER)) {
-				if (filterPool != null) {
-					restoreFilter(filterPool, child);
-				}
-			} else if (ctype.equals(IRSEDOMConstants.TYPE_PROPERTY_SET)) {
-				restorePropertySet(filterPool, child);
-			}
-		}
-		return filterPool;
-	}
-
-	/**
-	 * Restore the filter pool reference that is represented by the node
-	 */
-	public ISystemFilterPoolReference restoreFilterPoolReference(ISubSystem subsystem, RSEDOMNode node) {
-		ISystemFilterPoolReference filterPoolReference = null;
-		String subsystemName = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_REF_ID).getValue();
-		String filterPoolName = node.getName();
-		ISubSystemConfiguration configuration = getSubSystemConfiguration(subsystemName);
-		if (configuration != null) {
-			ISystemProfile profile = subsystem.getSystemProfile(); // DWD are there cases where this may be null?
-			ISystemFilterPoolManager filterPoolManager = configuration.getFilterPoolManager(profile);
-			ISystemFilterPool filterPool = filterPoolManager.getSystemFilterPool(filterPoolName);
-			ISystemFilterPoolReferenceManager referenceManager = subsystem.getFilterPoolReferenceManager();
-			/*
-			 * DWD filterpool can be null when restoring since there can be forward references. 
-			 * A profile may be being restored that has references to a filter pool in a profile that doesn't yet exist. 
-			 * Need to create an "unresolved" reference instead of a null object and then patch them up on first access.
-			 */
-			// create reference to the filterpool
-			if (filterPool != null) {
-				filterPoolReference = referenceManager.addReferenceToSystemFilterPool(filterPool);
-			} else {
-				filterPoolReference = referenceManager.addReferenceToSystemFilterPool(filterPoolManager, filterPoolName);
-			}
-		}
-		return filterPoolReference;
-	}
-
-	public ISystemFilterString restoreFilterString(ISystemFilter filter, RSEDOMNode node) {
-		/*
-		 String string = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_STRING).getValue();
-		 String type = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		 boolean isDefault = getBooleanValue(node.getAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT).getValue());
-		 
-		 SystemFilterString filterString = filter
-		 */
-		return null;//not sure if we need this
-	}
-
-	/**
-	 * Restores the property set represented by propertySetNode
-	 */
-	public IPropertySet restorePropertySet(IRSEModelObject modelObject, RSEDOMNode propertySetNode) {
-		String name = propertySetNode.getName();
-		IPropertySet set = modelObject.createPropertySet(name);
-		RSEDOMNodeAttribute[] attributes = propertySetNode.getAttributes();
-		for (int i = 0; i < attributes.length; i++) {
-			RSEDOMNodeAttribute attribute = attributes[i];
-			String typeStr = attribute.getType();
-			IPropertyType type = PropertyType.fromString(typeStr);
-
-			set.addProperty(attribute.getKey(), attribute.getValue(), type);
-
-		}
-		return set;
-	}
-
-	private boolean getBooleanValue(String booleanStr) {
-		return ((booleanStr != null) && booleanStr.equalsIgnoreCase(IRSEDOMConstants.ATTRIBUTE_TRUE));
-	}
-
-	private int getIntegerValue(String integerString) {
-		int result = 0;
-		if (integerString != null) {
-			try {
-				result = Integer.parseInt(integerString);
-			} catch (NumberFormatException e) {
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the subsystem configuration for a given subsystem name
-	 * @param subsystemName the name to look up
-	 * @return the subsystem configuration matching the name
-	 */
-	private ISubSystemConfiguration getSubSystemConfiguration(String subsystemName) {
-		return _registry.getSubSystemConfiguration(subsystemName);
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/messages.properties b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/messages.properties
deleted file mode 100644
index 94d3f5896..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/messages.properties
+++ /dev/null
@@ -1,20 +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
-#
-# Contributors:
-# David Dykstal (IBM) - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-RSEPersistenceManager_DeleteProfileJobName=Delete RSE Profile Job
-PropertyFileProvider_SavingTaskName=Saving DOM
-PropertyFileProvider_UnexpectedException=Unexpected Exception
-PropertyFileProvider_LoadingTaskName=Loading DOM
-SaveRSEDOMJob_SavingProfileJobName=Saving RSE Profile {0}
-SerializingProvider_UnexpectedException=Unexpected Exception
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceManager.java
deleted file mode 100644
index bd95c02a3..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceManager.java
+++ /dev/null
@@ -1,124 +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.persistence;
-
-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.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemHostPool;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.logging.Logger;
-
-public interface IRSEPersistenceManager {
-	/**
-	 * Register the persistence provider to be used when saving and restoring RSE doms.
-	 * The provider is registered under the provided id.
-	 * @param id the provider id.
-	 * @param provider the provider.
-	 */
-	public void registerRSEPersistenceProvider(String id, IRSEPersistenceProvider provider);
-
-	/**
-	 * Restore all profiles
-	 * @param profileManager
-	 * @return true if successful
-	 */
-	public boolean restore(ISystemProfileManager profileManager);
-
-	/**
-	 * Save all profiles
-	 * @param profileManager
-	 * @return true if successful
-	 */
-	public boolean commit(ISystemProfileManager profileManager);
-
-	public boolean commit(IHost host);
-
-	/**
-	 * Restore all connections in the connection pool
-	 * @param connectionPool
-	 * @return true if successful
-	 */
-	public boolean restore(ISystemHostPool connectionPool);
-
-	/**
-	 * Save all connections in the connection pool
-	 * @param connectionPool
-	 * @return true if successful
-	 */
-	public boolean commit(ISystemHostPool connectionPool);
-
-	public boolean commit(ISystemFilterPoolManager filterPoolManager);
-
-	/**
-	 * Save all the filters in the filter pool
-	 * @param filterPool
-	 * @return true if successful
-	 */
-	public boolean commit(ISystemFilterPool filterPool);
-
-	/**
-	 * Save this filter
-	 * @param filter
-	 * @return true if successful
-	 */
-	public boolean commit(ISystemFilter filter);
-
-	/**
-	 * Restore all the filters for the filter pool
-	 * @param filterPool
-	 * @return true if sucessful
-	 */
-	public boolean restore(ISystemFilterPool filterPool);
-
-	/**
-	 * Restore the filter pool
-	 * @param name
-	 * @return the filter pool if successful
-	 */
-	public ISystemFilterPool restoreFilterPool(String name);
-
-	/**
-	 * Save this subsystem
-	 * @param subSystem
-	 * @return true if successful
-	 */
-	public boolean commit(ISubSystem subSystem);
-
-	/**
-	 * Save this profile
-	 * @param profile
-	 * @return true if successful
-	 */
-	public boolean commit(ISystemProfile profile);
-
-	public ISystemFilterPoolManager restoreFilterPoolManager(ISystemProfile profile, Logger logger, ISystemFilterPoolManagerProvider caller, String name);
-
-	public boolean isExporting();
-
-	public boolean isImporting();
-
-	/**
-	 * Delete the persistent form of a profile.
-	 * @param profileName The name of the profile to delete
-	 */
-	public void deleteProfile(String profileName);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceProvider.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceProvider.java
deleted file mode 100644
index 7f3f5330c..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceProvider.java
+++ /dev/null
@@ -1,61 +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.persistence;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.rse.persistence.dom.RSEDOM;
-
-/**
- * This is the interface that needs to be implemented when providing an extension
- * using the RSE persistence provider extension point. 
- * 
- * Implement this class to provide a specialized means of 
- * saving and restoring RSEDOM
- * 
- */
-public interface IRSEPersistenceProvider {
-	/**
-	 * Restores an RSE DOM given a profileName. 
-	 * 
-	 * @param profileName name of the Profile to load
-	 * @param monitor 
-	 * @return the RSE DOM for the specified profile
-	 */
-	public RSEDOM loadRSEDOM(String profileName, IProgressMonitor monitor);
-
-	/**
-	 * Persists an RSE DOM.
-	 *  
-	 * @param dom the RSE DOM to persist
-	 * @param monitor
-	 * @return true if succcessful
-	 */
-	public boolean saveRSEDOM(RSEDOM dom, IProgressMonitor monitor);
-
-	/**
-	 * @return The names of the profiles that have been saved by this persistence provider.
-	 */
-	public String[] getSavedProfileNames();
-
-	/**
-	 * Removes a profile. Does nothing if the profile is not found.
-	 * @param profileName the name of the profile to remove
-	 * @param monitor the monitor for the operation
-	 */
-	public IStatus deleteProfile(String profileName, IProgressMonitor monitor);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
deleted file mode 100644
index 34eac0c9a..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
+++ /dev/null
@@ -1,87 +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.persistence.dom;
-
-public interface IRSEDOMConstants {
-	// node types
-	public static final String TYPE_PROFILE = "Profile"; //$NON-NLS-1$
-	public static final String TYPE_PROPERTY_SET = "PropertySet"; //$NON-NLS-1$
-	public static final String TYPE_PROPERTY = "Property"; //$NON-NLS-1$
-	public static final String TYPE_HOST = "Host"; //$NON-NLS-1$
-	public static final String TYPE_FILTER_POOL = "FilterPool"; //$NON-NLS-1$
-	public static final String TYPE_FILTER = "Filter"; //$NON-NLS-1$
-	public static final String TYPE_FILTER_STRING = "FilterString"; //$NON-NLS-1$
-	public static final String TYPE_FILTER_POOL_REFERENCE = "FilterPoolReference"; //$NON-NLS-1$
-	public static final String TYPE_CONNECTOR_SERVICE = "ConnectorService"; //$NON-NLS-1$
-	public static final String TYPE_SERVER_LAUNCHER = "ServerLauncher"; //$NON-NLS-1$
-	public static final String TYPE_SUBSYSTEM = "SubSystem"; //$NON-NLS-1$
-
-	// node attributes
-
-	// profile attributes
-	public static final String ATTRIBUTE_DEFAULT_PRIVATE = "defaultPrivate"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_IS_ACTIVE = "isActive"; //$NON-NLS-1$
-
-	// subsystem attributes
-	public static final String ATTRIBUTE_HIDDEN = "hidden"; //$NON-NLS-1$
-
-	// common attributes
-	public static final String ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_TYPE = "type"; //$NON-NLS-1$
-
-	// host attributes 
-	public static final String ATTRIBUTE_HOSTNAME = "hostname"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_OFFLINE = "offline"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	// ConnectorService attributes
-	public static final String ATTRIBUTE_GROUP = "group"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_USE_SSL = "useSSL"; //$NON-NLS-1$
-
-	// Filter string attributes
-	public static final String ATTRIBUTE_STRING = "string"; //$NON-NLS-1$
-
-	// filter attributes
-	public static final String ATTRIBUTE_SUPPORTS_NESTED_FILTERS = "supportsNestedFilters"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_RELATIVE_ORDER = "relativeOrder"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_DEFAULT = "default"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_STRING_CASE_SENSITIVE = "stringsCaseSensitive"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_PROMPTABLE = "promptable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS = "supportsDuplicateFilterStrings"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_NON_DELETABLE = "nonDeletable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_NON_RENAMABLE = "nonRenamable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_NON_CHANGEABLE = "nonChangable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_STRINGS_NON_CHANGABLE = "stringsNonChangable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_RELEASE = "release"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_SINGLE_FILTER_STRING_ONLY = "singleFilterStringOnly"; //$NON-NLS-1$
-
-	// server launcher attributes
-	public static final String ATTRIBUTE_REXEC_PORT = "rexecPort"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_DAEMON_PORT = "daemonPort"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_PORT = "port"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_SERVER_PATH = "serverPath"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_SERVER_SCRIPT = "serverScript"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_RESTRICTED_TYPES = "restrictedTypes"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_OWNING_PARENT_NAME = "owningParentName"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REF_ID = "refID"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_DELETABLE = "deletable"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_TRUE = "true"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_FALSE = "false"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
deleted file mode 100644
index 33725c2d9..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
+++ /dev/null
@@ -1,146 +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.persistence.dom;
-
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-public interface IRSEDOMExporter {
-	/**
-	 * Creates the RSE DOM for this profile
-	 * @param profile
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return the created DOM
-	 */
-	RSEDOM createRSEDOM(ISystemProfile profile, boolean clean);
-
-	/**
-	 * Creates an RSE DOM for use in persistence
-	 * @param dom
-	 * @param profile
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return the created DOM
-	 */
-	public RSEDOM populateRSEDOM(RSEDOM dom, ISystemProfile profile, boolean clean);
-
-	/**
-	 * Returns the RSEDOM for this profile iff it exists
-	 * @param profile
-	 * @return The DOM retrieved from the profile
-	 */
-	RSEDOM getRSEDOM(ISystemProfile profile);
-
-	/**
-	 * Create a DOM node representing a host
-	 * @param parent the parent of this node, must be node for an ISystemProfile
-	 * @param host the host from which to create this node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The DOM node for the IHost
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, IHost host, boolean clean);
-
-	/**
-	 * Creates a DOM node for a connector service
-	 * @param parent the parent of this node, must be node for an IHost
-	 * @param cs the connector service from which to create a node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The  DOM node for the IConnectorService
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, IConnectorService cs, boolean clean);
-
-	/**
-	 * Creates a DOM node for a server launcher
-	 * @param parent the parent of this node, must be a node for an IConnectorService
-	 * @param sl the server launcher properties from which to create a node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return the DOM node for the IServerLauncherProperties
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, IServerLauncherProperties sl, boolean clean);
-
-	/**
-	 * Creates a DOM node for a subsystem
-	 * @param parent the parent of this node, must be a node for an IConnectorService
-	 * @param ss the subsystem from which to create a node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The DOM node for the ISubSystem
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, ISubSystem ss, boolean clean);
-
-	/**
-	 * Creates a DOM node for a filter
-	 * @param parent the parent DOM node for this new node, must be a node for an ISystemFilterPool
-	 * @param filter the filter from which to create the node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The DOM node for the filter
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, ISystemFilter filter, boolean clean);
-
-	/**
-	 * Create a DOM node representing a filter pool
-	 * @param parent the parent DOM node for this new node, must be a node for an ISystemProfile
-	 * @param filterPool the filter pool from which to create the node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The DOM node for the filter pool
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterPool fp, boolean clean);
-
-	/**
-	 * Creates a DOM node for a filter pool reference
-	 * @param parent the parent DOM node for this new node, must be a node for an ISubSystem
-	 * @param fpr the filter pool reference from which to create the node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return The DOM node for this filter pool reference
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterPoolReference fpr, boolean clean);
-
-	/**
-	 * Creates a DOM node for a filter string
-	 * @param parent the parent DOM node for this new node, must be node for an ISystemFilter
-	 * @param fs the filter string from which to create the node
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return the DOM node for this filter string
-	 */
-	RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterString fs, boolean clean);
-
-	/**
-	 * Creates DOM nodes for each associated property set of a model object
-	 * @param parent the parent DOM node for these new nodes, can be DOM node for any RSE model object
-	 * @param mo the model object
-	 * @param clean true if the node should being created from scratch, false if the an existing
-	 * node should be found and merged
-	 * @return an array of DOM nodes for the property sets of an RSE model object
-	 */
-	RSEDOMNode[] createPropertySetNodes(RSEDOMNode parent, IRSEModelObject mo, boolean clean);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java
deleted file mode 100644
index 680d786d7..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java
+++ /dev/null
@@ -1,74 +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.persistence.dom;
-
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IPropertySet;
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-public interface IRSEDOMImporter {
-
-	/**
-	 * Restores the profile represented by dom
-	 * @param profileManager
-	 * @param dom
-	 * @return the restored profile
-	 */
-	ISystemProfile restoreProfile(ISystemProfileManager profileManager, RSEDOM dom);
-
-	/**
-	 * Restores the host represented by hostNode
-	 */
-	IHost restoreHost(ISystemProfile profile, RSEDOMNode hostNode);
-
-	/**
-	 * Restore the connector service represented by connectorServiceNode
-	 */
-	IConnectorService restoreConnectorService(IHost host, RSEDOMNode connectorServiceNode);
-
-	IServerLauncherProperties restoreServerLauncher(IConnectorService service, RSEDOMNode serverLauncherNode, IServerLauncherProperties slproperties);
-
-	/**
-	 * Restores the subsystem represented by subSystemNode
-	 */
-	ISubSystem restoreSubSystem(IHost host, RSEDOMNode subSystemNode);
-
-	ISystemFilter restoreFilter(ISystemFilterPool filterPool, RSEDOMNode systemFilterNode);
-
-	/**
-	 * Restore the filter pool represented by the node
-	 */
-	ISystemFilterPool restoreFilterPool(ISystemProfile profile, RSEDOMNode systemFilterPoolNode);
-
-	ISystemFilterPoolReference restoreFilterPoolReference(ISubSystem subSystem, RSEDOMNode systemFilterPoolReferenceNode);
-
-	ISystemFilterString restoreFilterString(ISystemFilter filter, RSEDOMNode systemFilterStringNode);
-
-	/**
-	 * Restores the property set represented by propertySetNode
-	 */
-	IPropertySet restorePropertySet(IRSEModelObject modelObject, RSEDOMNode propertySetNode);
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
deleted file mode 100644
index 20fee3fbf..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
+++ /dev/null
@@ -1,99 +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.persistence.dom;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.rse.core.model.ISystemProfile;
-
-/**
- * This class is the root node of an RSE DOM.  Each
- * RSEDOM represents the properties of a profile to persist.
- */
-public class RSEDOM extends RSEDOMNode {
-
-	/*
-	 * Recommended for serializable objects. This should be updated if there is a schema change. 
-	 */
-	private static final long serialVersionUID = 1L;
-	private Job saveJob = null;
-	private transient ISystemProfile _profile;
-
-	public RSEDOM(ISystemProfile profile) {
-		super(null, TYPE_PROFILE, profile.getName());
-		_profile = profile;
-	}
-
-	public RSEDOM(String profileName) {
-		super(null, TYPE_PROFILE, profileName);
-		_profile = null;
-	}
-
-	public ISystemProfile getProfile() {
-		return _profile;
-	}
-
-	/**
-	 * Indicate that this DOM needs to be saved
-	 */
-	public void markForSave() {
-		if (!restoring && !_needsSave) {
-			_needsSave = true;
-		}
-	}
-
-	/**
-	 * @return true if this DOM has the DOM changed since last saved or restored.
-	 */
-	public boolean needsSave() {
-		return _needsSave;
-	}
-
-	public void print(RSEDOMNode node, String indent) {
-		String type = node.getType();
-		String name = node.getName();
-		RSEDOMNodeAttribute[] attributes = node.getAttributes();
-		RSEDOMNode[] children = node.getChildren();
-
-		System.out.println(indent + "RSEDOMNode " + type); //$NON-NLS-1$
-		System.out.println(indent + "{"); //$NON-NLS-1$
-		String sindent = indent + "  "; //$NON-NLS-1$
-
-		System.out.println(sindent + "name=" + name); //$NON-NLS-1$
-		for (int i = 0; i < attributes.length; i++) {
-			RSEDOMNodeAttribute attribute = attributes[i];
-			String key = attribute.getKey();
-			String value = attribute.getValue();
-			System.out.println(sindent + key + "=" + value); //$NON-NLS-1$
-		}
-
-		String cindent = sindent + "    "; //$NON-NLS-1$
-		for (int c = 0; c < children.length; c++) {
-			RSEDOMNode child = children[c];
-			print(child, cindent);
-		}
-		System.out.println(indent + "}"); //$NON-NLS-1$
-	}
-
-	public Job getSaveJob() {
-		return saveJob;
-	}
-
-	public void setSaveJob(Job saveJob) {
-		this.saveJob = saveJob;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
deleted file mode 100644
index f859a3667..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
+++ /dev/null
@@ -1,223 +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.persistence.dom;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class RSEDOMNode implements IRSEDOMConstants, Serializable {
-	/*
-	 * Recommended for serializable objects. This should be updated if there is a schema change. 
-	 */
-	private static final long serialVersionUID = 1L;
-	protected String _type;
-	protected String _name;
-	protected RSEDOMNode _parent;
-	protected List _children;
-	protected List _attributes;
-
-	protected boolean _needsSave = false;
-	protected boolean _isDirty = true;
-	protected boolean restoring = false;
-
-	public RSEDOMNode(RSEDOMNode parent, String type, String name) {
-		_type = type;
-		_name = name;
-		_parent = parent;
-		_children = new ArrayList();
-		_attributes = new ArrayList();
-		if (parent != null) {
-			parent.addChild(this);
-		}
-	}
-
-	public void markUpdated() {
-		if (_needsSave) {
-			_needsSave = false;
-
-			for (int i = 0; i < _children.size(); i++) {
-				RSEDOMNode child = (RSEDOMNode) _children.get(i);
-				child.markUpdated();
-			}
-		}
-	}
-
-	/**
-	 * Propagates the needs save indicator up to the root
-	 */
-	public void markForSave() {
-		if (!restoring && !_needsSave) {
-			_needsSave = true;
-			_parent.markForSave();
-		}
-	}
-
-	/**
-	 * Recursively removes all the children from this node on down
-	 *
-	 */
-	public void clearChildren() {
-		RSEDOMNode[] children = getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].clearAttributes();
-			children[i].clearChildren();
-		}
-		_children.clear();
-	}
-
-	/**
-	 * Clears all attributes
-	 * 
-	 */
-	public void clearAttributes() {
-		_attributes.clear();
-	}
-
-	/**
-	 * @return the name of this node
-	 */
-	public String getName() {
-		return _name;
-	}
-
-	/**
-	 * @return the type of this node
-	 */
-	public String getType() {
-		return _type;
-	}
-
-	/**
-	 * @return the parent of this node
-	 */
-	public RSEDOMNode getParent() {
-		return _parent;
-	}
-
-	/**
-	 * @return all the children of this node
-	 */
-	public RSEDOMNode[] getChildren() {
-		return (RSEDOMNode[]) _children.toArray(new RSEDOMNode[_children.size()]);
-	}
-
-	/**
-	 * @param key the name of this attribute
-	 * @return the first attribute found that has the specified name
-	 */
-	public RSEDOMNodeAttribute getAttribute(String key) {
-		for (int i = 0; i < _attributes.size(); i++) {
-			RSEDOMNodeAttribute attribute = (RSEDOMNodeAttribute) _attributes.get(i);
-			if (key.equals(attribute.getKey())) {
-				return attribute;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param type
-	 * @return the immediate children of this node that are of the specified type
-	 */
-	public RSEDOMNode[] getChildren(String type) {
-		List results = new ArrayList();
-		for (int i = 0; i < _children.size(); i++) {
-			RSEDOMNode child = (RSEDOMNode) _children.get(i);
-			if (type.equals(child.getType())) {
-				results.add(child);
-			}
-		}
-		return (RSEDOMNode[]) results.toArray(new RSEDOMNode[results.size()]);
-	}
-
-	/**
-	 * @param type
-	 * @param name
-	 * @return the first immediate child of this node that is of the specified type and name
-	 */
-	public RSEDOMNode getChild(String type, String name) {
-		for (int i = 0; i < _children.size(); i++) {
-			RSEDOMNode child = (RSEDOMNode) _children.get(i);
-			if (type.equals(child.getType()) && name.equals(child.getName())) {
-				return child;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @return all the attributes for this node
-	 */
-	public RSEDOMNodeAttribute[] getAttributes() {
-		return (RSEDOMNodeAttribute[]) _attributes.toArray(new RSEDOMNodeAttribute[_attributes.size()]);
-	}
-
-	/**
-	 * Adds a child to this node
-	 * @param child
-	 */
-	public void addChild(RSEDOMNode child) {
-		_children.add(child);
-		markForSave();
-	}
-
-	/**
-	 * Removes a child from this node
-	 * @param child
-	 */
-	public void removeChild(RSEDOMNode child) {
-		_children.remove(child);
-		markForSave();
-	}
-
-	/**
-	 * Adds an attribute to the node
-	 * @param name
-	 * @param value
-	 * @param type
-	 */
-	public void addAttribute(String name, String value, String type) {
-		RSEDOMNodeAttribute attr = new RSEDOMNodeAttribute(name, value, type);
-		_attributes.add(attr);
-		markForSave();
-	}
-
-	/**
-	 * Adds an attribute to the node
-	 * @param name
-	 * @param value
-	 */
-	public void addAttribute(String name, String value) {
-		RSEDOMNodeAttribute attr = new RSEDOMNodeAttribute(name, value);
-		_attributes.add(attr);
-		markForSave();
-	}
-
-	public boolean isDirty() {
-		return _isDirty;
-	}
-
-	public void setDirty(boolean isDirty) {
-		_isDirty = isDirty;
-	}
-
-	public void setRestoring(boolean restoring) {
-		this.restoring = restoring;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java b/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java
deleted file mode 100644
index 55ea6a6be..000000000
--- a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java
+++ /dev/null
@@ -1,50 +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.persistence.dom;
-
-import java.io.Serializable;
-
-public class RSEDOMNodeAttribute implements Serializable {
-	private static final long serialVersionUID = 1L;
-	private String _key;
-	private String _value;
-	private String _type;
-
-	public RSEDOMNodeAttribute(String key, String value, String type) {
-		_key = key;
-		_value = value;
-		_type = type;
-	}
-
-	public RSEDOMNodeAttribute(String key, String value) {
-		_key = key;
-		_value = value;
-		_type = null;
-	}
-
-	public String getKey() {
-		return _key;
-	}
-
-	public String getValue() {
-		return _value;
-	}
-
-	public String getType() {
-		return _type;
-	}
-}
\ No newline at end of file
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 b4fb0a182..000000000
--- a/rse/plugins/org.eclipse.rse.core/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE Core
-providerName = Eclipse.org
-
-extPoint.systemTypes=RSE System Types
-extPoint.persistenceProviders=RSE Persistence Providers
-extPoint.systemTypeProviders=RSE System Type Providers
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 b3bf6c944..000000000
--- a/rse/plugins/org.eclipse.rse.core/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="systemTypes" name="%extPoint.systemTypes" schema="schema/systemTypes.exsd"/>
-
-<!-- ================================================================= -->
-<!-- 		Define Persistence Provider extension point -->
-<!-- ================================================================= -->
-   <extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/>
-   <extension-point id="systemTypeProviders"
-   								  name="%extPoint.systemTypeProviders"
-   								  schema="schema/systemTypeProviders.exsd"/>
- 
-
-
-<!-- ========================================================================= -->
-<!-- Persistence Providers                                                     -->
-<!-- ========================================================================= -->  
- <extension
-       point="org.eclipse.rse.core.persistenceProviders">
-    <persistenceProvider
-          class="org.eclipse.rse.internal.persistence.SerializingProvider"
-          id="org.eclipse.rse.persistence.SerializingProvider"
-          name="Serializing Persistence Provider"/>
-    <persistenceProvider
-          class="org.eclipse.rse.internal.persistence.PropertyFileProvider"
-          id="org.eclipse.rse.persistence.PropertyFileProvider"
-          name="Property File Persistence Provider"/>
- </extension>
- <extension
-       point="org.eclipse.core.runtime.preferences">
-    <initializer
-          class="org.eclipse.rse.core.internal.RSEPreferenceInitializer">
-    </initializer>
- </extension>
- 
-</plugin>
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 ad369d32d..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd
+++ /dev/null
@@ -1,125 +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">
-      <complexType>
-         <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>
-      </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;&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 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
-      </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 49ec7c56b..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd
+++ /dev/null
@@ -1,219 +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.ui.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 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;
-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="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;/ul&gt;
-         </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, 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
-
-Contributors:
-IBM Corporation - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
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 35c77784a..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java
+++ /dev/null
@@ -1,54 +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:
- * Uwe Stieber (Wind River) - Added system types provider extension.
- ********************************************************************************/
-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.
- *
- * This interface is not intended to be implemented 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);
-}
\ 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 61a26349b..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/********************************************************************************
- * 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:
- * Kushal Munir (IBM) - Initial API and implementation.
- * David Dykstal (IBM) - updated with comments, removed keys that are not to be used globally
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-/**
- * These constants define the set of preference names that the RSE core uses.
- */
-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.
-	 */
-	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.
-	 */
-	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.
-	 */
-	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.
-	 */
-	public static final String ACTIVEUSERPROFILES = "activeuserprofiles"; //$NON-NLS-1$
-}
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 553dfb6af..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java
+++ /dev/null
@@ -1,130 +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:
- * Uwe Stieber (Wind River) - Extended system type -> subsystemConfiguration association.
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-import org.eclipse.core.runtime.IAdaptable;
-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.
- * 
- * This interface is not intended to be implemented by clients.
- */
-public interface IRSESystemType extends IAdaptable {
-
-	/**
-	 * Linux system type, "Linux".
-	 */
-	public static final String SYSTEMTYPE_LINUX = "Linux"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "Power Linux".
-	 */
-	public static final String SYSTEMTYPE_POWER_LINUX = "Power Linux"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "zSeries Linux".
-	 */
-	public static final String SYSTEMTYPE_ZSERIES_LINUX = "zSeries Linux"; //$NON-NLS-1$
-
-	/**
-	 * Unix system type, "Unix".
-	 */
-	public static final String SYSTEMTYPE_UNIX = "Unix"; //$NON-NLS-1$
-
-	/**
-	 * AIX system type, "AIX".
-	 */
-	public static final String SYSTEMTYPE_AIX = "AIX"; //$NON-NLS-1$
-
-	/**
-	 * PASE system type, "PASE".
-	 */
-	public static final String SYSTEMTYPE_PASE = "PASE"; //$NON-NLS-1$
-
-	/**
-	 * iSeries system type, "iSeries".
-	 */
-	public static final String SYSTEMTYPE_ISERIES = "iSeries"; //$NON-NLS-1$
-
-	/**
-	 * Local system type, "Local".
-	 */
-	public static final String SYSTEMTYPE_LOCAL = "Local"; //$NON-NLS-1$
-
-	/**
-	 * z/OS system type, "z/OS".
-	 */
-	public static final String SYSTEMTYPE_ZSERIES = "z/OS"; //$NON-NLS-1$
-
-	/**
-	 * Windows system type, "Windows".
-	 */
-	public static final String SYSTEMTYPE_WINDOWS = "Windows"; //$NON-NLS-1$
-
-	/**
-	 * Returns the id of the system type.
-	 * @return the id of the system type
-	 */
-	public String getId();
-
-	/**
-	 * Returns the name of the system type.
-	 * @return the name of the system type
-	 */
-	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);
-
-	/**
-	 * 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();
-}
\ 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 8d5c78568..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java
+++ /dev/null
@@ -1,23 +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
- *
- * Contributors:
- * Kushal Munir (IBM) - Initial API and implementation.
- ********************************************************************************/
-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)
- */
-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 d6d4c2a4f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java
+++ /dev/null
@@ -1,34 +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;
-
-/**
- * Dynamic RSE system types provider interface.
- * @see Extension point {@link org.eclipse.rse.core.systemTypeProviders}
- *  
- * 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.
-	 * 
-	 * @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 00b3bed8a..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java
+++ /dev/null
@@ -1,51 +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.core;
-
-/**
- * Constants for user id management. Used when specifying the scope of a user id when 
- * setting a user id.
- */
-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/IRemoteSystemsProject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRemoteSystemsProject.java
deleted file mode 100644
index 5b6f0dbbd..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRemoteSystemsProject.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2000, 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;
-
-/**
- * Therei is exactly one remote systems project. It is created by the plugin if it does 
- * not exist already. It is never created by the user.
- * <p>
- */
-public interface IRemoteSystemsProject 
-{
-    /**
-     * Returns the <code>IProject</code> on which this <code>IJavaProject</code>
-     * was created. This is handle-only method.
-     */
-    IProject getProject();
-}
\ No newline at end of file
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 4b8f38aec..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 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:
- * David Dykstal (IBM) - moved from core package in the UI plugin
- *                     - updated to use new RSEPreferencesManager
- ********************************************************************************/
-
-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 org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.model.SystemSignonInformation;
-
-
-/**
- * PasswordPersistenceManager manages the saving and retreiving of user ID / passwords
- * to the Eclipse keyring for registered system types.
- * 
- * @author yantzi
- */
-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;
-	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 String DEFAULT_SYSTEM_TYPE = "DEFAULT"; //$NON-NLS-1$
-	
-	// 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;
-	
-	/**
-	 * Inner class used for storing registered system types 
-	 */
-	private class RegisteredSystemType
-	{
-		private String _systemType;
-		private boolean _userIDCaseSensitive;
-
-		protected RegisteredSystemType(String systemType, boolean caseSensitive)
-		{
-			_systemType = systemType;
-			_userIDCaseSensitive = caseSensitive;
-		}		
-		
-		/**
-		 * Returns the system type.
-		 * @return the system type.
-		 */
-		public String 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 isntance of the PasswordPersistenceManger
-	 */
-	public static final synchronized PasswordPersistenceManager getInstance()
-	{
-		if (_instance == null)
-		{
-			_instance = new PasswordPersistenceManager();
-			_instance.initExtensions();
-		}
-		return _instance;
-	}
-
-	/*
-	 * initialization
-	 * 		- read password file
-	 *  	- load IPasswordEncryptionProvider instances
-	 */
-	private void initExtensions()
-	{
-		IRSESystemType[] sysTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes();
-		systemTypes = new RegisteredSystemType[sysTypes.length];
-		
-		for (int i = 0; i < sysTypes.length; i++) {
-			systemTypes[i] = new RegisteredSystemType(sysTypes[i].getName(), 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());
-	}	
-	
-	/**
-	 * Remove the entry from the keyring that matches the hostname, userid and
-	 * system type parameters.	 
-	 */
-	public void remove(String systemtype, String hname, String userid)
-	{
-		String hostname = hname;//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, passwords);
-			}
-		}		
-		else
-		{
-			// yantzi: RSE6.2 check for default system type entry with this hostname and user ID
-			if (!DEFAULT_SYSTEM_TYPE.equals(systemtype))
-			{
-				remove(DEFAULT_SYSTEM_TYPE, hostname, userid);
-			}
-		}
-	}
-				
-	/**
-	 * Check if a password entry exists for the specified system type, hostname
-	 * and userid.
-	 */
-	public boolean passwordExists(String 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(String systemtype, String hname, String userid, boolean checkDefault)
-	{
-		String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
-		return (find(systemtype, hostname, userid) != null);
-	}
-
-	/**
-	 * Add a new persisted password to the password database.  This method assumes
-	 * the encrypted password is already stored in the SystemSignonInformation
-	 * parameter.
-	 * 
-	 * @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 new persisted password to the password database.  This method assumes
-	 * the encrypted password is already stored in the SystemSignonInformation
-	 * parameter.
-	 * 
-	 * @param info The signon information to store
-	 * @param overwrite Whether to overwrite any existing entry
-	 * @param updateDefault Whether or not to update the default entry for the specified hostname / user ID if one exists.
-	 * 
-	 * @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, boolean updateDefault)
-	{
-		String systemtype = info.getSystemType();
-		
-		// Convert userid to upper case if required
-		if (!isUserIDCaseSensitive(systemtype))
-		{
-			info.setUserid(info.getUserid().toUpperCase());
-		}
-
-		String hostname = info.getHostname();
-		String userid = info.getUserid();
-		Map passwords = getPasswordMap(systemtype);
-		String passwordKey = getPasswordKey(hostname, userid);
-	
-		if (passwords != null)
-		{
-			String password = getPassword(passwords, hostname, userid);
-
-			if (password != null)
-			{				
-				if (!overwrite)
-				{
-					return RC_ALREADY_EXISTS;
-				}
-				else
-				{
-					removePassword(passwords, hostname, userid);
-				}
-			}
-			else if (updateDefault)
-			{
-				// yantzi: 6.2, check if default exists for the specified hostname / user ID
-				Map defaultPasswords = getPasswordMap(DEFAULT_SYSTEM_TYPE);
-				if (defaultPasswords != null)
-				{
-					String defaultPassword = (String) defaultPasswords.get(passwordKey);
-					if (defaultPassword != null)
-					{
-						if (!overwrite)
-						{
-							return RC_ALREADY_EXISTS;
-						}
-						else
-						{
-							defaultPasswords.remove(passwordKey);
-							passwords = defaultPasswords;
-							systemtype = DEFAULT_SYSTEM_TYPE;
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			// password map did not exists yet so create a new one
-			passwords = new HashMap(5);	
-		}
-		
-		passwords.put(passwordKey, info.getPassword());
-		
-		savePasswordMap(systemtype, passwords);		
-		
-		return RC_OK;
-	}
-
-		
-	/*
-	 * Retrieve the password map from the keyring for the specified system type
-	 */		
-	private Map getPasswordMap(String systemType)
-	{
-		Map passwords = null;
-		
-		try
-		{
-			URL serverURL = new URL(newURL);
-			passwords = Platform.getAuthorizationInfo(serverURL, systemType, 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, systemType, AUTH_SCHEME);
-				
-				// passwords found, so migrate to using new URL
-				if (passwords != null) {
-					savePasswordMap(systemType, passwords);
-				}
-				// if still no passwords found, check with even older URL
-				else {
-					URL oldServerURL2 = new URL(SERVER_URL);
-					passwords = Platform.getAuthorizationInfo(oldServerURL2, systemType, AUTH_SCHEME);
-				
-					// passwords found, so migrate to using new URL
-					if (passwords != null) {
-						savePasswordMap(systemType, 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 systemType, Map passwords)
-	{
-		try
-		{
-			URL serverURL = new URL(newURL);
-			Platform.flushAuthorizationInfo(serverURL, systemType, AUTH_SCHEME);
-			Platform.addAuthorizationInfo(serverURL, systemType, 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 persisted password for the specified systemtype, hostname and userid. 
-	 */
-	public SystemSignonInformation find(String 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(String 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 static String getHostnameFromPasswordKey(String passwordKey)
-	{
-		int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
-		return passwordKey.substring(0,sepIndex);
-	}
-	
-	private static 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(String systemType)
-	{
-		if (DEFAULT_SYSTEM_TYPE.equals(systemType))
-		{
-			systemType = RSEPreferencesManager.getSystemType();
-		}
-	
-		// First find the correct provider
-		for (int i = 0; i < systemTypes.length; i++)
-		{			
-			
-			if (systemTypes[i].getSystemType().equals(systemType))
-			{
-				return systemTypes[i].isUserIDCaseSensitive();
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Retrieve the list of registered system types
-	 */	
-	public String[] getRegisteredSystemTypes()
-	{
-		// yantzi: artemis 6.2, added default system type to list
-		String[] types = new String[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 35bc7ecb0..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/********************************************************************************
- * 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
- *
- * 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
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.rse.core.internal.RSECoreRegistry;
-import org.eclipse.rse.core.model.ISystemRegistry;
-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.BundleContext;
-
-/**
- * RSECorePlugin provides the activation for the RSE core and acts as the primary
- * registry for logging, persistence, and the main RSE service registries.
- * It should not be extended by other classes.
- */
-public class RSECorePlugin extends Plugin {
-
-	private static RSECorePlugin plugin = null; // the singleton instance of this plugin
-	private Logger logger = null;
-	private ISystemRegistry _registry = null;
-	private IRSEPersistenceManager _persistenceManager = null;
-
-	/**
-	 * Returns the singleton instance of RSECorePlugin.
-	 * @return the singleton instance.
-	 */
-	public static RSECorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * 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 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 hostname given a potentially unqualified hostname
-	 */
-	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);
-		logger = LoggerFactory.getLogger(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		LoggerFactory.freeLogger(this);
-		logger = null;
-		plugin = null;
-	}
-
-	/**
-	 * @return the persistence manager used for persisting RSE profiles
-	 */
-	public IRSEPersistenceManager getPersistenceManager() {
-		if (_persistenceManager == null) {
-			_persistenceManager = new RSEPersistenceManager(_registry);
-		}
-		return _persistenceManager;
-	}
-
-	/**
-	 * Sets the system registry. This is the main registry that can be used by RSE components
-	 * that require a user interface. This should be set only by RSE startup components and 
-	 * not by any external client.
-	 * @param registry the implementation of ISystemRegistry that the core should remember.
-	 */
-	public void setSystemRegistry(ISystemRegistry registry) {
-		_registry = registry;
-	}
-
-	/**
-	 * Gets the system registry set by {@link #setSystemRegistry(ISystemRegistry)}.
-	 * This registry is used to gain access to the basic services and components used in 
-	 * the RSE user interface. 
-	 * @return the RSE system registry
-	 */
-	public ISystemRegistry getSystemRegistry() {
-		return _registry;
-	}
-
-	/**
-	 * 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 getRegistry() {
-		return RSECoreRegistry.getDefault();
-	}
-	
-	/**
-	 * 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() {
-		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$
-	}
-}
\ 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 e78efc104..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
+++ /dev/null
@@ -1,491 +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
- *
- * Contributors:
- * David Dykstal (IBM) - initial API and implementation
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.Preferences;
-
-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$
-	/**
-	 * The default value for the default system type. Value is "".
-	 */
-	private static final String DEFAULT_SYSTEMTYPE = ""; //$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 systemTypeName the name of the system type
-	 * @param userId the default user id for this system type.
-	 * This may be null to "unset" the default.
-	 */
-	public static void setDefaultUserId(String systemTypeName, String userId) {
-		IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeName);
-		if (systemType != null) {
-			setDefaultUserId(systemType, userId);
-		}
-	}
-
-	/**
-	 * 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 <systemTypeName>=<enabled>+<defaultUserId>;
-	 * @return the table of system types formatted as a single string
-	 */
-	public static String getSystemTypeValues() {
-		IRSESystemType[] systemTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes();
-		StringBuffer buffer = new StringBuffer(100);
-		for (int i = 0; i < systemTypes.length; i++) {
-			IRSESystemType systemType = systemTypes[i];
-			buffer.append(systemType.getName());
-			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.getDefault().getRegistry();
-		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.getSystemType(key);
-			setIsSystemTypeEnabled(systemType, isEnabled.equals("true")); //$NON-NLS-1$
-			setDefaultUserId(systemType, defaultUserId);
-		}
-	}
-
-	/**
-	 * @return the system type to default when no explicit system type is available.
-	 */
-	public static String getSystemType() {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String result = store.getString(IRSEPreferenceNames.SYSTEMTYPE);
-		return result;
-	}
-
-	/**
-	 * Sets the system type to default when no explicit system type is available.
-	 * @param systemType the string giving the system type name.
-	 */
-	public static void setSystemType(String systemType) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		store.setValue(IRSEPreferenceNames.SYSTEMTYPE, systemType);
-		savePreferences();
-	}
-
-	/**
-	 * 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.getName() + "." + 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.SYSTEMTYPE, RSEPreferencesManager.DEFAULT_SYSTEMTYPE);
-		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 semi-colon is
-	 * used as a delimiter between the separate values. No value in the
-	 * array can contain a semi-colon.
-	 * @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;
-	}
-
-	/*
-	 * Having this method private disables instance creation. 
-	 */
-	private RSEPreferencesManager() {
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java
deleted file mode 100644
index 9c0dde6e8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsProject.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 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;
-import org.eclipse.core.runtime.PlatformObject;
-
-
-/**
- * Handle for a Remote Systems Project
- *
- * <p>A Remote Systems Project is a singleton created initially by the
- * remote systems plugin. It is a container for all the connections and
- * subsystems defined for working with remote systems.
- *
- * @see IRemoteSystemsProject
- */
-public class RemoteSystemsProject extends PlatformObject                      
-                                          implements IRemoteSystemsProject, IProjectNature 
-{
-	
-	/**
-	 * ID of the nature for the remote system explorer project: "org.eclipse.rse.ui.remotesystemsnature"
-	 */
-	public static final String ID = "org.eclipse.rse.ui.remotesystemsnature"; //$NON-NLS-1$
-	/**
-	 * Name of the nature for the remote system explorer project: "Remote Systems Nature"
-	 */
-	public static final String NAME = "Remote Systems Nature"; //$NON-NLS-1$
-	/**
-	 * An empty array of strings indicating that a project doesn't have any prerequesite projects.
-	 */
-	protected static final String[] NO_PREREQUISITES= new String[0];
-
-	/**
-	 * The platform project this <code>IRemoteProject</code> is based on
-	 */
-	protected IProject fProject;
-
-	/**
-	 * Constructor needed for <code>IProject.getNature()</code> and <code>IProject.addNature()</code>.
-	 *
-	 * @see #setProject
-	 */
-	public RemoteSystemsProject() 
-	{
-		super();
-	}
-	public RemoteSystemsProject(IProject project) 
-	{
-		super();
-		fProject= project;
-	}
-	
-	public void setProject(IProject project) 
-	{
-		RSECorePlugin.getDefault().getLogger().logInfo("Inside setProject"); //$NON-NLS-1$
-		fProject= project;
-	}
-	/**
-	 * Configure the project with Java nature.
-	 */
-	public void configure() throws CoreException 
-	{
-		RSECorePlugin.getDefault().getLogger().logInfo("Inside configure");		 //$NON-NLS-1$
-	}
-	/**
-	 * Removes the Java nature from the project.
-	 */
-	public void deconfigure() throws CoreException 
-	{
-	}
-	public IProject getProject() 
-	{
-		return fProject;
-	}
-	public int hashCode() 
-	{
-		return fProject.hashCode();
-	}
-}
\ No newline at end of file
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/SystemResourceConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceConstants.java
deleted file mode 100644
index 0ac1af568..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 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:
- * David Dykstal (IBM) - removed RESOURCE_TEAMPROFILE_NAME
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-
-/**
- * Constants related to project and folder names.
- */
-public interface SystemResourceConstants 
-{
-	
-    public static final String RESOURCE_PROJECT_NAME = "RemoteSystemsConnections"; //$NON-NLS-1$
-    public static final String RESOURCE_TEMPFILES_PROJECT_NAME= "RemoteSystemsTempFiles"; //$NON-NLS-1$
-    public static final String RESOURCE_CONNECTIONS_FOLDER_NAME = "Connections"; //$NON-NLS-1$
-    public static final String RESOURCE_FILTERS_FOLDER_NAME = "Filters";     //$NON-NLS-1$
-    public static final String RESOURCE_TYPE_FILTERS_FOLDER_NAME = "TypeFilters";         //$NON-NLS-1$
-    public static final String RESOURCE_USERACTIONS_FOLDER_NAME = "UserActions"; //$NON-NLS-1$
-    public static final String RESOURCE_COMPILECOMMANDS_FOLDER_NAME = "CompileCommands"; //$NON-NLS-1$
-}
\ 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 1d02c5755..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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;
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/IRSEFilterNamingPolicy.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/IRSEFilterNamingPolicy.java
deleted file mode 100644
index 175104f2b..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/IRSEFilterNamingPolicy.java
+++ /dev/null
@@ -1,75 +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.core.filters;
-
-/**
- * Allows tool writers to specify the naming standards for the
- * persistence files and folders involved with filters.
- * <p>
- * Note that not all methods will be used for all saving policies.
- * <p>
- * @see org.eclipse.rse.core.filters.SystemFilterNamingPolicy#getNamingPolicy()
- */
-public interface IRSEFilterNamingPolicy {
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPoolManager object name.
-	 * Do NOT include the extension, as .xmi will be added.
-	 */
-	public String getManagerSaveFileName(String managerName);
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPoolReferenceManager object name.
-	 * Do NOT include the extension, as .xmi will be added.
-	 */
-	public String getReferenceManagerSaveFileName(String managerName);
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPool object name.
-	 * Do NOT include the extension, as .xmi will be added.
-	 */
-	public String getFilterPoolSaveFileName(String poolName);
-
-	/**
-	 * Get the file name prefix for all pool files. 
-	 * Used to deduce the saved pools by examining the file system
-	 */
-	public String getFilterPoolSaveFileNamePrefix();
-
-	/**
-	 * Get the folder name for the given SystemFilterPool object name.
-	 */
-	public String getFilterPoolFolderName(String poolName);
-
-	/**
-	 * Get the folder name prefix for all pool folders. 
-	 * Used to deduce the saved pools by examining the file system
-	 */
-	public String getFilterPoolFolderNamePrefix();
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilter object name
-	 * Do NOT include the extension, as .xmi will be added.
-	 */
-	public String getFilterSaveFileName(String filterName);
-
-	/**
-	 * Get the file name prefix for all filter files. 
-	 * Used to deduce the saved pools by examining the file system
-	 */
-	public String getFilterSaveFileNamePrefix();
-
-}
\ 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 9eb0aa967..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2003, 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.core.filters;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.references.IRSEReferencedObject;
-
-/**
- * A representation of the model object '<em><b>System Filter</b></em>'.
- * A filter consists of filter strings and may be contained in a filter pool.
- * Filter pools will be 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.
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isSupportsNestedFilters <em>Supports Nested Filters</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getRelativeOrder <em>Relative Order</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isDefault <em>Default</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isPromptable <em>Promptable</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isSupportsDuplicateFilterStrings <em>Supports Duplicate Filter Strings</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isNonDeletable <em>Non Deletable</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isNonRenamable <em>Non Renamable</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isNonChangable <em>Non Changable</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isStringsNonChangable <em>Strings Non Changable</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getRelease <em>Release</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getNestedFilters <em>Nested Filters</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}</li>
- *   <li>{@link org.eclipse.rse.filters.ISystemFilter#getStrings <em>Strings</em>}</li>
- * </ul>
- * </p>
- *
- */
-/**
- * @lastgen interface SystemFilterPool extends SystemReferencedObject, SystemFilterContainer {}
- */
-public interface ISystemFilter extends IRSEReferencedObject, ISystemFilterContainer, IRSEModelObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * 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.
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Supports Nested Filters</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supports Nested Filters</em>' attribute.
-	 * @see #setSupportsNestedFilters(boolean)
-	 */
-	boolean isSupportsNestedFilters();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSupportsNestedFilters <em>Supports Nested Filters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Supports Nested Filters</em>' attribute.
-	 * @see #isSupportsNestedFilters()
-	 */
-	void setSupportsNestedFilters(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Relative Order</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relative Order</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relative Order</em>' attribute.
-	 * @see #setRelativeOrder(int)
-	 */
-	int getRelativeOrder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelativeOrder <em>Relative Order</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relative Order</em>' attribute.
-	 * @see #getRelativeOrder()
-	 */
-	void setRelativeOrder(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Default</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default</em>' attribute.
-	 * @see #setDefault(boolean)
-	 */
-	boolean isDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isDefault <em>Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default</em>' attribute.
-	 * @see #isDefault()
-	 */
-	void setDefault(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings Case Sensitive</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strings Case Sensitive</em>' attribute.
-	 * @see #isSetStringsCaseSensitive()
-	 * @see #unsetStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	boolean isStringsCaseSensitive();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @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.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @see #isSetStringsCaseSensitive()
-	 * @see #isStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	void unsetStringsCaseSensitive();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Strings Case Sensitive</em>' attribute is set.
-	 * @see #unsetStringsCaseSensitive()
-	 * @see #isStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	boolean isSetStringsCaseSensitive();
-
-	/**
-	 * Returns the value of the '<em><b>Promptable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Promptable</em>' attribute.
-	 * @see #setPromptable(boolean)
-	 */
-	boolean isPromptable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isPromptable <em>Promptable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Promptable</em>' attribute.
-	 * @see #isPromptable()
-	 */
-	void setPromptable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Supports Duplicate Filter Strings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supports Duplicate Filter Strings</em>' attribute.
-	 * @see #setSupportsDuplicateFilterStrings(boolean)
-	 */
-	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.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Supports Duplicate Filter Strings</em>' attribute.
-	 * @see #isSupportsDuplicateFilterStrings()
-	 */
-	void setSupportsDuplicateFilterStrings(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Deletable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be deleted.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Deletable</em>' attribute.
-	 * @see #setNonDeletable(boolean)
-	 */
-	boolean isNonDeletable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonDeletable <em>Non Deletable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be deleted.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Deletable</em>' attribute.
-	 * @see #isNonDeletable()
-	 */
-	void setNonDeletable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Renamable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be renamed.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Renamable</em>' attribute.
-	 * @see #setNonRenamable(boolean)
-	 */
-	boolean isNonRenamable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonRenamable <em>Non Renamable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be renamed.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Renamable</em>' attribute.
-	 * @see #isNonRenamable()
-	 */
-	void setNonRenamable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Changable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be modifiable.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Changable</em>' attribute.
-	 * @see #setNonChangable(boolean)
-	 */
-	boolean isNonChangable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonChangable <em>Non Changable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be modifiable.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Changable</em>' attribute.
-	 * @see #isNonChangable()
-	 */
-	void setNonChangable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings Non Changable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters contain filter strings that should not be modifiable.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strings Non Changable</em>' attribute.
-	 * @see #setStringsNonChangable(boolean)
-	 */
-	boolean isStringsNonChangable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsNonChangable <em>Strings Non Changable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters contain filter strings that should not be modifiable.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Strings Non Changable</em>' attribute.
-	 * @see #isStringsNonChangable()
-	 */
-	void setStringsNonChangable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Release</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Release</em>' attribute.
-	 * @see #setRelease(int)
-	 */
-	int getRelease();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelease <em>Release</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Release</em>' attribute.
-	 * @see #getRelease()
-	 */
-	void setRelease(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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 then this value must not be
-	 * relied upon.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	boolean isSingleFilterStringOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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 then this value must not be
-	 * relied upon.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 */
-	void setSingleFilterStringOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set.
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	boolean isSetSingleFilterStringOnly();
-
-	/**
-	 * Returns the value of the '<em><b>Nested Filters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rse.core.filters.ISystemFilter}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If this filter can contain child filters this will return the list of children.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Nested Filters</em>' containment reference list.
-	 * @see org.eclipse.rse.core.filters.ISystemFilter#getParentFilter
-	 */
-	List 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>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If this filter can be nested inside another this will return the parent filter. Will be 
-	 * null if there is no parent.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Filter</em>' container reference.
-	 * @see #setParentFilter(ISystemFilter)
-	 * @see org.eclipse.rse.core.filters.ISystemFilter#getNestedFilters
-	 */
-	ISystemFilter getParentFilter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * This is used by a filter manager to set the parent filter when one filter is nested inside another.
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Filter</em>' container reference.
-	 * @see #getParentFilter()
-	 */
-	void setParentFilter(ISystemFilter value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rse.core.filters.ISystemFilterString}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Strings</em>' containment reference list.
-	 */
-	java.util.List 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 a Vector of String objects.
-	 * This will construct the filter strings objects.
-	 * @param strings the vector of String objects.
-	 */
-	public void setFilterStrings(Vector strings);
-
-	/**
-	 * 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 a Vector of String objects
-	 */
-	public Vector getFilterStringsVector();
-
-	/**
-	 * @return this filter's filter strings as a Vector of IFilterString objects
-	 */
-	public Vector getFilterStringObjectsVector();
-
-	/**
-	 * @return this filter's filter strings as an array of String objects
-	 */
-	public String[] getFilterStrings();
-
-	/**
-	 * @return this filter's filter string objects as an array of IFilterString objects
-	 */
-	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();
-
-	/**
-	 * 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();
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterConstants.java
deleted file mode 100644
index 46ff6cb4c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterConstants.java
+++ /dev/null
@@ -1,41 +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.core.filters;
-
-/**
- * Constants used throughout filters framework.
- */
-public interface ISystemFilterConstants extends ISystemFilterSavePolicies {
-	/**
-	 * Parameter value on create operations when a restore should be attempted first
-	 */
-	public static final boolean TRY_TO_RESTORE_YES = true;
-	/**
-	 * Parameter value on create operations when no restore should be attempted first
-	 */
-	public static final boolean TRY_TO_RESTORE_NO = false;
-
-	/**
-	 * Suffix used when persisting data to a file.
-	 */
-	public static final String SAVEFILE_SUFFIX = ".xmi"; //$NON-NLS-1$
-
-	/**
-	 * Default value for the type attribute for filter pools, filters and filterstrings
-	 */
-	public static final String DEFAULT_TYPE = "default"; //$NON-NLS-1$
-}
\ No newline at end of file
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 300b3476e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
+++ /dev/null
@@ -1,127 +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.core.filters;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-
-/**
- * Filter containers are any objects that contain filters.
- * This includes filter pools and filters themselves.
- */
-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 atttribute.
-	 */
-	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.
-	 */
-	public ISystemFilter createSystemFilter(String aliasName, Vector 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);
-
-	/**
-	 * @return Vector of String objects: the names of existing filters in this container.
-	 * Typically used by name validators for New and Rename actions to verify new name is unique.
-	 */
-	public Vector getSystemFilterNames();
-
-	/**
-	 * @return a Vector of the ISystemFilter objects contained in this filter container.
-	 */
-	public Vector getSystemFiltersVector();
-
-	/**
-	 * @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);
-}
\ No newline at end of file
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 f0841f8cd..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
+++ /dev/null
@@ -1,85 +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.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.
- */
-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();
-}
\ No newline at end of file
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 d1a320015..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
+++ /dev/null
@@ -1,342 +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.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.<br>
- * By default this is represented as a folder on disk, with each filter
- * stored as a file in that folder. 
- */
-/**
- * @lastgen interface SystemFilterPool extends SystemPersistableReferencedObject, SystemFilterContainer {}
- */
-public interface ISystemFilterPool extends IRSEPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject {
-	// external methods
-	/**
-	 * Return the caller which instantiated the filter pool manager overseeing this filter framework instance
-	 */
-	public ISystemFilterPoolManagerProvider getProvider();
-
-	/**
-	 * Set the naming policy used when saving data to disk.
-	 * @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
-	 */
-	public void setNamingPolicy(IRSEFilterNamingPolicy namingPolicy);
-
-	/**
-	 * Get the naming policy currently used when saving data to disk.
-	 * @see org.eclipse.rse.core.filters.IRSEFilterNamingPolicy
-	 */
-	public IRSEFilterNamingPolicy getNamingPolicy();
-
-	/**
-	 * Does this filter support nested filters?
-	 */
-	public boolean supportsNestedFilters();
-
-	/**
-	 * Does this support duplicate filter strings? Calls mof-generated isSupportsDuplicateFilterStrings.
-	 */
-	public boolean supportsDuplicateFilterStrings();
-
-	/**
-	 * @return The value of the StringsCaseSensitive attribute
-	 * Are filter strings in this filter case sensitive?
-	 * If not set locally, queries the parent filter pool manager's atttribute.
-	 */
-	public boolean isStringsCaseSensitive();
-
-	/**
-	 * Set the filter pool manager.
-	 */
-	public void setSystemFilterPoolManager(ISystemFilterPoolManager mgr);
-
-	/**
-	 * Return the filter pool manager managing this collection of filter pools and their filters.
-	 */
-	public ISystemFilterPoolManager getSystemFilterPoolManager();
-
-	/**
-	 * This is to set transient data that is queryable via getFilterPoolData
-	 */
-	public void setSystemFilterPoolData(Object data);
-
-	/**
-	 * Return transient data set via setFilterPoolData.
-	 */
-	public Object getSystemFilterPoolData();
-
-	/**
-	 * Clone this filter pools' attributes and filters 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>
-	 */
-	public void cloneSystemFilterPool(ISystemFilterPool targetPool) throws Exception;
-
-	/**
-	 * Copy a system filter to this or another filter pool.
-	 */
-	public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) 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(String[] names);
-
-	/**
-	 * Set the save file policy. See constants in SystemFilterConstants. One of:
-	 * <ul>
-	 *   <li>SAVE_POLICY_ONE_FILE_PER_POOL
-	 *   <li>SAVE_POLICY_ONE_FILE_PER_FILTER
-	 * </ul>
-	 * This method is called by the SystemFilterPoolManager.
-	 */
-	public void setSavePolicy(int policy);
-
-	public String getId();
-
-	/**
-	 * @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 value of the Type attribute
-	 * Allows tools to have typed filter pools
-	 */
-	String getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * @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 SupportsNestedFilters attribute
-	 */
-	void setSupportsNestedFilters(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Deletable attribute
-	 */
-	boolean isDeletable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Deletable attribute
-	 */
-	void setDeletable(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Default attribute
-	 * Is this a default vendor-supplied pool versus user-created pool
-	 */
-	boolean isDefault();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Default attribute
-	 */
-	void setDefault(boolean value);
-
-	/**
-	 * @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 
-	 * Unsets the StringsCaseSensitive attribute
-	 */
-	void unsetStringsCaseSensitive();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return <b>true</b> if the StringsCaseSensitive attribute has been set
-	 */
-	boolean isSetStringsCaseSensitive();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Filters references
-	 */
-	java.util.List getFilters();
-
-	/**
-	 * @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 
-	 * @param value The new value of the SupportsDuplicateFilterStrings attribute
-	 */
-	void setSupportsDuplicateFilterStrings(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Release attribute
-	 * In what release was this created? Typically, will be the version and release
-	 * times 10, as in 40 or 51.
-	 */
-	int getRelease();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Release attribute
-	 */
-	void setRelease(int value);
-
-	/**
-	 * 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 #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	boolean isSingleFilterStringOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#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 #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @generated
-	 */
-	void setSingleFilterStringOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 * @generated
-	 */
-	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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set.
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 * @generated
-	 */
-	boolean isSetSingleFilterStringOnly();
-
-	/**
-	 * Returns the value of the '<em><b>Owning Parent Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <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>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owning Parent Name</em>' attribute.
-	 * @see #setOwningParentName(String)
-	 */
-	String getOwningParentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#getOwningParentName <em>Owning Parent Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owning Parent Name</em>' attribute.
-	 * @see #getOwningParentName()
-	 * @generated
-	 */
-	void setOwningParentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Renamable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Renamable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Renamable</em>' attribute.
-	 * @see #setNonRenamable(boolean)
-	 */
-	boolean isNonRenamable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isNonRenamable <em>Non Renamable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Renamable</em>' attribute.
-	 * @see #isNonRenamable()
-	 * @generated
-	 */
-	void setNonRenamable(boolean value);
-
-	public ISystemFilterPool createSystemFilterPool(String name, boolean allowNestedFilters, boolean isDeletable, boolean tryToRestore);
-}
\ No newline at end of file
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 e13cfd822..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
+++ /dev/null
@@ -1,621 +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.core.filters;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-import org.eclipse.rse.core.model.ISystemProfile;
-
-/**
- * A filter pool manager manages filter pools.
- * <p>
- * Each filter pool that is managed becomes a folder on disk.
- * <p>
- * To create a filter pool manager instance, use the factory methods
- *  in SystemFilterPoolManagerImpl in the ...impl package.
- * You must pass a folder that represents the anchor point for the 
- *  pools managed by this manager instance.
- * <p>
- * Depending on your tools' needs, you have four choices about how
- * the filter pools and filters are persisted to disk. The decision is
- * made at the time you instantiate the pool manager and is one of the
- * following constants from the {@link SystemFilterConstants} interface:
- * <ul>
- *   <li>SAVE_POLICY_ONE_FILE_PER_MANAGER - one file: mgrName.xmi
- *   <li>SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL - one file and folder per pool
- *   <li>SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER - one file per pool, all files in one folder
- *   <li>SAVE_POLICY_ONE_FILE_PER_FILTER - one file per filter, one folder per pool
- * </ul> 
- * <p>
- * With the policy of one file per pool, there are two possibilities regarding
- * the folder structure:
- * <ul>
- *   <li>Each pool gets its own subfolder, and the pool's xmi file goes in 
- *         the pool's unique subfolder: SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL
- *   <li>There are no subfolders per pool, all the xmi pool files go in the 
- *         same folder as specified when creating this manager instance:
- *         SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER
- * </ul>
- * <p>
- * With the policy of one file per filter, each filter pool must have its own folder.
- * <p>
- * With an instantiated filter pool manager (most tools will only need
- *  one such instance), you now simply call its methods to work with
- *  filter pools. For example, use it to:
- *  <ul>
- *    <li>Restore all filter pools from disk
- *    <li>Save all, or individual, filter pools to disk
- *    <li>Get a list of existing filter pools
- *    <li>Create filter pools
- *    <li>Delete filter pools
- *    <li>Re-order filter pools
- *    <li>Clone filter pools
- *    <li>Rename filter pools
- *    <li>Save all, or individual, filter pools
- *  </ul>
- * All the underlying file system work is handled for you.
- * <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.
- */
-/** 
- * @lastgen interface SystemFilterPoolManager  {}
- */
-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();
-
-	/**
-	 * Get vector of filter pool names currently existing.
-	 */
-	public Vector getSystemFilterPoolNamesVector();
-
-	/**
-	 * 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.
-	 */
-	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 given filter pool. Dependending on the save policy, the 
-	 *  appropriate file or folder on disk will also be renamed.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Renames referencing objects
-	 *   <li>Renames pool object in the in-memory model
-	 *   <li>Renames folder on disk for policies of one folder per pool
-	 *   <li>Renames file on 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
-	 * </ul>
-	 * @param pool The filter pool object to physically rename
-	 * @param newName The new name to give the pool
-	 */
-	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
-	 */
-	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
-	 */
-	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.
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector filterStrings) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed.
-	 * Same as {@link #createSystemFilter(ISystemFilterContainer, String, Vector)} 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
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector filterStrings, String type) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed and promptable
-	 * Same as {@link #createSystemFilter(ISystemFilterContainer, String ,Vector, 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
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector 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 list of Pools references
-	 */
-	java.util.List getPools();
-
-	/**
-	 * @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);
-
-}
\ No newline at end of file
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 83f2c64a8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
+++ /dev/null
@@ -1,144 +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.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.
- */
-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);
-
-}
\ No newline at end of file
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 2f6f0fece..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
+++ /dev/null
@@ -1,75 +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.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.
- */
-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 e9d8cb086..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
+++ /dev/null
@@ -1,297 +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.core.filters;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-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.
- */
-/**
- * @lastgen interface SystemFilterPoolReferenceManager extends SystemPersistableReferenceManager {}
- */
-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 filterPoolManager the manager that can be used to resolve the reference.
-	 * @param filterPoolName the name of the filter pool being referenced.
-	 * @return new filter pool reference
-	 */
-	public ISystemFilterPoolReference addReferenceToSystemFilterPool(ISystemFilterPoolManager filterPoolManager, 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);
-
-	// -------------------------
-	// SAVE / RESTORE METHODS...
-	// -------------------------
-	/**
-	 * After restoring this from disk, there is only the referenced object name,
-	 * not the referenced object pointer, for each referencing object.
-	 * <p>
-	 * This method is called after restore and for each restored object in the list must:
-	 * <ol>
-	 *   <li>Do what is necessary to find the referenced object, and set the internal reference pointer.
-	 *   <li>Call addReference(this) on that object so it can maintain it's in-memory list
-	 *          of all referencing objects.
-	 *   <li>Set the important transient variables 
-	 * </ol>
-	 * @param relatedPoolMgrProvider the creator of the filter pool managers that hold filter pools we reference
-	 * @param provider the host of this reference manager, so you can later call getProvider
-	 * @return A Vector of SystemFilterPoolReferences that were not successfully resolved, or null if all
-	 *   were resolved.
-	 */
-	public Vector resolveReferencesAfterRestore(ISystemFilterPoolManagerProvider relatedPoolMgrProvider, ISystemFilterPoolReferenceManagerProvider provider);
-
-	/**
-	 * Save all the filter pool references to disk.     
-	 * Use only if not doing your own saving, else override or set save policy to none.
-	 */
-	public void save() throws Exception;
-
-	/**
-	 * Return the folder that this manager is contained in.
-	 */
-	public IFolder getFolder();
-
-	/**
-	 * Reset the folder that this manager is contained in.
-	 */
-	public void resetManagerFolder(IFolder newFolder);
-}
\ No newline at end of file
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 b9fe5848b..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
+++ /dev/null
@@ -1,102 +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.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.
- */
-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);
-}
\ No newline at end of file
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 e84e797fe..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
+++ /dev/null
@@ -1,40 +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.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.
- */
-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);
-
-}
\ No newline at end of file
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 0189fce4c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
+++ /dev/null
@@ -1,34 +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.core.filters;
-
-/**
- * The system filter wizard allows callers to pass a list of wrapper objects
- * for the user to select a filter pool.
- */
-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();
-}
\ No newline at end of file
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 01c643119..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
+++ /dev/null
@@ -1,53 +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.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.
- */
-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();
-}
\ No newline at end of file
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 44cf759fb..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
+++ /dev/null
@@ -1,104 +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.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.
- */
-/**
- * @lastgen interface SystemFilterReference extends SystemReferencingObject, SystemFilterContainerReference {}
- */
-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
-	 */
-	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);
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterSavePolicies.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterSavePolicies.java
deleted file mode 100644
index 5bb0c8e4b..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterSavePolicies.java
+++ /dev/null
@@ -1,46 +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.core.filters;
-
-/**
- * A save policy dictates how filter framework artifacts are persisted to disk.
- */
-public interface ISystemFilterSavePolicies {
-	/**
-	 * No saving. All save/restoring handled elsewhere.
-	 */
-	public static final int SAVE_POLICY_NONE = -1;
-	/**
-	 * Save all filter pools and all filters in one file, with same name as the manager
-	 */
-	public static final int SAVE_POLICY_ONE_FILE_PER_MANAGER = 0;
-	/**
-	 * Save all filters in each filter pool in one file per pool, with the same name as the pool.
-	 * Each pool also has its own unique folder.
-	 */
-	public static final int SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL = 1;
-	/**
-	 * Save all filters in each filter pool in one file per pool, with the same name as the pool
-	 * All pool files go into the same folder.
-	 */
-	public static final int SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER = 2;
-	/**
-	 * Save each filter in each filter pool in its own file, with the same name as the filter
-	 */
-	public static final int SAVE_POLICY_ONE_FILE_PER_FILTER = 3;
-
-}
\ No newline at end of file
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 3f08fa559..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
+++ /dev/null
@@ -1,57 +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
- *******************************************************************************/
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.logging.Logger;
-
-public interface ISystemFilterStartHere {
-
-	/**
-	 * Factory method to return an instance populated with defaults.
-	 * You can then simply override whatever is desired via setXXX methods.
-	 */
-	public IRSEFilterNamingPolicy createSystemFilterNamingPolicy();
-
-	/**
-	 * 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. 
-	 * @param namingPolicy the naming policy object which will return the name of that one file.
-	 */
-	public ISystemFilterPoolReferenceManager createSystemFilterPoolReferenceManager(ISystemFilterPoolReferenceManagerProvider caller, ISystemFilterPoolManagerProvider relatedPoolMgrProvider,
-			String name, IRSEFilterNamingPolicy namingPolicy);
-}
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 5224b5385..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
+++ /dev/null
@@ -1,99 +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.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.
- */
-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);
-
-	/**
-	 * Is this filter string changable? Depends on mof attributes of parent filter
-	 */
-	public boolean isChangable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the String attribute
-	 */
-	String getString();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the String attribute
-	 */
-	void setString(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * Allows tools to have typed filter strings
-	 */
-	String getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Default attribute
-	 * Is this a vendor-supplied filter string versus a user-defined filter string
-	 */
-	boolean isDefault();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Default attribute
-	 */
-	void setDefault(boolean value);
-
-}
\ No newline at end of file
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 e28832e7f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.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.rse.core.filters;
-
-import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
-
-/**
- * Represents a reference to a master filter string.
- * Needed so GUI can show the same filter string multiple times.
- * This is not modelled in MOF.
- */
-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();
-} //SystemFilterStringReference
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterNamingPolicy.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterNamingPolicy.java
deleted file mode 100644
index 48d08dbb0..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterNamingPolicy.java
+++ /dev/null
@@ -1,147 +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.core.filters;
-
-/**
- * A naming policy so tool writers can override defaults used when
- *  saving filter data to disk.
- * <p>
- * Subclass this and override what you wish to change.
- */
-public class SystemFilterNamingPolicy implements IRSEFilterNamingPolicy, ISystemFilterConstants {
-
-	protected String managerFileNamePrefix;
-	protected String poolFolderNamePrefix;
-	protected String poolFolderNameSuffix;
-	protected String poolFileNamePrefix;
-	protected String filterFileNamePrefix;
-	protected String referenceManagerFileNamePrefix;
-	/**
-	 * Default prefix for filter pool manager persisted file: "filterPools_"
-	 */
-	public static final String DEFAULT_FILENAME_PREFIX_FILTERPOOLMANAGER = "filterPools_"; //$NON-NLS-1$
-	/**
-	 * Default prefix for filter pool reference manager persisted file: "filterPoolRefs_"
-	 */
-	public static final String DEFAULT_FILENAME_PREFIX_FILTERPOOLREFERENCEMANAGER = "filterPoolRefs_"; //$NON-NLS-1$
-	/**
-	 * Default prefix for filter pool persisted file: "filterPool_"
-	 */
-	public static final String DEFAULT_FILENAME_PREFIX_FILTERPOOL = "filterPool_"; //$NON-NLS-1$
-	/**
-	 * Default prefix for filter persisted file: "filter_"
-	 */
-	public static final String DEFAULT_FILENAME_PREFIX_FILTER = "filter_"; //$NON-NLS-1$
-	/**
-	 * Default prefix for filter pool folder: "FilterPool_"
-	 */
-	public static final String DEFAULT_FOLDERNAME_PREFIX_FILTERPOOL = "FilterPool_"; //$NON-NLS-1$
-
-	/**
-	 * Factory method to return an instance populated with defaults.
-	 * Can then simply override whatever is desired.
-	 */
-	public static IRSEFilterNamingPolicy getNamingPolicy() {
-		return new SystemFilterNamingPolicy();
-	}
-
-	/**
-	 * Constructor for SystemFilterNamingPolicyImpl
-	 */
-	public SystemFilterNamingPolicy() {
-		super();
-	}
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPoolManager object.
-	 * Do NOT include the extension, as .xmi will be added.
-	 * <p>
-	 * Returns "filterPools_"+managerName by default.
-	 */
-	public String getManagerSaveFileName(String managerName) {
-		return DEFAULT_FILENAME_PREFIX_FILTERPOOLMANAGER + managerName;
-	}
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPoolReferenceManager object.
-	 * Do NOT include the extension, as .xmi will be added.
-	 * <p>
-	 * Returns "filterPoolRefs_"+managerName by default.
-	 */
-	public String getReferenceManagerSaveFileName(String managerName) {
-		return DEFAULT_FILENAME_PREFIX_FILTERPOOLREFERENCEMANAGER + managerName;
-	}
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilterPool object.
-	 * Do NOT include the extension, as .xmi will be added.
-	 * <p>
-	 * Returns getFilterPoolSaveFileNamePrefix()+poolName by default.
-	 */
-	public String getFilterPoolSaveFileName(String poolName) {
-		return getFilterPoolSaveFileNamePrefix() + poolName;
-	}
-
-	/**
-	 * Get the file name prefix for all pool files. 
-	 * Used to deduce the saved pools by examining the file system
-	 * <p>
-	 * By default returns "filterPool_"
-	 */
-	public String getFilterPoolSaveFileNamePrefix() {
-		return DEFAULT_FILENAME_PREFIX_FILTERPOOL;
-	}
-
-	/**
-	 * Get the folder name for the given SystemFilterPool object.
-	 * <p>
-	 * Returns getFilterPoolFolderNamePrefix()+poolName by default.
-	 */
-	public String getFilterPoolFolderName(String poolName) {
-		return getFilterPoolFolderNamePrefix() + poolName;
-	}
-
-	/**
-	 * Get the folder name prefix for all pool folders. 
-	 * Used to deduce the saved pools by examining the file system
-	 * <p>
-	 * By default returns "FilterPool_"
-	 */
-	public String getFilterPoolFolderNamePrefix() {
-		return DEFAULT_FOLDERNAME_PREFIX_FILTERPOOL;
-	}
-
-	/**
-	 * Get the unqualified save file name for the given SystemFilter object.
-	 * Do NOT include the extension, as .xmi will be added.
-	 * <p>
-	 * Returns getFilterSaveFileNamePrefix()+filterName by default.
-	 */
-	public String getFilterSaveFileName(String filterName) {
-		return getFilterSaveFileNamePrefix() + filterName;
-	}
-
-	/**
-	 * Get the file name prefix for all filter files. 
-	 * Used to deduce the saved filters by examining the file system
-	 * <p>
-	 * Returns "Filter_" by default.
-	 */
-	public String getFilterSaveFileNamePrefix() {
-		return DEFAULT_FILENAME_PREFIX_FILTER;
-	}
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterPoolManager.java
deleted file mode 100644
index 798c9996f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterPoolManager.java
+++ /dev/null
@@ -1,1763 +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.core.filters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
-import org.eclipse.rse.logging.Logger;
-import org.eclipse.rse.persistence.IRSEPersistenceManager;
-
-//
-//
-
-/**
- * A filter pool manager manages filter pools.
- * <p>
- * Each filter pool that is managed becomes a folder on disk.
- * <p>
- * To create a filter pool manager instance, use the factory method
- *  in SystemFilterPoolManagerImpl in the ...impl package. 
- * You must pass a folder that represents the anchor point for the 
- *  pools managed by this manager instance.
- * <p>
- * Depending on your tools' needs, you have four choices about how
- * the filter pools and filters are persisted to disk. The decision is
- * made at the time you instantiate the pool manager and is one of the
- * following constants from the SystemFilterConstants interface:
- * <ul>
- *   <li>SAVE_POLICY_ONE_FILE_PER_MANAGER - one file: mgrName.xmi
- *   <li>SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL - one file and folder per pool
- *   <li>SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER - one file per pool, all files in one folder
- *   <li>SAVE_POLICY_ONE_FILE_PER_FILTER - one file per filter, one folder per pool
- * </ul> 
- * <p>
- * With the policy of one file per pool, there are two possibilities regarding
- * the folder structure:
- * <ul>
- *   <li>Each pool gets its own subfolder, and the pool's xmi file goes in 
- *         the pool's unique subfolder: SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL
- *   <li>There are no subfolders per pool, all the xmi pool files go in the 
- *         same folder as specified when creating this manager instance:
- *         SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER
- * </ul>
- * <p>
- * With the policy of one file per filter, each filter pool must have its own folder.
- * <p>
- * With an instantiated filter pool manager (most tools will only need
- *  one such instance), you now simply call its methods to work with
- *  filter pools. For example, use it to:
- *  <ul>
- *    <li>Restore all filter pools from disk
- *    <li>Save all, or individual, filter pools to disk
- *    <li>Get a list of existing filter pools
- *    <li>Create filter pools
- *    <li>Delete filter pools
- *    <li>Clone filter pools
- *    <li>Rename filter pools
- *    <li>Save all, or individual, filter pools
- *  </ul>
- * All the underlying file system work is handled for you.
- * <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.
- * <p>
- * The filter framework logs to a {@link org.eclipse.rse.logging.Logger Logger} file.
- * By default the log in the org.eclipse.rse.core plugin is used, but you can change this
- * by calling {@link #setLogger(org.eclipse.rse.logging.Logger)}.
- */
-/** 
- * @lastgen class SystemFilterPoolManagerImpl Impl implements SystemFilterPoolManager {}
- */
-public class SystemFilterPoolManager implements ISystemFilterPoolManager {
-	private ISystemFilterPool[] poolArray = null; // cache for performance
-	private ISystemFilterPoolManagerProvider caller = null;
-	private Object poolMgrData;
-	private Vector poolNames;
-	private boolean initialized = false;
-
-	private boolean suspendCallbacks = false;
-	private boolean suspendSave = false;
-	private Logger logger = null;
-	private ISystemProfile _profile;
-
-	// persistence	
-	protected boolean _isDirty = true;
-	private boolean _wasRestored = false;
-
-	public static boolean debug = true;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isSupportsNestedFilters() <em>Supports Nested Filters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSupportsNestedFilters()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SUPPORTS_NESTED_FILTERS_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean supportsNestedFilters = SUPPORTS_NESTED_FILTERS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isStringsCaseSensitive() <em>Strings Case Sensitive</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStringsCaseSensitive()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean STRINGS_CASE_SENSITIVE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean stringsCaseSensitive = STRINGS_CASE_SENSITIVE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isSupportsDuplicateFilterStrings() <em>Supports Duplicate Filter Strings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSupportsDuplicateFilterStrings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SUPPORTS_DUPLICATE_FILTER_STRINGS_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean supportsDuplicateFilterStrings = SUPPORTS_DUPLICATE_FILTER_STRINGS_EDEFAULT;
-	/**
-	 * This is true if the Supports Duplicate Filter Strings attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean supportsDuplicateFilterStringsESet = false;
-
-	/**
-	 * The default value of the '{@link #isSingleFilterStringOnly() <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSingleFilterStringOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SINGLE_FILTER_STRING_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSingleFilterStringOnly() <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSingleFilterStringOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean singleFilterStringOnly = SINGLE_FILTER_STRING_ONLY_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected java.util.List pools = null;
-
-	/**
-	 * Constructor
-	 */
-	protected SystemFilterPoolManager(ISystemProfile profile) {
-		super();
-		_profile = profile;
-	}
-
-	public ISystemProfile getSystemProfile() {
-		return _profile;
-	}
-
-	/**
-	 * Factory to create a filter pool manager.
-	 * @param profile the profile for which to create the filter pool manager.
-	 * @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. Typically this is also the name
-	 *   of the given folder, but this is not required. For the save policy of one file
-	 *   per manager, the name of the file is derived from this. For other save policies,
-	 *   the name is not used.
-	 * @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.
-	 * @param savePolicy The save policy for the filter pools and filters. One of the
-	 *   following constants from the 
-	 *   {@link org.eclipse.rse.core.filters.ISystemFilterConstants SystemFilterConstants} interface:
-	 *   <ul>
-	 *     <li>SAVE_POLICY_NONE - no files, all save/restore handled elsewhere
-	 *     <li>SAVE_POLICY_ONE_FILE_PER_MANAGER - one file: mgrName.xmi
-	 *     <li>SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL - one file and folder per pool
-	 *     <li>SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER - one file per pool, all files in one folder
-	 *     <li>SAVE_POLICY_ONE_FILE_PER_FILTER - one file per filter, one folder per pool
-	 *   </ul> 
-	 * @param namingPolicy The names to use for file and folders when persisting to disk. Pass
-	 *     null to just use the defaults, or if using SAVE_POLICY_NONE.
-	 */
-	public static ISystemFilterPoolManager createSystemFilterPoolManager(ISystemProfile profile, Logger logger, 
-			ISystemFilterPoolManagerProvider caller, String name, boolean allowNestedFilters,
-			int savePolicy, IRSEFilterNamingPolicy namingPolicy) {
-
-		SystemFilterPoolManager mgr = null;
-		if (namingPolicy == null) namingPolicy = SystemFilterNamingPolicy.getNamingPolicy();
-		try {
-			mgr = (SystemFilterPoolManager) RSECorePlugin.getThePersistenceManager().restoreFilterPoolManager(profile, logger, caller, name);
-			/*
-			 if (savePolicy != SystemFilterConstants.SAVE_POLICY_NONE)
-			 mgr = (SystemFilterPoolManagerImpl)restore(;
-			 */
-		} catch (Exception exc) // real error trying to restore, versus simply not found.
-		{
-			// todo: something. Log the exception somewhere?
-		}
-		if (mgr == null) // not found or some serious error.
-		{
-			mgr = createManager(profile);
-		}
-		if (mgr != null) {
-			mgr.initialize(logger, caller, name, allowNestedFilters);
-		}
-		return mgr;
-	}
-
-	/*
-	 * Private helper method.
-	 * Uses MOF to create an instance of this class.
-	 */
-	public static SystemFilterPoolManager createManager(ISystemProfile profile) {
-		ISystemFilterPoolManager mgr = new SystemFilterPoolManager(profile);
-
-		//FIXME SystemFilterImpl.initMOF().createSystemFilterPoolManager();
-		return (SystemFilterPoolManager) mgr;
-	}
-
-	/*
-	 * Private helper method to initialize state
-	 */
-	public void initialize(Logger logger, ISystemFilterPoolManagerProvider caller, String name, boolean allowNestedFilters) {
-		if (!initialized) initialize(logger, caller, name); // core data
-
-		{
-			java.util.List pools = getPools();
-			ISystemFilterPool pool = null;
-			Vector poolNames = getSystemFilterPoolNamesVector();
-			for (int idx = 0; idx < poolNames.size(); idx++) {
-				String poolName = (String) poolNames.elementAt(idx);
-				pool = RSECorePlugin.getThePersistenceManager().restoreFilterPool(poolName);
-				pool.setSystemFilterPoolManager(this);
-				pools.add(pool);
-
-				/** FIXME test
-				 if (pool.specialCaseNoDataRestored)
-				 {
-				 pool.setDeletable(true); // what else to do?
-				 //pool.setSupportsNestedFilters(allowNestedFilters); will be cascaded down anyway
-				 }
-				 */
-			}
-
-		}
-		setSupportsNestedFilters(allowNestedFilters); // cascade it down    	
-		invalidatePoolCache();
-	}
-
-	/*
-	 * Private helper method to do core initialization.
-	 * Might be called from either the static factory method or the static restore method.
-	 */
-	public void initialize(Logger logger, ISystemFilterPoolManagerProvider caller, String name) {
-		this.logger = logger;
-		setProvider(caller);
-		setNameGen(name);
-		setFilterPoolManager(); // cascade it down
-		initialized = true;
-	}
-
-	/**
-	 * Return the caller which instantiated the filter pool manager
-	 */
-	public ISystemFilterPoolManagerProvider getProvider() {
-		return caller;
-	}
-
-	/**
-	 * 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.caller = caller;
-	}
-
-	/**
-	 * Set the name of this manager.
-	 * Intercepted so the file get be renamed for SAVE_POLICY_ONE_FILE_PER_MANAGER.
-	 */
-	public void setName(String name) {
-		String oldName = getName();
-		if (oldName != null) {
-			if (!oldName.equals(name)) {
-				this.name = name;
-			}
-		}
-	}
-
-	/**
-	 * Return attribute indicating if filter pools managed by this manager support nested filters.
-	 * Same as isSupportsNestedFilters()
-	 */
-	public boolean supportsNestedFilters() {
-		return isSupportsNestedFilters();
-	}
-
-	/**     
-	 * Return attribute indicating if filters managed by this manager support nested duplicate filter strings.
-	 * Same as isSupportsDuplicateFilterStrings()
-	 */
-	public boolean supportsDuplicateFilterStrings() {
-		//return allowDuplicateFilterStrings;
-		return isSupportsDuplicateFilterStrings();
-	}
-
-	/**
-	 * Set attribute indicating if filter pools managed by this manager support nested filters, by default.
-	 * Cascaded down to all pools, and all filters in all pools.
-	 * Alternatively, just call it on the particular pool or filter it applies to.
-	 */
-	public void setSupportsNestedFilters(boolean newSupportsNestedFilters) {
-		// as generated by emf...
-		setSupportsNestedFiltersGen(newSupportsNestedFilters);
-		// our own stuff..
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		for (int idx = 0; idx < pools.length; idx++) {
-			pools[idx].setSupportsNestedFilters(newSupportsNestedFilters);
-		}
-	}
-
-	/**
-	 * Set attribute indicating if filters managed by this manager support duplicate filter strings, by default.
-	 * Cascaded down to all pools, and all filters in all pools. 
-	 * Alternatively, just call it on the particular pool or filter it applies to.
-	 */
-	public void setSupportsDuplicateFilterStrings(boolean newSupportsDuplicateFilterStrings) {
-		// as generated by emf... 
-		setSupportsDuplicateFilterStringsGen(newSupportsDuplicateFilterStrings);
-
-		// our own stuff..
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		for (int idx = 0; idx < pools.length; idx++) {
-			pools[idx].setSupportsDuplicateFilterStrings(newSupportsDuplicateFilterStrings);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSupportsDuplicateFilterStringsGen(boolean newSupportsDuplicateFilterStrings) {
-		supportsDuplicateFilterStrings = newSupportsDuplicateFilterStrings;
-		supportsDuplicateFilterStringsESet = true;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isStringsCaseSensitive() {
-		return stringsCaseSensitive;
-	}
-
-	/**
-	 * Same as isStringsCaseSensitive()
-	 * Are filter strings in this filter case sensitive?
-	 * @return The value of the StringsCaseSensitive attribute
-	 */
-	public boolean areStringsCaseSensitive() {
-		return isStringsCaseSensitive();
-	}
-
-	/**
-	 * Set attribute indicating if filters managed by this manager support case-sensitive filter strings, by default.
-	 * Cascaded down to all pools, and all filters in all pools. 
-	 * Alternatively, just call it on the particular pool or filter it applies to.
-	 */
-	public void setStringsCaseSensitive(boolean newStringsCaseSensitive) {
-		// as generated by emf...
-		setStringsCaseSensitiveGen(newStringsCaseSensitive);
-		// our special code...    	
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		for (int idx = 0; idx < pools.length; idx++) {
-			pools[idx].setStringsCaseSensitive(newStringsCaseSensitive);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStringsCaseSensitiveGen(boolean newStringsCaseSensitive) {
-		stringsCaseSensitive = newStringsCaseSensitive;
-	}
-
-	/**
-	 * Set transient variable pointing back to us. Called after restoring.
-	 * Cascaded down to all pools, and all filters in all pools.
-	 */
-	protected void setFilterPoolManager() {
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		for (int idx = 0; idx < pools.length; idx++) {
-			pools[idx].setSystemFilterPoolManager(this);
-		}
-	}
-
-	/**
-	 * This is to set transient data that is subsequently queryable.
-	 */
-	public void setSystemFilterPoolManagerData(Object data) {
-		this.poolMgrData = data;
-	}
-
-	/**
-	 * Return transient data set via setFilterPoolData.
-	 */
-	public Object getSystemFilterPoolManagerData() {
-		return poolMgrData;
-	}
-
-	/**
-	 * Return array of SystemFilterPools managed by this manager.
-	 */
-	public ISystemFilterPool[] getSystemFilterPools() {
-		//System.out.println("Inside getSFPools for mgr "+getName()+". poolArray null? "+(poolArray==null));
-		if ((poolArray == null) || (getPools().size() != poolArray.length)) {
-			java.util.List pools = getPools();
-			poolArray = new ISystemFilterPool[pools.size()];
-			Iterator i = pools.iterator();
-			int idx = 0;
-			while (i.hasNext())
-				poolArray[idx++] = (ISystemFilterPool) i.next();
-			//System.out.println("Pool array created. length = "+poolArray.length);
-		}
-		return poolArray;
-	}
-
-	/**
-	 * Get list of filter pool names currently existing.
-	 */
-	public String[] getSystemFilterPoolNames() {
-		Vector v = getSystemFilterPoolNamesVector();
-		String[] names = new String[v.size()];
-		for (int idx = 0; idx < names.length; idx++)
-			names[idx] = (String) v.elementAt(idx);
-		return names;
-	}
-
-	/**
-	 * Get list of filter pool names currently existing.
-	 */
-	public Vector getSystemFilterPoolNamesVector() {
-		java.util.List pools = getPools();
-		if ((poolNames == null) || (poolNames.size() != pools.size())) // been invalidated?
-		{
-			poolNames = new Vector();
-			Iterator i = pools.iterator();
-			while (i.hasNext())
-				poolNames.addElement(((ISystemFilterPool) i.next()).getName());
-		}
-		return poolNames;
-	}
-
-	/*
-	 * Call this to invalidate array cache after any activity 
-	 */
-	private void invalidatePoolCache() {
-		poolArray = null;
-		poolNames = null;
-	}
-
-	/**
-	 * 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
-	 *   <li>save policy
-	 *   <li>filter pool folder and file name prefixes
-	 * </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.
-	 * <p>
-	 * Calls back to inform provider of this event
-	 */
-	public ISystemFilterPool createSystemFilterPool(String poolName, boolean isDeletable) throws Exception {
-		// always trim the pool name, MOF does not handle trailing or preceding spaces
-		poolName = poolName.trim();
-
-		if (getSystemFilterPool(poolName) != null) return null;
-
-		ISystemFilterPool pool = null;
-
-		ISystemRegistry registry = RSECorePlugin.getDefault().getSystemRegistry();
-		ISystemFilterPool filterPool = registry.getSystemFilterPool();
-		pool = filterPool.createSystemFilterPool(poolName, supportsNestedFilters(), isDeletable, ISystemFilterConstants.TRY_TO_RESTORE_NO);
-
-		if (pool != null) {
-			pool.setSystemFilterPoolManager(this);
-			pool.setStringsCaseSensitive(areStringsCaseSensitive());
-			if (isSetSupportsDuplicateFilterStrings()) pool.setSupportsDuplicateFilterStrings(supportsDuplicateFilterStrings());
-			// add to model
-			java.util.List pools = getPools();
-			pools.add(pool);
-			//System.out.println("Inside createSFPool for mgr "+getName()+". Pool "+name+" added");
-			invalidatePoolCache();
-			// save to disk...
-			commit(pool);
-			// if caller provider, callback to inform them of this event
-			if ((caller != null) && !suspendCallbacks) caller.filterEventFilterPoolCreated(pool);
-		}
-		return pool;
-	}
-
-	/**
-	 * 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 {
-
-		// remove all references
-		IRSEBaseReferencingObject[] refs = pool.getReferencingObjects();
-		//boolean needsSave = false;
-		if (refs != null) {
-			for (int idx = 0; idx < refs.length; idx++) {
-				if (refs[idx] instanceof ISystemFilterPoolReference) {
-					ISystemFilterPoolReference fpRef = (ISystemFilterPoolReference) refs[idx];
-					ISystemFilterPoolReferenceManager fprMgr = fpRef.getFilterPoolReferenceManager();
-					if (fprMgr != null) fprMgr.removeSystemFilterPoolReference(fpRef, false);// false means don't dereference
-				}
-			}
-		}
-		// DWD removing a pool should mark its parent profile as dirty and cause a save to be "scheduled"
-
-		// remove from model
-		java.util.List pools = getPools();
-		pools.remove(pool);
-
-		/* FIXME
-		 // now in EMF, the pools are "owned" by the Resource, and only referenced by this pool manager,
-		 //  so I don't think just removing it from the manager is enough... it must also be removed from its
-		 //  resource. Phil.
-		 Resource res = pool.eResource();
-		 if (res != null)
-		 res.getContents().remove(pool);
-		 
-		 // remove from disk
-		 if ( (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL) ||
-		 (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_FILTER) )
-		 {
-		 String expectedFolderName = derivePoolFolderName(poolName);
-		 if (expectedFolderName.equals(poolFolder.getName()))
-		 {
-		 // folder name equals what we would have named it if left to us.
-		 // assumption is this folder only exists to hold this pool!
-		 if (poolFolder.exists())
-		 getResourceHelpers().deleteResource(poolFolder);
-		 }
-		 }
-		 else if (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER)
-		 {
-		 String poolFileName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool);
-		 IFile poolFile = SystemResourceHelpers.getResourceHelpers().getFile(poolFolder,poolFileName);
-		 if (poolFile.exists())
-		 getResourceHelpers().deleteResource(poolFile);            
-		 }
-		 else // all pools in one file per manager. Just save it
-		 {
-		 commit();
-		 }    	
-		 invalidatePoolCache(); 	
-		 // if caller provider, callback to inform them of this event
-		 if ((caller != null) && !suspendCallbacks)
-		 caller.filterEventFilterPoolDeleted(pool);        
-		 */
-	}
-
-	/**
-	 * Delete all existing filter pools. Call this when you are about to delete this manager, say.
-	 */
-	public void deleteAllSystemFilterPools() {
-		ISystemFilterPool[] allPools = getSystemFilterPools();
-		for (int idx = 0; idx < allPools.length; idx++) {
-			String name = allPools[idx].getName();
-			try {
-				deleteSystemFilterPool(allPools[idx]);
-			} catch (Exception exc) {
-				logError("Exception deleting filter pool " + name + " from mgr " + getName(), exc); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-
-	/**
-	 * 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 {
-		boolean ok = true;
-		/*
-		 * DWD this looks like it needs to be modified so that it queries the persistence
-		 * manager to see if the pool can be renamed. The provider is in charge of determining
-		 * pool names in the persistent form. The Manager will have to construct a DOM 
-		 * object for this pool and query the appropriate provider.
-		 */
-		/* FIXME
-		 if ( (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL) ||
-		 (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_FILTER) )
-		 {
-		 String expectedFolderName = derivePoolFolderName(pool.getName());
-		 boolean ourFolderName = expectedFolderName.equals(pool.getFolder().getName());
-		 // we must rename the old file...
-		 String poolFileName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool);    	  
-		 IFile poolFile = getResourceHelpers().getFile(pool.getFolder(),poolFileName);
-		 IFolder poolFolder = pool.getFolder();
-		 
-		 // first, pre-test for file-in-use error:
-		 boolean inUse = poolFile.exists() && SystemResourceHelpers.testIfResourceInUse(poolFile);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILE_INUSE);
-		 msg.makeSubstitution(poolFile.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 // next, pre-test for folder-in-use error:
-		 if (ourFolderName)
-		 {
-		 inUse = poolFolder.exists() && SystemResourceHelpers.testIfResourceInUse(poolFolder);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FOLDER_INUSE);
-		 msg.makeSubstitution(poolFolder.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 }    	            
-		 }
-		 else if (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER)
-		 {
-		 String poolFileName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool);    	  
-		 IFile poolFile = getResourceHelpers().getFile(pool.getFolder(),poolFileName);
-		 // first, pre-test for file-in-use error:
-		 boolean inUse = poolFile.exists() && SystemResourceHelpers.testIfResourceInUse(poolFile);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILE_INUSE);
-		 msg.makeSubstitution(poolFile.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 }
-		 */
-		return ok;
-	}
-
-	/**
-	 * Rename a given filter pool. Dependending on the save policy, the 
-	 *  appropriate file or folder on disk will also be renamed.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Updates all referencing objects
-	 *   <li>Renames pool object in the in-memory model
-	 *   <li>Renames folder on disk for policies of one folder per pool
-	 *   <li>Renames file on 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 provider to inform of this event.
-	 * </ul>
-	 * @param pool The filter pool object to physically rename
-	 * @param newName The new name to give the pool
-	 */
-	public void renameSystemFilterPool(ISystemFilterPool pool, String newName) throws Exception {
-		/*
-		 *  DWD Renaming a filter pool should mark its parent profile as dirty and
-		 *  the pool itself as dirty. A rewrite of the profile should be scheduled.
-		 */
-
-		String oldName = pool.getName();
-		// rename on disk
-		/* FIXME
-		 int oldLen = oldName.length();
-		 int newLen = newName.length();
-		 if ( (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL) ||
-		 (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_FILTER) )
-		 {
-		 String expectedFolderName = derivePoolFolderName(pool.getName());
-		 boolean ourFolderName = expectedFolderName.equals(pool.getFolder().getName());
-		 // we must rename the old file...
-		 String poolFileName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool);    	  
-		 String poolFileNewName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool,newName);
-		 IFile poolFile = getResourceHelpers().getFile(pool.getFolder(),poolFileName);
-		 IFolder poolFolder = pool.getFolder();
-		 
-		 // first, pre-test for file-in-use error:
-		 boolean inUse = poolFile.exists() && SystemResourceHelpers.testIfResourceInUse(poolFile);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILE_INUSE);
-		 msg.makeSubstitution(poolFile.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 // next, pre-test for folder-in-use error:
-		 if (ourFolderName)
-		 {
-		 inUse = poolFolder.exists() && SystemResourceHelpers.testIfResourceInUse(poolFolder);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FOLDER_INUSE);
-		 msg.makeSubstitution(poolFolder.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 }
-		 
-		 if (poolFile.exists())
-		 {
-		 // pre-test if the new name will be too long for MOF (256)
-		 if (nameLenDiff > 0)
-		 {
-		 if (ourFolderName)
-		 nameLenDiff *= 2; // new name affects folder and file
-		 int newNameLen = poolFile.getLocation().toOSString().length() + nameLenDiff; 
-		 if (newNameLen > 256)
-		 throw new Exception("Fully qualified filter pool name too long for "+newName+". Exceeds 256 characters");
-		 }
-		 getResourceHelpers().renameResource(poolFile, poolFileNewName);            
-		 }
-		 if (ourFolderName)
-		 {
-		 // folder name equals what we would have named it if left to us.
-		 // assumption is this folder only exists to hold this pool!
-		 if (poolFolder.exists())
-		 {
-		 String newFolderName = derivePoolFolderName(newName);
-		 getResourceHelpers().renameResource(poolFolder, newFolderName);
-		 // as we now know, the original IFolder still points to the old name!
-		 poolFolder = getResourceHelpers().getRenamedFolder(poolFolder, newFolderName);
-		 pool.setFolder(poolFolder);
-		 }
-		 }
-		 }
-		 else if (savePolicy == SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER)
-		 {
-		 String poolFileName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool);    	  
-		 IFile poolFile = getResourceHelpers().getFile(pool.getFolder(),poolFileName);
-		 // first, pre-test for file-in-use error:
-		 boolean inUse = poolFile.exists() && SystemResourceHelpers.testIfResourceInUse(poolFile);
-		 if (inUse)
-		 {
-		 SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILE_INUSE);
-		 msg.makeSubstitution(poolFile.getFullPath());
-		 throw new SystemMessageException(msg);
-		 }
-		 if (poolFile.exists())
-		 {
-		 String poolFileNewName = SystemFilterPoolImpl.getSaveFileName(getMOFHelpers(),pool,newName);
-		 getResourceHelpers().renameResource(poolFile, poolFileNewName);            
-		 }
-		 }
-		 */
-		pool.setName(newName);
-		invalidatePoolCache();
-
-		// inform all referencees
-		IRSEBaseReferencingObject[] refs = pool.getReferencingObjects();
-		if (refs != null) {
-			for (int idx = 0; idx < refs.length; idx++) {
-				IRSEBaseReferencingObject ref = refs[idx];
-				if (ref instanceof ISystemFilterPoolReference) {
-					ISystemFilterPoolReference fpRef = (ISystemFilterPoolReference) ref;
-					ISystemFilterPoolReferenceManager fprMgr = fpRef.getFilterPoolReferenceManager();
-					fprMgr.renameReferenceToSystemFilterPool(pool);
-				}
-			}
-		}
-
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterPoolRenamed(pool, oldName);
-	}
-
-	/**
-	 * 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 oldPool The filter pool to copy
-	 * @param newName The new name to give the copied pool
-	 * @return the new copy
-	 */
-	public ISystemFilterPool copySystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool oldPool, String newName) throws Exception {
-		ISystemFilterPool newPool = targetMgr.createSystemFilterPool(newName, oldPool.isDeletable());
-		//System.out.println("In SystemFilterPoolManagerImpl#copySystemFilterPool: newPool "+newName+" null? " + (newPool == null));
-		oldPool.cloneSystemFilterPool(newPool);
-		commit(newPool); // save it all to disk
-		return newPool;
-	}
-
-	/**
-	 * 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
-	 */
-	public ISystemFilterPool moveSystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool oldPool, String newName) throws Exception {
-		ISystemFilterPool newPool = copySystemFilterPool(targetMgr, oldPool, newName);
-		// find all references to original, and reset them to reference the new...
-		IRSEBaseReferencingObject[] refs = oldPool.getReferencingObjects();
-		if (refs != null) {
-			for (int idx = 0; idx < refs.length; idx++) {
-				if (refs[idx] instanceof ISystemFilterPoolReference) {
-					ISystemFilterPoolReference fpRef = (ISystemFilterPoolReference) refs[idx];
-					//SystemFilterPool fp = fpRef.getReferencedFilterPool();
-					ISystemFilterPoolReferenceManager fprMgr = fpRef.getFilterPoolReferenceManager();
-					fprMgr.resetSystemFilterPoolReference(fpRef, newPool); // reset the referenced pool   	  	 	
-				}
-			}
-		}
-		try {
-			deleteSystemFilterPool(oldPool);
-		} catch (Exception exc) {
-			if (refs != null) {
-				for (int idx = 0; idx < refs.length; idx++) {
-					if (refs[idx] instanceof ISystemFilterPoolReference) {
-						ISystemFilterPoolReference fpRef = (ISystemFilterPoolReference) refs[idx];
-						ISystemFilterPoolReferenceManager fprMgr = fpRef.getFilterPoolReferenceManager();
-						fprMgr.resetSystemFilterPoolReference(fpRef, oldPool); // reset the referenced pool   	  	 	
-					}
-				}
-			}
-			targetMgr.deleteSystemFilterPool(newPool);
-			throw exc;
-		}
-		return newPool;
-	}
-
-	/**
-	 * 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 {
-		targetMgr.setStringsCaseSensitive(areStringsCaseSensitive());
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		if ((pools != null) && (pools.length > 0)) {
-			targetMgr.suspendCallbacks(true);
-			//boolean oldSuspendCallbacks = suspendCallbacks;
-			for (int idx = 0; idx < pools.length; idx++) {
-				ISystemFilterPool pool = pools[idx];
-				copySystemFilterPool(targetMgr, pool, pool.getName());
-			}
-			//suspendCallbacks = oldSuspendCallbacks;
-			targetMgr.suspendCallbacks(false);
-		}
-	}
-
-	/**
-	 * Given a filter pool name, return that filter pool object.
-	 * If not found, returns null.
-	 */
-	public ISystemFilterPool getSystemFilterPool(String name) {
-		ISystemFilterPool pool = null;
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		if (pools != null) {
-			for (int idx = 0; (idx < pools.length) && (pool == null); idx++) {
-				if (pools[idx].getName().equals(name)) pool = pools[idx];
-			}
-		}
-		return pool;
-	}
-
-	/**
-	 * Return the first pool that has the default attribute set to true.
-	 * If none found, returns null.
-	 */
-	public ISystemFilterPool getFirstDefaultSystemFilterPool() {
-		ISystemFilterPool pool = null;
-		ISystemFilterPool[] pools = getSystemFilterPools();
-		for (int idx = 0; (pool == null) && (idx < pools.length); idx++)
-			if (pools[idx].isDefault()) pool = pools[idx];
-		return pool;
-	}
-
-	// ---------------------------------
-	// 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 inform provider of this 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.
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector filterStrings) throws Exception {
-		ISystemFilter newFilter = null;
-		ISystemFilterPool parentPool = null;
-		if (parent instanceof ISystemFilterPool)
-			parentPool = (ISystemFilterPool) parent;
-		else
-			parentPool = ((ISystemFilter) parent).getParentFilterPool();
-		newFilter = parent.createSystemFilter(aliasName, filterStrings);
-		if (!suspendSave) commit(parentPool);
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterCreated(newFilter);
-		return newFilter;
-	}
-
-	/**
-	 * Creates a new system filter that is typed.
-	 * Same as {@link #createSystemFilter(ISystemFilterContainer, String, Vector)} 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
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector filterStrings, String type) throws Exception {
-		boolean oldSuspendSave = suspendSave;
-		boolean oldSuspendCallbacks = suspendCallbacks;
-		suspendSave = true;
-		suspendCallbacks = true;
-
-		ISystemFilter newFilter = createSystemFilter(parent, aliasName, filterStrings);
-		newFilter.setType(type);
-
-		suspendSave = oldSuspendSave;
-		suspendCallbacks = oldSuspendCallbacks;
-
-		if (!suspendSave) {
-			ISystemFilterPool parentPool = null;
-			if (parent instanceof ISystemFilterPool)
-				parentPool = (ISystemFilterPool) parent;
-			else
-				parentPool = ((ISystemFilter) parent).getParentFilterPool();
-			commit(parentPool);
-		}
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterCreated(newFilter);
-		return newFilter;
-	}
-
-	/**
-	 * Creates a new system filter that is typed and promptable
-	 * Same as {@link #createSystemFilter(ISystemFilterContainer, String ,Vector, 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
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, Vector filterStrings, String type, boolean promptable) throws Exception {
-		boolean oldSuspendSave = suspendSave;
-		boolean oldSuspendCallbacks = suspendCallbacks;
-		suspendSave = true;
-		suspendCallbacks = true;
-
-		ISystemFilter newFilter = createSystemFilter(parent, aliasName, filterStrings, type);
-		newFilter.setPromptable(promptable);
-
-		suspendSave = oldSuspendSave;
-		suspendCallbacks = oldSuspendCallbacks;
-
-		if (!suspendSave) {
-			ISystemFilterPool parentPool = null;
-			if (parent instanceof ISystemFilterPool)
-				parentPool = (ISystemFilterPool) parent;
-			else
-				parentPool = ((ISystemFilter) parent).getParentFilterPool();
-			commit(parentPool);
-		}
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterCreated(newFilter);
-		return newFilter;
-	}
-
-	/**
-	 * 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 it of this event (filterEventFilterDeleted)
-	 * </ul>
-	 */
-	public boolean deleteSystemFilter(ISystemFilter filter) throws Exception {
-
-		// ok to proceed...
-		boolean ok = true;
-		ISystemFilterContainer parent = filter.getParentFilterContainer();
-		parent.deleteSystemFilter(filter);
-		commit(filter.getParentFilterPool());
-
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterDeleted(filter);
-		return ok;
-	}
-
-	/**
-	 * 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 it of this event (filterEventFilterRenamed)
-	 * </ul>
-	 * Does fire an event.
-	 */
-	public void renameSystemFilter(ISystemFilter filter, String newName) throws Exception {
-
-		// ok to proceed
-		ISystemFilterContainer parent = filter.getParentFilterContainer();
-		String oldName = filter.getName();
-		parent.renameSystemFilter(filter, newName);
-		// rename on disk
-		try {
-
-			commit(filter.getParentFilterPool());
-		} catch (Exception exc) {
-			parent.renameSystemFilter(filter, oldName); // rollback name change
-			throw exc;
-		}
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterRenamed(filter, oldName);
-	}
-
-	/**
-	 * 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 it of this event (filterEventFilterUpdated).
-	 * </ul>
-	 */
-	public void updateSystemFilter(ISystemFilter filter, String newName, String[] strings) throws Exception {
-
-		// ok to proceed...
-		ISystemFilterContainer parent = filter.getParentFilterContainer();
-		String oldName = filter.getName();
-		boolean rename = !oldName.equals(newName);
-		if (rename) {
-			renameSystemFilter(filter, newName);
-		}
-		parent.updateSystemFilter(filter, newName, strings);
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterUpdated(filter);
-	}
-
-	/**
-	 * 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 filter to be modified
-	 * @param newType The type of this filter
-	 */
-	public void setSystemFilterType(ISystemFilter filter, String newType) throws Exception {
-		filter.setType(newType);
-		commit(filter.getParentFilterPool());
-	}
-
-	/**
-	 * Copy a system filter to a pool in this or another filter manager.
-	 */
-	public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception {
-		ISystemFilterPoolManager targetMgr = targetPool.getSystemFilterPoolManager();
-		ISystemFilterPool oldPool = oldFilter.getParentFilterPool();
-
-		targetMgr.suspendCallbacks(true);
-
-		ISystemFilter newFilter = oldPool.copySystemFilter(targetPool, oldFilter, newName); // creates it in memory
-		commit(targetPool); // save updated pool to disk
-
-		targetMgr.suspendCallbacks(false);
-
-		targetMgr.getProvider().filterEventFilterCreated(newFilter);
-		return newFilter;
-	}
-
-	/**
-	 * 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 {
-		ISystemFilter newFilter = copySystemFilter(targetPool, oldFilter, newName);
-		if (newFilter != null) {
-			deleteSystemFilter(oldFilter);
-		}
-		return newFilter;
-	}
-
-	/**
-	 * Return the zero-based position of a SystemFilter object within its container
-	 */
-	public int getSystemFilterPosition(ISystemFilter filter) {
-		ISystemFilterContainer container = filter.getParentFilterContainer();
-		int position = -1;
-		boolean match = false;
-		ISystemFilter[] filters = container.getSystemFilters();
-
-		for (int idx = 0; !match && (idx < filters.length); idx++) {
-			if (filters[idx].getName().equals(filter.getName())) {
-				match = true;
-				position = idx;
-			}
-		}
-		return position;
-	}
-
-	/**
-	 * 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 this event
-	 * </ul>
-	 * @param filters Array of SystemFilters to move.
-	 * @param delta the amount by which to move the filters (filterEventFiltersRePositioned)
-	 */
-	public void moveSystemFilters(ISystemFilter filters[], int delta) throws Exception {
-		/*
-		 * DWD revisit this. Make sure that the pool is scheduled to be saved.
-		 */
-		//    	ISystemFilterContainer container = filters[0].getParentFilterContainer(); 
-		int[] oldPositions = new int[filters.length];
-		for (int idx = 0; idx < filters.length; idx++)
-			oldPositions[idx] = getSystemFilterPosition(filters[idx]);
-		if (delta > 0) // moving down, process backwards
-			for (int idx = filters.length - 1; idx >= 0; idx--)
-				moveFilter(filters[idx], oldPositions[idx] + delta);
-		else
-			for (int idx = 0; idx < filters.length; idx++)
-				moveFilter(filters[idx], oldPositions[idx] + delta);
-
-		commit(filters[0].getParentFilterPool());
-
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFiltersRePositioned(filters, delta);
-	}
-
-	/**
-	 * Move one filter to new zero-based position.
-	 */
-	private void moveFilter(ISystemFilter filter, int newPos) {
-		ISystemFilterContainer container = filter.getParentFilterContainer();
-		container.moveSystemFilter(newPos, filter);
-	}
-
-	/**
-	 * 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 {
-		pool.orderSystemFilters(names);
-		commit(pool);
-	}
-
-	// -------------------------------
-	// 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 {
-		ISystemFilterString newFilterString = filter.addFilterString(newString);
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringCreated(newFilterString);
-		return newFilterString;
-	}
-
-	/**
-	 * Insert a new filter string to the its filters' 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 {
-		ISystemFilterString newFilterString = filter.addFilterString(newString, position);
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringCreated(newFilterString);
-		return newFilterString;
-	}
-
-	/**
-	 * 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 {
-		ISystemFilterString oldFilterString = filter.removeFilterString(oldString);
-		if (oldFilterString == null) return false;
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringDeleted(oldFilterString);
-		return true;
-	}
-
-	/**
-	 * 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 {
-		boolean ok = filter.removeFilterString(filterString);
-		if (!ok) return false;
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringDeleted(filterString);
-		return ok;
-	}
-
-	/**
-	 * 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 {
-		ISystemFilterString oldFilterString = filter.removeFilterString(position);
-		if (oldFilterString == null) return false;
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringDeleted(oldFilterString);
-		return true;
-	}
-
-	/**
-	 * 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 {
-		if (newValue.equals(filterString.getString())) return;
-		ISystemFilter filter = filterString.getParentSystemFilter();
-		filter.updateFilterString(filterString, newValue);
-		ISystemFilterPool parentPool = filter.getParentFilterPool();
-		commit(parentPool);
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringUpdated(filterString);
-	}
-
-	/**
-	 * Return the zero-based position of a SystemFilterString object within its filter
-	 */
-	public int getSystemFilterStringPosition(ISystemFilterString filterString) {
-		ISystemFilter filter = filterString.getParentSystemFilter();
-		int position = -1;
-		boolean match = false;
-		ISystemFilterString[] filterStrings = filter.getSystemFilterStrings();
-
-		String matchString = filterString.getString();
-		for (int idx = 0; !match && (idx < filterStrings.length); idx++) {
-			if (filterStrings[idx].getString().equals(matchString)) {
-				match = true;
-				position = idx;
-			}
-		}
-		return position;
-	}
-
-	/**
-	 * Copy a system filter string to a filter in this or another filter pool manager.
-	 */
-	public ISystemFilterString copySystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString) throws Exception {
-		/*
-		 * DWD revisit this. make sure that pool is persisted.
-		 */
-		ISystemFilterPool targetPool = targetFilter.getParentFilterPool();
-		ISystemFilterPoolManager targetMgr = targetPool.getSystemFilterPoolManager();
-		ISystemFilter oldFilter = oldFilterString.getParentSystemFilter();
-		//        ISystemFilterPool oldPool = oldFilter.getParentFilterPool(); 
-
-		targetMgr.suspendCallbacks(true);
-
-		ISystemFilterString newFilterString = oldFilter.copySystemFilterString(targetFilter, oldFilterString); // creates it in memory
-		commit(targetPool); // save updated pool to disk
-
-		targetMgr.suspendCallbacks(false);
-
-		targetMgr.getProvider().filterEventFilterStringCreated(newFilterString);
-		return newFilterString;
-	}
-
-	/**
-	 * 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 {
-		ISystemFilterString newString = copySystemFilterString(targetFilter, oldFilterString);
-		if (newString != null) {
-			removeSystemFilterString(oldFilterString.getParentSystemFilter(), oldFilterString);
-		}
-		return newString;
-	}
-
-	/**
-	 * 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 filter strings
-	 */
-	public void moveSystemFilterStrings(ISystemFilterString filterStrings[], int delta) throws Exception {
-		ISystemFilter filter = filterStrings[0].getParentSystemFilter();
-		int[] oldPositions = new int[filterStrings.length];
-		for (int idx = 0; idx < filterStrings.length; idx++)
-			oldPositions[idx] = getSystemFilterStringPosition(filterStrings[idx]);
-		if (delta > 0) // moving down, process backwards
-			for (int idx = filterStrings.length - 1; idx >= 0; idx--)
-				moveFilterString(filter, filterStrings[idx], oldPositions[idx] + delta);
-		else
-			for (int idx = 0; idx < filterStrings.length; idx++)
-				moveFilterString(filter, filterStrings[idx], oldPositions[idx] + delta);
-
-		commit(filter.getParentFilterPool());
-
-		// if caller provider, callback to inform them of this event
-		if ((caller != null) && !suspendCallbacks) caller.filterEventFilterStringsRePositioned(filterStrings, delta);
-	}
-
-	/**
-	 * Move one filter string to new zero-based position.
-	 */
-	private void moveFilterString(ISystemFilter filter, ISystemFilterString filterString, int newPos) {
-		filter.moveSystemFilterString(newPos, filterString);
-	}
-
-	// -----------------------------------
-	// SUSPEND/RESUME CALLBACKS METHODS...
-	// -----------------------------------
-	/**
-	 * Suspend callbacks to the provider
-	 */
-	public void suspendCallbacks(boolean suspend) {
-		suspendCallbacks = suspend;
-	}
-
-	// -----------------------
-	// SAVE/RESTORE METHODS...
-	// -----------------------
-	/**
-	 * Return the save file that will be written for the given filter pool.
-	 * Will depend on this manager's save policy.
-	 */
-	public IFile getSaveFile(ISystemFilterPool pool) {
-		/* FIXME
-		 switch(savePolicy)
-		 {
-		 // ONE FILE PER FILTER POOL MANAGER
-		 case SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_MANAGER:
-		 return SystemMOFHelpers.getSaveFile(getFolder(), getRootSaveFileName(this));
-		 // ONE FOLDER AND FILE PER FILTER POOL
-		 case SystemFilterConstants.SAVE_POLICY_ONE_FILEANDFOLDER_PER_POOL:
-		 // ONE FILE PER FILTER POOL, ONE FOLDER PER MANAGER
-		 case SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_POOL_SAME_FOLDER:
-		 // ONE FILE PER FILTER
-		 case SystemFilterConstants.SAVE_POLICY_ONE_FILE_PER_FILTER:
-		 return ((SystemFilterPoolImpl)pool).getSaveFile();
-		 }    	
-		 */
-		return null;
-	}
-
-	/**
-	 * Save all the filter pools to disk.     
-	 * Uses the save policy specified in this manager's factory method.
-	 */
-	public boolean commit() {
-		IRSEPersistenceManager mgr = RSECorePlugin.getThePersistenceManager();
-
-		return mgr.commit(this);
-	}
-
-	/**
-	 * Save all the filter pools to disk.     
-	 * Uses the save policy specified in this manager's factory method.
-	 */
-	public boolean commit(ISystemFilterPool pool) {
-		IRSEPersistenceManager mgr = RSECorePlugin.getThePersistenceManager();
-		return mgr.commit(pool);
-	}
-
-	/**
-	 * Restore filter pools when all are stored in one file
-	 * @param logger The logging object to log errors to
-	 * @param mgrFolder The folder containing the file to restore from.
-	 * @param name The name of the manager, from which the file name is derived.
-	 * @param namingPolicy Naming prefix information for persisted data file names.
-	 */
-	protected static ISystemFilterPoolManager restoreFromOneFile(Logger logger, IFolder mgrFolder, String name, IRSEFilterNamingPolicy namingPolicy) throws Exception {
-		/* FIXME
-		 String fileName = getRootSaveFileName(namingPolicy, name);
-		 
-		 java.util.List ext = getMOFHelpers(logger).restore(mgrFolder,fileName);
-		 
-		 SystemFilterPoolManager mgr = null;
-
-		 // should be exactly one system filter pool manager...
-		 Iterator iList = ext.iterator();
-		 mgr = (SystemFilterPoolManager)iList.next();
-		 return mgr;	
-		 */
-		return null;
-	}
-
-	/**
-	 * Return our logger
-	 */
-	public Logger getLogger() {
-		if (logger == null) logger = RSECorePlugin.getDefault().getLogger();
-		return logger;
-	}
-
-	/**
-	 * Set our logger
-	 */
-	public void setLogger(Logger logger) {
-		this.logger = logger;
-	}
-
-	/**
-	 * Helper method for logging information
-	 * 
-	 * @param message Message to be written to the log file
-	 */
-	public void logInfo(String message) {
-		if (logger != null)
-			logger.logInfo(message);
-		else
-			System.out.println(getClass().getName() + ": INFO: " + message); //$NON-NLS-1$
-	}
-
-	/**
-	 * Helper method for logging warnings
-	 * 
-	 * @param message Message to be written to the log file
-	 */
-	public void logWarning(String message) {
-		if (logger != null)
-			logger.logWarning(message);
-		else
-			System.out.println(getClass().getName() + ": WARNING: " + message); //$NON-NLS-1$
-	}
-
-	/**
-	 * Helper method for logging errors (exceptions)
-	 * 
-	 * @param message Message to be written to the log file
-	 * 
-	 * @param exception Any exception that generated the error condition, 
-	 *                  this will be used to print a stack trace in the log file.
-	 */
-	public void logError(String message, Throwable exception) {
-		if (logger != null)
-			logger.logError(message, exception);
-		else {
-			String msg = exception.getMessage();
-			if (msg == null) msg = exception.getClass().getName();
-			System.out.println(getClass().getName() + ": " + message + ": " + msg); //$NON-NLS-1$ //$NON-NLS-2$
-			exception.printStackTrace();
-		}
-	}
-
-	/**
-	 * Helper method for logging debug messages
-	 * 
-	 * @param prefix typically the name of the class issuing the debug message.  Pass in either 
-	 *                  retrieved using this.getClass() (for non-static methods)
-	 *                  or using MyClass.class (for static methods)
-	 * 
-	 * @param message Message to be written to the log file
-	 */
-	public void logDebugMessage(String prefix, String message) {
-		if ((logger != null)) {
-			logger.logDebugMessage(prefix, message);
-		} else
-			System.out.println(getClass().getName() + ": DEBUG: " + message); //$NON-NLS-1$
-	}
-
-	/**
-	 * Helper method for logging trace information
-	 * 
-	 * @deprecated Use either logInfo, logWarning, logError, or logDebugMessage.  This
-	 * method now calls logInfo.
-	 */
-	public void logMessage(String msg) {
-		if (logger != null)
-			logger.logInfo(msg);
-		else
-			System.out.println(getClass().getName() + ": " + msg); //$NON-NLS-1$
-	}
-
-	// OTHER
-
-	public String toString() {
-		return getName();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isSupportsNestedFilters() {
-		return supportsNestedFilters;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public java.util.List getPools() {
-		if (pools == null) {
-			pools = new ArrayList();
-			//FIXME new EObjectResolvingeList(SystemFilterPool.class, this, FiltersPackage.SYSTEM_FILTER_POOL_MANAGER__POOLS);
-		}
-		return pools;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNameGen(String newName) {
-		String oldName = name;
-		if (oldName != newName) {
-			name = newName;
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSupportsNestedFiltersGen(boolean newSupportsNestedFilters) {
-		supportsNestedFilters = newSupportsNestedFilters;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isSupportsDuplicateFilterStrings() {
-		return supportsDuplicateFilterStrings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void unsetSupportsDuplicateFilterStrings() {
-		supportsDuplicateFilterStrings = SUPPORTS_DUPLICATE_FILTER_STRINGS_EDEFAULT;
-		supportsDuplicateFilterStringsESet = false;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isSetSupportsDuplicateFilterStrings() {
-		return supportsDuplicateFilterStringsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSingleFilterStringOnly() {
-		return singleFilterStringOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSingleFilterStringOnly(boolean newSingleFilterStringOnly) {
-		boolean oldSingleFilterStringOnly = singleFilterStringOnly;
-		if (oldSingleFilterStringOnly != newSingleFilterStringOnly) {
-			singleFilterStringOnly = newSingleFilterStringOnly;
-			setDirty(true);
-		}
-	}
-
-	public boolean isDirty() {
-		return _isDirty;
-	}
-
-	public void setDirty(boolean flag) {
-		if (_isDirty != flag) {
-			_isDirty = flag;
-		}
-	}
-
-	public boolean wasRestored() {
-		return _wasRestored;
-	}
-
-	public void setWasRestored(boolean flag) {
-		_wasRestored = flag;
-	}
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java
deleted file mode 100644
index 47046f925..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java
+++ /dev/null
@@ -1,200 +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:
- * Uwe Stieber (Wind River) - Added system types provider extension.
- ********************************************************************************/
-package org.eclipse.rse.core.internal;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.IRSECoreRegistry;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.IRSESystemTypeProvider;
-import org.eclipse.rse.core.RSECorePlugin;
-
-/**
- * Singleton class representing the RSE core registry.
- */
-public class RSECoreRegistry implements IRSECoreRegistry {
-
-	// the singleton instance
-	private static RSECoreRegistry instance = null;
-
-	// extension registry
-	private IExtensionRegistry registry;
-
-	// state variables
-	private boolean hasReadSystemTypes;
-
-	// model objects
-	private IRSESystemType[] systemTypes;
-
-	// constants
-	private static final String ELEMENT_SYTEM_TYPE = "systemType"; //$NON-NLS-1$
-
-	/**
-	 * Constructor.
-	 */
-	private RSECoreRegistry() {
-		super();
-		init();
-	}
-
-	/**
-	 * Initializes the registry. This should only be called from the constructor.
-	 */
-	private void init() {
-		registry = Platform.getExtensionRegistry();
-	}
-
-	/**
-	 * Returns the singleton instance of the registry.
-	 * @return the singleton instance
-	 */
-	public static final RSECoreRegistry getDefault() {
-
-		if (instance == null) {
-			instance = new RSECoreRegistry();
-		}
-
-		return instance;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemTypes()
-	 */
-	public IRSESystemType[] getSystemTypes() {
-
-		if (!hasReadSystemTypes) {
-			systemTypes = readSystemTypes();
-			hasReadSystemTypes = true;
-		}
-
-		return systemTypes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemTypeById(java.lang.String)
-	 */
-	public IRSESystemType getSystemTypeById(String systemTypeId) {
-		if (systemTypeId != null) {
-			IRSESystemType[] types = getSystemTypes();
-			for (int i = 0; i < types.length; i++) {
-				if (types[i].getId().equals(systemTypeId)) {
-					return types[i];
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemType(java.lang.String)
-	 */
-	public IRSESystemType getSystemType(String name) {
-		IRSESystemType[] types = getSystemTypes();
-
-		for (int i = 0; i < types.length; i++) {
-			IRSESystemType type = types[i];
-
-			if (type.getName().equals(name)) {
-				return type;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Reads system types from the extension point registry and returns the defined system types.
-	 * @return an array of system types that have been defined
-	 */
-	private IRSESystemType[] readSystemTypes() {
-		List types = new LinkedList();
-		List typeIds = new ArrayList();
-
-		IExtensionRegistry registry = getExtensionRegistry();
-		
-		// First we take the direct system type contributions via extension point
-		IConfigurationElement[] elements = registry.getConfigurationElementsFor(PI_RSE_CORE, PI_SYSTEM_TYPES);
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];
-
-			if (element.getName().equals(ELEMENT_SYTEM_TYPE)) {
-				RSESystemType type = new RSESystemType(element);
-				if (!typeIds.contains(type.getId())) {
-					types.add(type);
-					typeIds.add(type.getId());
-					
-					String message = "Successfully registered RSE system type ''{0}'' (id = ''{1}'')."; //$NON-NLS-1$
-					message = MessageFormat.format(message, new Object[] { type.getName(), type.getId() });
-					RSECorePlugin.getDefault().getLogger().logInfo(message);
-				} else {
-					String message = "RSE system type contribution skipped. Non-unique system type id (plugin: {0}, id: {1})."; //$NON-NLS-1$
-					message = MessageFormat.format(message, new Object[] { element.getContributor().getName(), type.getId()});
-					RSECorePlugin.getDefault().getLogger().logWarning(message);
-				}
-			}
-		}
-
-		// check on the IRSESystemTypeProviders now
-		elements = registry.getConfigurationElementsFor(PI_RSE_CORE, PI_SYSTEM_TYPES_PROVIDER);
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];
-			try {
-				Object provider = element.createExecutableExtension("class"); //$NON-NLS-1$
-				if (provider instanceof IRSESystemTypeProvider) {
-					IRSESystemType[] typesForRegistration = ((IRSESystemTypeProvider)provider).getSystemTypesForRegistration();
-					if (typesForRegistration == null) continue;
-					
-					for (int j = 0; j < typesForRegistration.length; j++) {
-						IRSESystemType type = typesForRegistration[j];
-						if (!typeIds.contains(type.getId())) {
-							types.add(type);
-							typeIds.add(type.getId());
-							
-							String message = "Successfully registered RSE system type ''{0}'' (id = ''{1}'')."; //$NON-NLS-1$
-							message = MessageFormat.format(message, new Object[] { type.getName(), type.getId() });
-							RSECorePlugin.getDefault().getLogger().logInfo(message);
-						} else {
-							String message = "RSE system type contribution skipped. Non-unique system type id (plugin: {0}, id: {1})."; //$NON-NLS-1$
-							message = MessageFormat.format(message, new Object[] { element.getContributor().getName(), type.getId()});
-							RSECorePlugin.getDefault().getLogger().logWarning(message);
-						}
-					}
-				}
-			} catch (CoreException e) {
-				String message = "RSE system types provider failed creation (plugin: {0}, id: {1})."; //$NON-NLS-1$
-				message = MessageFormat.format(message, new Object[] { element.getContributor().getName(), element.getDeclaringExtension().getSimpleIdentifier()});
-				RSECorePlugin.getDefault().getLogger().logError(message, e);
-			}
-		}
-		
-		return (IRSESystemType[])types.toArray(new IRSESystemType[types.size()]);
-	}
-
-	/**
-	 * Returns the platform extension registry.
-	 * @return the platform extension registry
-	 */
-	private IExtensionRegistry getExtensionRegistry() {
-		return registry;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSEPreferenceInitializer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSEPreferenceInitializer.java
deleted file mode 100644
index 7ea8edc69..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSEPreferenceInitializer.java
+++ /dev/null
@@ -1,21 +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
- *
- * Contributors:
- * David Dykstal (IBM) - initial API and implementation
- ********************************************************************************/
-package org.eclipse.rse.core.internal;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.rse.core.RSEPreferencesManager;
-
-public class RSEPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public void initializeDefaultPreferences() {
-		RSEPreferencesManager.initDefaults();
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java
deleted file mode 100644
index 42dc271f2..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java
+++ /dev/null
@@ -1,149 +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.core.internal;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.IRSESystemTypeConstants;
-import org.osgi.framework.Bundle;
-
-/**
- * Class representing a system type.
- */
-public class RSESystemType implements IRSESystemType {
-
-	private static final String ATTR_ID = "id"; //$NON-NLS-1$
-	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
-	private static final String ATTR_DESCRIPTION = "description"; //$NON-NLS-1$
-	private static final String ATTR_ICON = "icon"; //$NON-NLS-1$
-	private static final String ATTR_ICONLIVE = "iconLive"; //$NON-NLS-1$
-	private static final String ATTR_ENABLEOFFLINE = "enableOffline"; //$NON-NLS-1$
-	private static final String ATTR_VALUE = "value"; //$NON-NLS-1$
-	private static final String ATTR_SUBSYSTEMCONFIGURATIONS = "subsystemConfigurationIds"; //$NON-NLS-1$
-
-	private String id = null;
-	private String name = null;
-	private String description = null;
-	private Map properties;
-	private Bundle definingBundle = null;
-	private String[] subsystemConfigurationIds;
-	
-	/**
-	 * Constructor for an object representing a system type.
-	 * @param element the configuration element describing the system type
-	 */
-	public RSESystemType(IConfigurationElement element) {
-
-		id = element.getAttribute(ATTR_ID);
-		name = element.getAttribute(ATTR_NAME);
-		description = element.getAttribute(ATTR_DESCRIPTION);
-
-		loadProperties(element);
-
-		String icon = element.getAttribute(ATTR_ICON);
-		if (icon != null) properties.put(IRSESystemTypeConstants.ICON, icon);
-		String iconLive = element.getAttribute(ATTR_ICONLIVE);
-		if (iconLive != null) properties.put(IRSESystemTypeConstants.ICON_LIVE, iconLive);
-		String enableOffline = element.getAttribute(ATTR_ENABLEOFFLINE);
-		if (enableOffline != null) properties.put(IRSESystemTypeConstants.ENABLE_OFFLINE, enableOffline);
-		
-		definingBundle = Platform.getBundle(element.getContributor().getName());
-		
-		List subsystemConfigs = new LinkedList(); 
-		String attribute = element.getAttribute(ATTR_SUBSYSTEMCONFIGURATIONS);
-		if (attribute != null) {
-			// split the list of subsystem configuration ids.
-			String[] splitted = attribute.split(";"); //$NON-NLS-1$
-			// normalize the list of subsystem configuration ids
-			for (int i = 0; i < splitted.length; i++) {
-				subsystemConfigs.add(splitted[i].trim());
-			}
-		}
-		subsystemConfigurationIds = (String[])subsystemConfigs.toArray(new String[subsystemConfigs.size()]);
-	}
-
-	/**
-	 * Loads properties defined for the system type.
-	 * @param element the configuration element
-	 */
-	private void loadProperties(IConfigurationElement element) {
-		IConfigurationElement[] children = element.getChildren();
-		properties = new HashMap(children.length);
-
-		for (int i = 0; i < children.length; i++) {
-			IConfigurationElement child = children[i];
-			String key = child.getAttribute(ATTR_NAME);
-			String value = child.getAttribute(ATTR_VALUE);
-
-			if (key != null && value != null) properties.put(key, value);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/* (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#getProperty(java.lang.String)
-	 */
-	public String getProperty(String key) {
-		return (String) (properties.get(key));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getDefiningBundle()
-	 */
-	public Bundle getDefiningBundle() {
-		return definingBundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getSubsystemConfigurationIds()
-	 */
-	public String[] getSubsystemConfigurationIds() {
-		return subsystemConfigurationIds;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-}
\ No newline at end of file
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 27a2fb53c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java
+++ /dev/null
@@ -1,116 +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.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-public 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;
-	}
-}
\ 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 e2c691d10..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
+++ /dev/null
@@ -1,211 +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.core.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * Interface for SystemConnection objects. 
- * A SystemConnect holds information identifying a remote system. It also logically contains
- *   SubSystem objects, although this containment is achievable programmatically versus via 
- *   object oriented containment.
- * <p>
- */
-/**
- * @lastgen interface SystemConnection  {}
- */
-public interface IHost extends IAdaptable, IRSEModelObject {
-	/**
-	 * Return the system profile that owns this connection
-	 */
-	public ISystemProfile getSystemProfile();
-
-	/**
-	 * Return the name of the system profile that owns this connection
-	 */
-	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();
-
-	/**
-	 * Private method called when this connection is being deleted, so
-	 * we can do any pre-death cleanup we need.
-	 * <p>
-	 * What we need to do is delete our entry in the preference store for our default userId.
-	 */
-	public void deletingHost();
-
-	/**
-	 * Private method called when this connection's profile is being rename, so
-	 * we can do any pre-death cleanup we need.
-	 * <p>
-	 * What we need to do is rename our entry in the preference store for our default userId.
-	 */
-	public void renamingSystemProfile(String oldName, String newName);
-
-	/**
-	 * Call this to query whether the default userId is to be uppercased.
-	 */
-	public boolean getForceUserIdToUpperCase();
-
-	/**
-	 * Call this to compare two userIds taking case sensitivity
-	 */
-	public boolean compareUserIds(String userId1, String userId2);
-
-	/**
-	 * @return The value of the SystemType attribute
-	 */
-	public String getSystemType();
-
-	/**
-	 * @param value The new value of the SystemType attribute
-	 */
-	public void setSystemType(String value);
-
-	/**
-	 * @return The value of the AliasName attribute
-	 * The unique key for this object. Unique per connection pool
-	 */
-	public String getAliasName();
-
-	/**
-	 * @param value The new value of the AliasName attribute
-	 */
-	public void setAliasName(String value);
-
-	/**
-	 * @return The value of the HostName attribute
-	 */
-	public String getHostName();
-
-	/**
-	 * @param value The new value of the HostName attribute
-	 */
-	public void setHostName(String value);
-
-	/**
-	 * @return The value of the Description attribute
-	 */
-	public String getDescription();
-
-	/**
-	 * @param value The new value of the Description attribute
-	 */
-	public void setDescription(String value);
-
-	/**
-	 * We return the default user Id. Note that we don't store it directly in
-	 * the mof-modelled attribute, as we don't want the team to share it. Rather,
-	 * we store the actual user Id in the preference store keyed by this connection's
-	 * unique name (profile.connName) and store that key 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);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Promptable attribute
-	 */
-	boolean isPromptable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Promptable attribute
-	 */
-	void setPromptable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Offline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * Is this connection offline? If so, there is no live connection. Subsystems
-	 *  decide how much to enable while offline.
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Offline</em>' attribute.
-	 * @see #setOffline(boolean)
-	 */
-	boolean isOffline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.model.IHost#isOffline <em>Offline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Offline</em>' attribute.
-	 * @see #isOffline()
-	 * @generated
-	 */
-	void setOffline(boolean value);
-
-	/**
-	 * Returns all the connector services provided
-	 * for this host
-	 * @return the connector services
-	 */
-	IConnectorService[] getConnectorServices();
-}
\ No newline at end of file
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 42550ed90..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java
+++ /dev/null
@@ -1,37 +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.core.model;
-
-public interface IProperty {
-	public String getKey();
-
-	public String getLabel();
-
-	public void setLabel(String label);
-
-	public void setValue(String value);
-
-	public String getValue();
-
-	public void setType(IPropertyType type);
-
-	public IPropertyType getType();
-
-	public void setEnabled(boolean flag);
-
-	public boolean isEnabled();
-}
\ 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 899e63308..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation and 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
- * 
- * 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.
- ********************************************************************************/
-
-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.
- */
-public interface IPropertySet {
-	/** The key used to store the description of the Property Set. */
-	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>setProperty(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();
-
-	/** 
-	 * 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.
-	 * 
-	 * @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);
-
-}
\ No newline at end of file
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 f98d7a753..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
+++ /dev/null
@@ -1,34 +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.core.model;
-
-public interface IPropertySetContainer {
-	public IPropertySet[] getPropertySets();
-
-	public IPropertySet getPropertySet(String name);
-
-	public IPropertySet createPropertySet(String name);
-
-	public IPropertySet createPropertySet(String name, String description);
-
-	public boolean addPropertySet(IPropertySet set);
-
-	public boolean addPropertySets(IPropertySet[] sets);
-
-	public boolean removePropertySet(String name);
-
-}
\ No newline at end of file
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 c02f6e344..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java
+++ /dev/null
@@ -1,36 +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.core.model;
-
-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;
-
-	public boolean isString();
-
-	public boolean isInteger();
-
-	public boolean isEnum();
-
-	public boolean isBoolean();
-
-	public int getType();
-
-	public String[] getEnumValues();
-}
\ No newline at end of file
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 9a22f5953..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
+++ /dev/null
@@ -1,24 +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.core.model;
-
-
-public interface IRSEModelObject extends IPropertySetContainer, IRSEPersistableContainer {
-	String getName();
-
-	String getDescription();
-}
\ No newline at end of file
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 5fef41422..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
+++ /dev/null
@@ -1,58 +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.core.model;
-
-public interface IRSEPersistableContainer {
-	/**
-	 * 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();
-
-	/**
-	 * 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.
-	 * Setting this value to false should be done only in the persistence
-	 * manager after the object has been written to the DOM.
-	 * @param flag true if the object must be persisted.
-	 */
-	public void setDirty(boolean flag);
-
-	/**
-	 * 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();
-
-	/**
-	 * The the "restored" state of the object. Only persistence managers 
-	 * should do this.
-	 * @param flag true if the object was restored.
-	 */
-	public void setWasRestored(boolean flag);
-
-}
\ 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 680f9dc80..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java
+++ /dev/null
@@ -1,37 +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.core.model;
-
-/**
- * Constants for pre-defined subsystem factory categories.
- * Use these in calls to {@link org.eclipse.rse.core.model.ISystemRegistry#getHostsBySubSystemConfigurationCategory(String)}.
- */
-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$
-
-}
\ No newline at end of file
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 ecacdd351..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
+++ /dev/null
@@ -1,57 +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.rse.core.model;
-
-/**
- * @author dmcknigh
- */
-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);
-
-}
\ No newline at end of file
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 46adbd82e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
+++ /dev/null
@@ -1,35 +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.core.model;
-
-/*
- * Common interface for representing different contents types of
- * artifacts that can be stored in an IRemoteContainer
- */
-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();
-}
\ No newline at end of file
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 7218ef98d..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
+++ /dev/null
@@ -1,181 +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.core.model;
-
-import java.util.List;
-
-import org.eclipse.rse.core.IRSEUserIdConstants;
-
-
-//
-/**
- * A list of connections.
- */
-/**
- * @lastgen interface SystemConnectionPool  {}
- */
-
-public interface ISystemHostPool extends IRSEPersistableContainer {
-
-	/**
-	 * Return the system profile that owns this connection pool
-	 */
-	public ISystemProfile getSystemProfile();
-
-	/**
-	 * Rename this connection pool.
-	 */
-	public void renameHostPool(String newName);
-
-	/**
-	 * Return array of connections in this pool
-	 */
-	public IHost[] getHosts();
-
-	/**
-	 * Create a connection.
-	 */
-	public IHost createHost(String systemType, String aliasName, String hostName) throws Exception;
-
-	/**
-	 * Create a connection.
-	 */
-	public IHost createHost(String systemType, String aliasName, String hostName, String description) throws Exception;
-
-	/**
-	 * Create a connection.
-	 */
-	public IHost createHost(String systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation) throws Exception;
-
-	/**
-	 * 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 SystemConnection to be updated
-	 * @param systemType system type matching one of the system type names defined via the
-	 * systemType extension point.
-	 * @param aliasName 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 where to set the given default user Id from IRSEUserIdConstants.
-	 * @see IRSEUserIdConstants
-	 */
-	public void updateHost(IHost conn, String systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation) throws Exception;
-
-	/**
-	 * Return a connection given its name.
-	 */
-	public IHost getHost(String aliasName);
-
-	/**
-	 * Return the connection at the given zero-based offset
-	 */
-	public IHost getHost(int pos);
-
-	/**
-	 * Add a new connection to the list.
-	 */
-	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 SystemConnection 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 SystemConnection object to rename
-	 * @param newName The new name to give that connection.
-	 */
-	public void renameHost(IHost conn, String newName) throws Exception;
-
-	/**
-	 * Return the zero-based position of a SystemConnection object within its profile.
-	 */
-	public int getHostPosition(IHost conn);
-
-	/**
-	 * Return the number of SystemConnection objects within this pool.
-	 */
-	public int getHostCount();
-
-	/**
-	 * Duplicates a given connection in this list within this list or another list.
-	 * @param targetPool The SystemConnectionPool to hold the copied connection. Can equal this connection, as long as alias name is unique
-	 * @param conn SystemConnection object (within our pool) to clone
-	 * @param aliasName New, unique, alias name to give this connection. Clone will fail if this is not unique.
-	 */
-	public IHost cloneHost(ISystemHostPool targetPool, IHost conn, String aliasName) throws Exception;
-
-	/**
-	 * Move existing connections a given number of positions in the same pool.
-	 * 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 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 Array of SystemConnections to move.
-	 * @param delta the amount by which to move the hosts within this pool
-	 */
-	public void moveHosts(IHost conns[], int delta);
-
-	/**
-	 * Order connections according to user preferences.
-	 * Called after restore.
-	 */
-	public void orderHosts(String[] names);
-
-	/**
-	 * @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 Connections references
-	 */
-	List getHostList();
-
-}
\ 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 940264db6..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java
+++ /dev/null
@@ -1,74 +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.core.model;
-
-/**
- * This interface represents a message we wish to display as child node in the tree view.
- */
-public interface ISystemMessageObject {
-	/**
-	 * 0. An error occurred.
-	 */
-	public static final int MSGTYPE_ERROR = 0;
-	/**
-	 * 1. User canceled
-	 */
-	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();
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java
deleted file mode 100644
index 26035a9bc..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java
+++ /dev/null
@@ -1,45 +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.core.model;
-
-/**
- * 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.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
-	 * @see org.eclipse.rse.core.model.ISystemModelChangeEvents
-	 */
-	public int getEventType();
-
-	/**
-	 * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
-	 * @see org.eclipse.rse.core.model.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/model/ISystemModelChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java
deleted file mode 100644
index 373fbbdcd..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java
+++ /dev/null
@@ -1,103 +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.core.model;
-
-/**
- * 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.model.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 signalled in an implementation of ISystemRegistry. 
- */
-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/model/ISystemModelChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java
deleted file mode 100644
index 4ee77f474..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java
+++ /dev/null
@@ -1,40 +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.core.model;
-
-/**
- * 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.model.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/model/ISystemNewConnectionWizardPage.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemNewConnectionWizardPage.java
deleted file mode 100644
index a805f7750..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemNewConnectionWizardPage.java
+++ /dev/null
@@ -1,47 +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.core.model;
-
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-
-/**
- * Interface that all subsystem factory supplied pages contributed to the New Connection wizard 
- *  must implement.
- * @see org.eclipse.rse.ui.wizards.AbstractSystemNewConnectionWizardPage
- * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)
- */
-public interface ISystemNewConnectionWizardPage {
-
-	/**
-	 * This is called when the users presses Finish. All that should be done here is validation
-	 *  of the input, returning true if all is ok and the finish can proceed.
-	 */
-	public boolean performFinish();
-
-	/**
-	 * This is called frequently by the framework to decide whether to enable the Finish and 
-	 *   Next buttons. 
-	 * <p>
-	 * Return true if the page is complete and has no errors
-	 */
-	public boolean isPageComplete();
-
-	/**
-	 * Return the subsystem factory that supplied this page
-	 */
-	public ISubSystemConfiguration getSubSystemConfiguration();
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java
deleted file mode 100644
index a166b95a8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java
+++ /dev/null
@@ -1,48 +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.core.model;
-
-/**
- * Interface of event sent when a remote system preference changes.
- * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
- */
-public interface ISystemPreferenceChangeEvent {
-
-	/**
-	 * Returns the type of the event.
-	 * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
-	 * @return a type that is one of the constants in this interface
-	 */
-	public int getType();
-
-	/**
-	 * Set the type
-	 * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
-	 */
-	public void setType(int type);
-
-	/**
-	 * Get the old value. For boolean will be a Boolean object
-	 */
-	public Object getOldValue();
-
-	/**
-	 * Get the new value. For boolean will be a Boolean object
-	 */
-	public Object getNewValue();
-
-}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java
deleted file mode 100644
index 4226b7819..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java
+++ /dev/null
@@ -1,45 +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.core.model;
-
-/**
- * Interface of event ID constants for preferences changed
- */
-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/model/ISystemPreferenceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java
deleted file mode 100644
index 3528e3977..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java
+++ /dev/null
@@ -1,33 +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.core.model;
-
-import java.util.EventListener;
-
-/**
- * Interface that listeners interesting in changes to remote
- * system preferences can implement and subsequently register 
- * their interest in via SystemRegistry.
- */
-public interface ISystemPreferenceChangeListener extends EventListener {
-	/**
-	 * This is the method in your class that will be called when a
-	 *  system resource changes.
-	 * @see ISystemPreferenceChangeEvent
-	 */
-	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/model/ISystemProfile.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
deleted file mode 100644
index d1eb5857a..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
+++ /dev/null
@@ -1,99 +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.core.model;
-
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-
-//
-
-/**
- * The interface that RSE system profiles implement.
- * <p>
- * A profile represents a user or name which is used to key important user-data
- *  by:
- * <ul>
- *  <li>Hosts
- *  <li>Filter pools
- *  <li>User actions
- *  <li>Compile commands
- * </ul>
- * 
- * <p>
- * @lastgen interface SystemProfile  {}
- */
-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();
-
-	/**
-	 * Convenience method for create a new connection within this profile.
-	 * Shortcut for {@link ISystemRegistry#createHost(String,String,String,String)}
-	 */
-	public IHost createHost(String systemType, String connectionName, String hostName, String description) throws Exception;
-
-	/**
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * @param value The new value of the Name attribute
-	 */
-	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 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 for this user
-	 */
-	public boolean isActive();
-}
\ No newline at end of file
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 9749ae846..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, 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.core.model;
-

path: root/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample712.wsdl

<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample712" xmlns:tns="http://www.example.org/sample712" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample712">
<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
</wsdl:types>
<wsdl:message name="NewOperationResponse">
<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
</wsdl:message>
<wsdl:message name="NewOperationRequest">
<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
</wsdl:message>
<wsdl:portType name="sample">
<wsdl:operation name="NewOperation">
<wsdl:input message="tns:NewOperationRequest"/>
<wsdl:output message="tns:NewOperationResponse"/>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="sampleSOAP" type="tns:sample">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="NewOperation">
<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
<wsdl:input>
<soap:body use="literal" parts=" NewOperationRequest"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal" parts=" NewOperationResponse"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="sample">
<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
<soap:address location="http://www.example.org/"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>