[174263][api] make org.eclipse.rse.services.ssh internal

rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml

@@ -77,9 +77,6 @@
 			<topic label="org.eclipse.rse.services.dstore.rmtservice" href="reference/api/org/eclipse/rse/services/dstore/rmtservice/package-summary.html"/>
 			<topic label="org.eclipse.rse.services.dstore.search" href="reference/api/org/eclipse/rse/services/dstore/search/package-summary.html"/>
 			<topic label="org.eclipse.rse.services.dstore.util" href="reference/api/org/eclipse/rse/services/dstore/util/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.ssh" href="reference/api/org/eclipse/rse/services/ssh/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.ssh.files" href="reference/api/org/eclipse/rse/services/ssh/files/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.ssh.shell" href="reference/api/org/eclipse/rse/services/ssh/shell/package-summary.html"/>
 		</topic>
 		<topic label="DStore Security and Miners" href="provisional_api.html">
 			<topic label="org.eclipse.rse.dstore.security" href="reference/api/org/eclipse/rse/dstore/security/package-summary.html"/>

rse/plugins/org.eclipse.rse.connectorservice.ssh/.classpath

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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;

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

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,
+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.services.ssh.files,
+ 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.services.ssh.shell
+ 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

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;

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.

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;
 

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;
 

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
 {

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;
 

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.

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

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.

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;
 

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;

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;

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;

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;

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;