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.connectorservice.ssh/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties index d24082bdba3..fb2d817a6ca 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties @@ -1,7 +1,8 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - .,\ + about.html,\ + icons/,\ plugin.properties,\ plugin.xml,\ - icons/ + . +source.. = src/ +output.. = bin/ diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties index 089f97bafdd..f6cae31bae8 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties @@ -9,8 +9,9 @@ # Martin Oberhuber - initial API and implementation ################################################################################ -plugin.name = RSE SSH Connector Service +pluginName = RSE SSH Connector Service +providerName = Eclipse.org SshSystemName=SSH Only -SshSystemDescription=Connection for SSH access to remote hosts +SshSystemDescription=Connection for SSH access to remote systems diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java index 951c698d0c8..5a4a87b6aca 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java @@ -17,15 +17,15 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.services.files.IFileService; +import org.eclipse.rse.services.ssh.ISshSessionProvider; import org.eclipse.swt.widgets.Display; import org.eclipse.team.internal.ccvs.ssh2.CVSSSH2Plugin; import org.eclipse.team.internal.ccvs.ssh2.ISSHContants; import org.eclipse.team.internal.ccvs.ui.UserValidationDialog; + import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; -import org.eclipse.rse.services.ssh.ISshSessionProvider; /** * Create SSH connections.