From a8f117a9eb070eea09e1ade6e8d23777dbe0f354 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 15 Feb 2007 09:19:38 +0000 Subject: [PATCH] [174263][api] make org.eclipse.rse.connectorservice.ssh internal --- .../.settings/org.eclipse.core.resources.prefs | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../rse/{ => internal}/connectorservice/ssh/Activator.java | 2 +- .../{ => internal}/connectorservice/ssh/ISshConstants.java | 2 +- .../{ => internal}/connectorservice/ssh/ISshSubSystem.java | 2 +- .../connectorservice/ssh/KeyboardInteractiveDialog.java | 2 +- .../connectorservice/ssh/SshConnectorResources.java | 4 ++-- .../connectorservice/ssh/SshConnectorResources.properties | 0 .../connectorservice/ssh/SshConnectorService.java | 2 +- .../connectorservice/ssh/SshConnectorServiceManager.java | 2 +- .../connectorservice/ssh/UserValidationDialog.java | 2 +- rse/plugins/org.eclipse.rse.subsystems.files.ssh/.classpath | 6 +----- .../files/ssh/SftpFileSubSystemConfiguration.java | 4 ++-- .../org.eclipse.rse.subsystems.shells.ssh/.classpath | 6 +----- .../shells/ssh/SshShellSubSystemConfiguration.java | 4 ++-- 15 files changed, 19 insertions(+), 27 deletions(-) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/Activator.java (98%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/ISshConstants.java (97%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/ISshSubSystem.java (93%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/KeyboardInteractiveDialog.java (99%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/SshConnectorResources.java (90%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/SshConnectorResources.properties (100%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/SshConnectorService.java (99%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/SshConnectorServiceManager.java (97%) rename rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/{ => internal}/connectorservice/ssh/UserValidationDialog.java (99%) 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 index b212285a072..e4b68380c90 100644 --- 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 @@ -1,3 +1,3 @@ -#Fri Jul 07 11:01:49 CEST 2006 +#Thu Feb 15 10:06:44 CET 2007 eclipse.preferences.version=1 -encoding//src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.properties=8859_1 +encoding//src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties=8859_1 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 index cdd005cd0bf..80496f9f841 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.connectorservice.ssh; singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.rse.connectorservice.ssh.Activator +Bundle-Activator: org.eclipse.rse.internal.connectorservice.ssh.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)" Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.connectorservice.ssh +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/src/org/eclipse/rse/connectorservice/ssh/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java similarity index 98% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java index 0a687abd1d5..3570a5433e2 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java similarity index 97% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshConstants.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java index e1ec3ce80e9..80b26d750f7 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshConstants.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshConstants.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - extracted from various team.cvs plugins *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; /** diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java similarity index 93% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshSubSystem.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java index ed716c1efd2..c6b0c62cea6 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/ISshSubSystem.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/ISshSubSystem.java @@ -9,7 +9,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; /** * Markup Interface for subsystems using the SshConnectorService. diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/KeyboardInteractiveDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java similarity index 99% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/KeyboardInteractiveDialog.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java index 85040956378..7c38a04fd0a 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/KeyboardInteractiveDialog.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java @@ -10,7 +10,7 @@ * IBM Corporation - ongoing maintenance * Martin Oberhuber (Wind River) - copied and adapted from team.cvs.ui *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java similarity index 90% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java index 5370be1cea3..fddef56d1c7 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java @@ -10,12 +10,12 @@ * Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +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.connectorservice.ssh.SshConnectorResources"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.ssh.SshConnectorResources"; //$NON-NLS-1$ static { NLS.initializeMessages(BUNDLE_NAME, SshConnectorResources.class); } diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorResources.properties rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties 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/internal/connectorservice/ssh/SshConnectorService.java similarity index 99% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java index 7a48ae3caee..edb19722cf9 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/internal/connectorservice/ssh/SshConnectorService.java @@ -9,7 +9,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; import java.io.IOException; import java.io.InputStream; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java similarity index 97% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorServiceManager.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java index 140763f1478..540785f1341 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorServiceManager.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - Adapted from LocalConnectorServiceManager. ********************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/UserValidationDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java similarity index 99% rename from rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/UserValidationDialog.java rename to rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java index e9928319e91..26c939b7a85 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/UserValidationDialog.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation * Martin Oberhuber (Wind River) - copied from org.eclipse.team.cvs.ui *******************************************************************************/ -package org.eclipse.rse.connectorservice.ssh; +package org.eclipse.rse.internal.connectorservice.ssh; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/.classpath b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/.classpath +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/.classpath @@ -1,11 +1,7 @@ - - - - - + 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 92b667fac8c..438689c9055 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 @@ -11,11 +11,11 @@ package org.eclipse.rse.subsystems.files.ssh; -import org.eclipse.rse.connectorservice.ssh.SshConnectorService; -import org.eclipse.rse.connectorservice.ssh.SshConnectorServiceManager; 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.internal.connectorservice.ssh.SshConnectorService; +import org.eclipse.rse.internal.connectorservice.ssh.SshConnectorServiceManager; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/.classpath b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/.classpath +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java index 50543a265be..bac395db62c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java @@ -16,11 +16,11 @@ package org.eclipse.rse.subsystems.shells.ssh; -import org.eclipse.rse.connectorservice.ssh.SshConnectorService; -import org.eclipse.rse.connectorservice.ssh.SshConnectorServiceManager; 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.internal.connectorservice.ssh.SshConnectorService; +import org.eclipse.rse.internal.connectorservice.ssh.SshConnectorServiceManager; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.services.ssh.ISshService;