From 904823c2ea873608b1fd0328a05ff3cd874de954 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 21 Sep 2006 21:46:28 +0000
Subject: [PATCH] Avoid dependency from daytime example to FTP plugin

---
 .../META-INF/MANIFEST.MF                           |  3 +--
 .../plugin.properties                              |  2 +-
 .../org.eclipse.rse.examples.daytime/plugin.xml    | 14 ++++++++------
 .../org.eclipse.rse.examples.daytime/readme.txt    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

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
index 9c61fc2db62..e61253f771b 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.examples.daytime.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.subsystems.files.ftp,
- org.eclipse.rse.ui,
+Require-Bundle: org.eclipse.rse.ui,
  org.eclipse.rse.services,
  org.eclipse.rse.core,
  org.eclipse.ui,
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
index 1c0d424a7a5..69c48bad62d 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
@@ -12,7 +12,7 @@
 pluginName = RSE Daytime
 providerName = Eclipse.org
 
-FTPDaytimeSystemDescription=FTP and Daytime Connection Type
+DaytimeSystemDescription=Daytime System Type
 
 Files=Files
 FilesDescription=Files via FTP
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
index 1328b2452f3..d4874152abe 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
@@ -11,19 +11,20 @@ Martin Oberhuber (Wind River) - initial API and implementation
 -->
 <?eclipse version="3.1"?>
 <plugin>
-	<!-- Register a System that will only show FTP and Daytime subsystems -->
+	<!-- Register a System that will only show Daytime subsystems -->
 	<extension point="org.eclipse.rse.core.systemTypes">
-		<systemType id="org.eclipse.rse.examples.daytime.systemtype.ftp"
-			name="FTP-Daytime"
-			description="%FTPDaytimeSystemDescription"
+		<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
-			systemTypes="FTP-Daytime"
+			systemTypes="Daytime"
 			name="%Files"
 			description="%FilesDescription"
 			iconlive="icons/full/obj16/systemfileslive_obj.gif"
@@ -35,11 +36,12 @@ Martin Oberhuber (Wind River) - initial API and implementation
 			id="ftp.files">
 		</configuration>
 	</extension>
+	-->
 	<!-- Instantiate the Daytime subsystem from our own plugin -->
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypes="FTP-Daytime;Unix"
+			systemTypes="Daytime;Unix"
 			name="%DaytimeSubsystemName"
 			description="%DaytimeDescription"
 			iconlive="icons/full/obj16/daytimelive_obj.gif"
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/readme.txt b/rse/examples/org.eclipse.rse.examples.daytime/readme.txt
index efee2d91ac9..3f32f75f7a8 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/readme.txt
+++ b/rse/examples/org.eclipse.rse.examples.daytime/readme.txt
@@ -18,7 +18,7 @@ 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 "FTP-Daytime".
+* 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.