From 2bf9ac48aab0522ca26e2b8716adabe7b3ba6fa0 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 17 May 2006 08:17:34 +0000 Subject: [PATCH] Remove SSH Service dependency on UI. Update Manifest. Polish About. --- .../META-INF/MANIFEST.MF | 6 ++-- .../about.html | 32 +++++++++++++++++++ .../build.properties | 9 +++--- .../plugin.properties | 9 +++--- .../plugin.xml | 2 +- .../ssh/SftpFileSubSystemConfiguration.java | 2 -- .../META-INF/MANIFEST.MF | 6 ++-- .../plugin.properties | 5 ++- 8 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF index 22cdf248083..edb60e83d6a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF @@ -1,19 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin.name +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ssh; singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.rse.subsystems.files.ssh.Activator +Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.services, org.eclipse.rse.connectorservice.ssh, org.eclipse.rse.services.ssh, - org.eclipse.rse.core, org.eclipse.rse.subsystems.files.core, - com.jcraft.jsch, org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.subsystems.files.ssh -Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html new file mode 100644 index 00000000000..177fd5f1c9b --- /dev/null +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html @@ -0,0 +1,32 @@ + + +
+ +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") 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 http://www.eclipse.org.
+ +SSH is a registered trademark and Secure Shell is a trademark of +SSH Communications Security Corp (http://www.ssh.com)
+ + + diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties index b0c7d260043..fb2d817a6ca 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties @@ -1,7 +1,8 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - .,\ + about.html,\ icons/,\ plugin.properties,\ - plugin.xml + plugin.xml,\ + . +source.. = src/ +output.. = bin/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties index d1a0cf9ddae..c45dfce3604 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006 Wind River Systems, Inc. and others. +# 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 @@ -9,7 +9,8 @@ # Martin Oberhuber - initial API and implementation ################################################################################ -plugin.name = RSE SSH Files +pluginName = RSE SSH Files +providerName = Eclipse.org -SshFileSubsystemName=Sftp Files -SshFileSubsystemDescription=Show Sftp Files on remote host. +SshFileSubsystemName=SSH Files +SshFileSubsystemDescription=Work with files on remote systems using the Secure Shell (ssh) protocol. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml index 04fabb1967f..7538324f56e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml @@ -21,7 +21,7 @@ Martin Oberhuber - initial API and implementation icon="icons/full/obj16/systemfiles_obj.gif" category="files" class="org.eclipse.rse.subsystems.files.ssh.SftpFileSubSystemConfiguration" - vendor="Wind River Systems, Inc." + vendor="%providerName" id="ssh.files"> diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java index 2db9495fff3..be7e0669835 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java @@ -30,8 +30,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; -import com.jcraft.jsch.Session; - public class SftpFileSubSystemConfiguration extends FileServiceSubSystemConfiguration { protected IHostFileToRemoteFileAdapter _hostFileAdapter; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF index ef729bb85bb..2c70ca23f1c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.ssh; singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.rse.subsystems.shells.ssh.Activator +Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.services, org.eclipse.rse.connectorservice.ssh, org.eclipse.rse.services.ssh, - org.eclipse.rse.ui, - org.eclipse.rse.subsystems.shells.core + org.eclipse.rse.subsystems.shells.core, + org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.subsystems.shells.ssh -Bundle-Vendor: Eclipse.org diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties index 57e05fa8b7a..bd1b90c634f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties @@ -12,6 +12,5 @@ pluginName = RSE SSH Shells providerName = Eclipse.org -SshShellSubsystemName=Shells -SshShellSubsystemDescription=This configuration allows you to work with shells and commands on remote systems using the Secure Shell (ssh) protocol. - +SshShellSubsystemName=SSH Shells +SshShellSubsystemDescription=Work with shells and commands on remote systems using the Secure Shell (ssh) protocol.