From a47182cf82a10652c83027448cf0b4a314215199 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 15 Feb 2007 09:36:54 +0000 Subject: [PATCH] [174263][api] make org.eclipse.rse.services.ssh internal --- rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml | 3 --- .../org.eclipse.rse.connectorservice.ssh/.classpath | 6 +----- .../connectorservice/ssh/SshConnectorService.java | 2 +- .../.settings/org.eclipse.core.resources.prefs | 4 ++-- .../org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF | 8 ++++---- .../rse/{ => internal}/services/ssh/Activator.java | 2 +- .../rse/{ => internal}/services/ssh/ISshService.java | 2 +- .../services/ssh/ISshSessionProvider.java | 2 +- .../services/ssh/SshServiceResources.java | 4 ++-- .../services/ssh/SshServiceResources.properties | 0 .../services/ssh/files/SftpFileService.java | 10 +++++----- .../services/ssh/files/SftpHostFile.java | 2 +- .../services/ssh/shell/SshHostShell.java | 4 ++-- .../services/ssh/shell/SshShellOutputReader.java | 4 ++-- .../services/ssh/shell/SshShellService.java | 8 ++++---- .../services/ssh/shell/SshShellWriterThread.java | 2 +- .../rse/subsystems/files/ssh/SftpFileAdapter.java | 2 +- .../files/ssh/SftpFileSubSystemConfiguration.java | 4 ++-- .../rse/subsystems/files/ssh/SftpRemoteFile.java | 2 +- .../subsystems/shells/ssh/SshServiceCommandShell.java | 2 +- .../shells/ssh/SshShellSubSystemConfiguration.java | 4 ++-- 21 files changed, 35 insertions(+), 42 deletions(-) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/Activator.java (98%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/ISshService.java (94%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/ISshSessionProvider.java (95%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/SshServiceResources.java (88%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/SshServiceResources.properties (100%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/files/SftpFileService.java (98%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/files/SftpHostFile.java (99%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/shell/SshHostShell.java (98%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/shell/SshShellOutputReader.java (98%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/shell/SshShellService.java (93%) rename rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/{ => internal}/services/ssh/shell/SshShellWriterThread.java (98%) diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml index 70a79d7cd27..fd6938743fe 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -77,9 +77,6 @@ - - - diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath @@ -1,11 +1,7 @@ - - - - - + 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 index edb19722cf9..55b695aa550 100644 --- 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 @@ -57,9 +57,9 @@ 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.services.ssh.ISshSessionProvider; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.core.resources.prefs index 15ddd885914..febf8bb840b 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.core.resources.prefs +++ b/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Fri Jul 07 10:39:59 CEST 2006 +#Thu Feb 15 10:26:03 CET 2007 eclipse.preferences.version=1 -encoding//src/org/eclipse/rse/services/ssh/SshServiceResources.properties=8859_1 +encoding//src/org/eclipse/rse/internal/services/ssh/SshServiceResources.properties=8859_1 diff --git a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF index eed2707ba93..74948fb1321 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.services.ssh;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.services.ssh.Activator +Bundle-Activator: org.eclipse.rse.internal.services.ssh.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services, com.jcraft.jsch;bundle-version="[0.1.28,2.0.0)" Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.services.ssh, - org.eclipse.rse.services.ssh.files, - org.eclipse.rse.services.ssh.shell +Export-Package: org.eclipse.rse.internal.services.ssh;x-friends:="org.eclipse.rse.connectorservice.ssh,org.eclipse.rse.subsystems.files.ssh,org.eclipse.rse.subsystems.shells.ssh", + org.eclipse.rse.internal.services.ssh.files;x-friends:="org.eclipse.rse.connectorservice.ssh,org.eclipse.rse.subsystems.files.ssh,org.eclipse.rse.subsystems.shells.ssh", + org.eclipse.rse.internal.services.ssh.shell;x-friends:="org.eclipse.rse.connectorservice.ssh,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.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/Activator.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/Activator.java index 133f7258b27..8ea883d06af 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/Activator.java @@ -9,7 +9,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.services.ssh; +package org.eclipse.rse.internal.services.ssh; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshService.java similarity index 94% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshService.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshService.java index 445a3a3354c..de86443b236 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshService.java @@ -9,7 +9,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.services.ssh; +package org.eclipse.rse.internal.services.ssh; /** * Markup Interface for services using the SshConnectorService. diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshSessionProvider.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshSessionProvider.java similarity index 95% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshSessionProvider.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshSessionProvider.java index e85cec55117..fd8bbd950b9 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/ISshSessionProvider.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/ISshSessionProvider.java @@ -13,7 +13,7 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.ssh; +package org.eclipse.rse.internal.services.ssh; import com.jcraft.jsch.Session; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/SshServiceResources.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/SshServiceResources.java similarity index 88% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/SshServiceResources.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/SshServiceResources.java index be3dc850e9e..d0f816956d5 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/SshServiceResources.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/SshServiceResources.java @@ -9,12 +9,12 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.services.ssh; +package org.eclipse.rse.internal.services.ssh; import org.eclipse.osgi.util.NLS; public class SshServiceResources extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.rse.services.ssh.SshServiceResources"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.rse.internal.services.ssh.SshServiceResources"; //$NON-NLS-1$ public static String SftpFileService_Error_download_size; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/SshServiceResources.properties b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/SshServiceResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/SshServiceResources.properties rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/SshServiceResources.properties diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java index 277afe523d1..a9cae1bbfda 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java @@ -10,7 +10,7 @@ * Dave Dykstal (IBM) - fixing bug 162510: correctly process filter strings *******************************************************************************/ -package org.eclipse.rse.services.ssh.files; +package org.eclipse.rse.internal.services.ssh.files; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -38,6 +38,10 @@ import com.jcraft.jsch.SftpATTRS; import com.jcraft.jsch.SftpException; import com.jcraft.jsch.SftpProgressMonitor; +import org.eclipse.rse.internal.services.ssh.Activator; +import org.eclipse.rse.internal.services.ssh.ISshService; +import org.eclipse.rse.internal.services.ssh.ISshSessionProvider; +import org.eclipse.rse.internal.services.ssh.SshServiceResources; import org.eclipse.rse.services.Mutex; import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.IMatcher; @@ -49,10 +53,6 @@ import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; -import org.eclipse.rse.services.ssh.Activator; -import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.ISshSessionProvider; -import org.eclipse.rse.services.ssh.SshServiceResources; public class SftpFileService extends AbstractFileService implements IFileService, ISshService { diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpHostFile.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpHostFile.java index 80764d06e24..b723f8ed94c 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpHostFile.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - Adapted from FTPHostFile. ********************************************************************************/ -package org.eclipse.rse.services.ssh.files; +package org.eclipse.rse.internal.services.ssh.files; import java.io.File; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java index 17a80e1f389..7be84ef58e0 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - Adapted from LocalHostShell. ********************************************************************************/ -package org.eclipse.rse.services.ssh.shell; +package org.eclipse.rse.internal.services.ssh.shell; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -29,11 +29,11 @@ import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.Session; +import org.eclipse.rse.internal.services.ssh.ISshSessionProvider; import org.eclipse.rse.services.clientserver.PathUtility; import org.eclipse.rse.services.shells.AbstractHostShell; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IHostShellOutputReader; -import org.eclipse.rse.services.ssh.ISshSessionProvider; /** * A Shell subsystem for SSH. diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellOutputReader.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellOutputReader.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellOutputReader.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellOutputReader.java index e60e36c341f..c049d613321 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellOutputReader.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellOutputReader.java @@ -15,17 +15,17 @@ * Martin Oberhuber (Wind River) - Added vt100 escape sequence ignoring. ********************************************************************************/ -package org.eclipse.rse.services.ssh.shell; +package org.eclipse.rse.internal.services.ssh.shell; import java.io.BufferedReader; import java.io.IOException; +import org.eclipse.rse.internal.services.ssh.Activator; import org.eclipse.rse.services.shells.AbstractHostShellOutputReader; import org.eclipse.rse.services.shells.IHostOutput; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IHostShellOutputReader; import org.eclipse.rse.services.shells.SimpleHostOutput; -import org.eclipse.rse.services.ssh.Activator; /** * Listener to shell output. As io streams through, refresh events are sent out diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java similarity index 93% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java index 86be00dce9c..e0f916307c0 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java @@ -14,16 +14,16 @@ * Martin Oberhuber (Wind River) - Adapted from LocalShellService. ********************************************************************************/ -package org.eclipse.rse.services.ssh.shell; +package org.eclipse.rse.internal.services.ssh.shell; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.internal.services.ssh.ISshService; +import org.eclipse.rse.internal.services.ssh.ISshSessionProvider; +import org.eclipse.rse.internal.services.ssh.SshServiceResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; -import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.ISshSessionProvider; -import org.eclipse.rse.services.ssh.SshServiceResources; /** * A Shell Services for ssh. diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellWriterThread.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellWriterThread.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellWriterThread.java rename to rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellWriterThread.java index 7c9ab20f536..29a81ef78c8 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellWriterThread.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellWriterThread.java @@ -9,7 +9,7 @@ * Martin Oberhuber (Wind River) - initial API and implementation *******************************************************************************/ -package org.eclipse.rse.services.ssh.shell; +package org.eclipse.rse.internal.services.ssh.shell; import java.io.PrintWriter; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java index b7112426181..743f5147209 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java @@ -19,9 +19,9 @@ package org.eclipse.rse.subsystems.files.ssh; import java.util.ArrayList; import java.util.List; +import org.eclipse.rse.internal.services.ssh.files.SftpHostFile; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; import org.eclipse.rse.services.files.IHostFile; -import org.eclipse.rse.services.ssh.files.SftpHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; 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 438689c9055..8df7adeda34 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 @@ -16,13 +16,13 @@ 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.internal.services.ssh.ISshService; +import org.eclipse.rse.internal.services.ssh.files.SftpFileService; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; -import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.files.SftpFileService; import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpRemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpRemoteFile.java index 6a5c308bee2..07dc93a729e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpRemoteFile.java @@ -16,7 +16,7 @@ package org.eclipse.rse.subsystems.files.ssh; -import org.eclipse.rse.services.ssh.files.SftpHostFile; +import org.eclipse.rse.internal.services.ssh.files.SftpHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java index 2ba7a1c2521..4aaa8585fc6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java @@ -23,13 +23,13 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.services.ssh.shell.SshHostShell; import org.eclipse.rse.internal.subsystems.shells.servicesubsystem.OutputRefreshJob; 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.ParsedOutput; import org.eclipse.rse.services.shells.Patterns; -import org.eclipse.rse.services.ssh.shell.SshHostShell; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.shells.core.model.ISystemOutputRemoteTypes; import org.eclipse.rse.subsystems.shells.core.model.RemoteError; 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 bac395db62c..6d3e8f275f3 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 @@ -21,10 +21,10 @@ 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.internal.services.ssh.ISshService; +import org.eclipse.rse.internal.services.ssh.shell.SshShellService; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; -import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.shell.SshShellService; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IServiceCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem;