diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt index c19dcaa701b..dba12ef91a8 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/options.txt +++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt @@ -2,7 +2,6 @@ -encoding "iso-8859-1" -charset "iso-8859-1" -sourcepath "../org.eclipse.rse.connectorservice.dstore/src -;../org.eclipse.rse.connectorservice.local/src ;../org.eclipse.rse.core/persistence ;../org.eclipse.rse.core/src ;../org.eclipse.rse.dstore.security/src @@ -14,17 +13,13 @@ ;../org.eclipse.rse.services/clientserver ;../org.eclipse.rse.services.dstore/src ;../org.eclipse.rse.services.dstore/miners -;../org.eclipse.rse.services.local/src ;../org.eclipse.rse.shells.ui/src ;../org.eclipse.rse.subsystems.files.core/src ;../org.eclipse.rse.subsystems.files.dstore/src -;../org.eclipse.rse.subsystems.files.local/src ;../org.eclipse.rse.subsystems.processes.core/src ;../org.eclipse.rse.subsystems.processes.dstore/src -;../org.eclipse.rse.subsystems.processes.local/src ;../org.eclipse.rse.subsystems.shells.core/src ;../org.eclipse.rse.subsystems.shells.dstore/src -;../org.eclipse.rse.subsystems.shells.local/src ;../org.eclipse.rse.ui/filters ;../org.eclipse.rse.ui/model ;../org.eclipse.rse.ui/UI @@ -56,7 +51,6 @@ org.eclipse.rse.connectorservice.dstore org.eclipse.rse.connectorservice.dstore.util -org.eclipse.rse.connectorservice.local org.eclipse.rse.core org.eclipse.rse.core.comm org.eclipse.rse.core.filters @@ -116,11 +110,6 @@ org.eclipse.rse.services.dstore.search org.eclipse.rse.services.dstore.shells org.eclipse.rse.services.dstore.util org.eclipse.rse.services.files -org.eclipse.rse.services.local -org.eclipse.rse.services.local.files -org.eclipse.rse.services.local.processes -org.eclipse.rse.services.local.search -org.eclipse.rse.services.local.shells org.eclipse.rse.services.processes org.eclipse.rse.services.search org.eclipse.rse.services.shells @@ -137,13 +126,10 @@ org.eclipse.rse.subsystems.files.dstore org.eclipse.rse.subsystems.files.dstore.model org.eclipse.rse.subsystems.files.dstore.old org.eclipse.rse.subsystems.files.dstore.subsystem -org.eclipse.rse.subsystems.files.local -org.eclipse.rse.subsystems.files.local.model org.eclipse.rse.subsystems.processes.core org.eclipse.rse.subsystems.processes.core.subsystem org.eclipse.rse.subsystems.processes.core.subsystem.impl org.eclipse.rse.subsystems.processes.dstore -org.eclipse.rse.subsystems.processes.local org.eclipse.rse.subsystems.processes.servicesubsystem org.eclipse.rse.subsystems.shells.core org.eclipse.rse.subsystems.shells.core.model @@ -151,8 +137,6 @@ org.eclipse.rse.subsystems.shells.core.subsystems org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem org.eclipse.rse.subsystems.shells.dstore org.eclipse.rse.subsystems.shells.dstore.model -org.eclipse.rse.subsystems.shells.local -org.eclipse.rse.subsystems.shells.local.model org.eclipse.rse.ui org.eclipse.rse.ui.actions org.eclipse.rse.ui.dialogs 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 63290760d53..76b6cd6a3e8 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -64,11 +64,6 @@ - - - - - @@ -93,7 +88,6 @@ - @@ -105,15 +99,12 @@ - - - @@ -123,8 +114,6 @@ - - diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.local/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/.classpath +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF index e46fbc53e03..32f33612122 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.connectorservice.local Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.rse.connectorservice.local.Activator +Bundle-Activator: org.eclipse.rse.internal.connectorservice.local.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.connectorservice.local +Export-Package: org.eclipse.rse.internal.connectorservice.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local" Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/Activator.java rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java index f76e72891fc..11bcc2b6671 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.local; +package org.eclipse.rse.internal.connectorservice.local; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.java similarity index 86% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ConnectorServiceResources.java rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.java index 9aa495b4f1d..fa0fda1be56 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ConnectorServiceResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.java @@ -14,13 +14,13 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.local; +package org.eclipse.rse.internal.connectorservice.local; import org.eclipse.osgi.util.NLS; public class ConnectorServiceResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.connectorservice.local.ConnectorServiceResources";//$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.local.ConnectorServiceResources";//$NON-NLS-1$ public static String Local_ConnectorService_Label; public static String Local_ConnectorService_Description; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ConnectorServiceResources.properties rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ConnectorServiceResources.properties diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ILocalSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java similarity index 94% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ILocalSubSystem.java rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java index 7034a17e34a..83b97fbaf79 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/ILocalSubSystem.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/ILocalSubSystem.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.local; +package org.eclipse.rse.internal.connectorservice.local; /** * This is the interface all our subsystems in a local connection implement. diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java similarity index 98% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorService.java rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java index c9b4553dc10..75b69955f2f 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.local; +package org.eclipse.rse.internal.connectorservice.local; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorService; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java similarity index 98% rename from rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorServiceManager.java rename to rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java index 0a56d69d2b6..5496c837bde 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/internal/connectorservice/local/LocalConnectorServiceManager.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.local; +package org.eclipse.rse.internal.connectorservice.local; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; diff --git a/rse/plugins/org.eclipse.rse.services.local/.classpath b/rse/plugins/org.eclipse.rse.services.local/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.services.local/.classpath +++ b/rse/plugins/org.eclipse.rse.services.local/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF index d74b68c1db9..dd654334579 100644 --- a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF @@ -3,17 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.services.local;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.services.local.Activator +Bundle-Activator: org.eclipse.rse.internal.services.local.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.internal.services.local.search;x-internal:=true, - org.eclipse.rse.internal.services.local.shells;x-internal:=true, - org.eclipse.rse.services.local, - org.eclipse.rse.services.local.files, - org.eclipse.rse.services.local.processes, - org.eclipse.rse.services.local.search, - org.eclipse.rse.services.local.shells +Export-Package: org.eclipse.rse.internal.services.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local", + org.eclipse.rse.internal.services.local.files;x-friends:="org.eclipse.rse.subsystems.files.local", + org.eclipse.rse.internal.services.local.processes;x-friends:="org.eclipse.rse.subsystems.processes.local", + org.eclipse.rse.internal.services.local.search;x-friends:="org.eclipse.rse.subsystems.files.local", + org.eclipse.rse.internal.services.local.shells;x-friends:="org.eclipse.rse.subsystems.shells.local" Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/Activator.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/Activator.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/Activator.java index 0b737ea6473..0209cd76ddc 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local; +package org.eclipse.rse.internal.services.local; import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/ILocalService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/ILocalService.java similarity index 94% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/ILocalService.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/ILocalService.java index 6f440b7b91d..d8c24e25e7c 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/ILocalService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/ILocalService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local; +package org.eclipse.rse.internal.services.local; public interface ILocalService { diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalServiceResources.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.java similarity index 89% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalServiceResources.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.java index eb24392f89f..dfacc0a3403 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalServiceResources.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.java @@ -14,13 +14,13 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.files; +package org.eclipse.rse.internal.services.local; import org.eclipse.osgi.util.NLS; public class LocalServiceResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.services.local.files.LocalServiceResources";//$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.services.local.LocalServiceResources";//$NON-NLS-1$ public static String Local_File_Service_Name; public static String Local_Process_Service_Name; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalServiceResources.properties b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalServiceResources.properties rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.properties diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index d7172dd9c24..2225cb2d769 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -15,7 +15,7 @@ * Martin Oberhuber (Wind River) - fix 168586 - isCaseSensitive() on Windows ********************************************************************************/ -package org.eclipse.rse.services.local.files; +package org.eclipse.rse.internal.services.local.files; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -33,6 +33,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.LocalServiceResources; import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.IMatcher; import org.eclipse.rse.services.clientserver.ISystemFileTypes; @@ -48,7 +50,6 @@ import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.RemoteFileException; -import org.eclipse.rse.services.local.ILocalService; public class LocalFileService extends AbstractFileService implements IFileService, ILocalService { diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalHostFile.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalHostFile.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalHostFile.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalHostFile.java index 14b7b803f40..2fb2ceb886b 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalHostFile.java @@ -14,7 +14,7 @@ * Martin Oberhuber (Wind River) - Fix [168591] LocalHostFile missing equals() ********************************************************************************/ -package org.eclipse.rse.services.local.files; +package org.eclipse.rse.internal.services.local.files; import java.io.File; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalVirtualHostFile.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalVirtualHostFile.java similarity index 93% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalVirtualHostFile.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalVirtualHostFile.java index 230b8a7bae7..44fe3f6f7b0 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalVirtualHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalVirtualHostFile.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.files; +package org.eclipse.rse.internal.services.local.files; import java.io.File; @@ -89,7 +89,7 @@ public class LocalVirtualHostFile extends LocalHostFile } /** - * @see org.eclipse.rse.services.local.files.LocalHostFile#renameTo(java.lang.String) + * @see org.eclipse.rse.internal.services.local.files.LocalHostFile#renameTo(java.lang.String) */ public void renameTo(String newAbsolutePath) { _child.renameTo(newAbsolutePath); diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/processes/LocalProcessService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java similarity index 96% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/processes/LocalProcessService.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java index a415653f1de..6613211cdc1 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/processes/LocalProcessService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java @@ -14,21 +14,21 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.processes; +package org.eclipse.rse.internal.services.local.processes; import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.SortedSet; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.LocalServiceResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.processes.IHostProcess; import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter; import org.eclipse.rse.services.clientserver.processes.handlers.ProcessHandler; import org.eclipse.rse.services.clientserver.processes.handlers.ProcessHandlerManager; -import org.eclipse.rse.services.local.ILocalService; -import org.eclipse.rse.services.local.files.LocalServiceResources; import org.eclipse.rse.services.processes.AbstractProcessService; import org.eclipse.rse.services.processes.IProcessService; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java index 38631f68200..7b46c84244c 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchHandler.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java @@ -14,7 +14,7 @@ * Michael Berger (IBM) - Bug 147791 - symbolic links can cause circular search. ********************************************************************************/ -package org.eclipse.rse.services.local.search; +package org.eclipse.rse.internal.services.local.search; import java.io.BufferedReader; import java.io.File; @@ -25,6 +25,8 @@ import java.util.HashSet; import java.util.Iterator; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.internal.services.local.files.LocalHostFile; +import org.eclipse.rse.internal.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.internal.services.local.search.LocalSearchResult; import org.eclipse.rse.services.clientserver.StringCompare; import org.eclipse.rse.services.clientserver.SystemFileClassifier; @@ -39,8 +41,6 @@ import org.eclipse.rse.services.clientserver.search.SystemSearchStringMatchLocat import org.eclipse.rse.services.clientserver.search.SystemSearchStringMatcher; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IHostFile; -import org.eclipse.rse.services.local.files.LocalHostFile; -import org.eclipse.rse.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchService.java similarity index 96% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchService.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchService.java index dc84fcc53d3..39e7dc2e964 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/search/LocalSearchService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.search; +package org.eclipse.rse.internal.services.local.search; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.services.files.IFileService; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalHostShell.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalHostShell.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java index 6440ac5d6e0..85fefa42bd4 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.shells; +package org.eclipse.rse.internal.services.local.shells; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.internal.services.local.shells.LocalShellOutputReader; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellOutputReader.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellOutputReader.java index 3c522af8df4..f1beadac209 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellOutputReader.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellOutputReader.java @@ -19,7 +19,7 @@ package org.eclipse.rse.internal.services.local.shells; import java.io.BufferedReader; import java.io.IOException; -import org.eclipse.rse.services.local.Activator; +import org.eclipse.rse.internal.services.local.Activator; import org.eclipse.rse.services.shells.AbstractHostShellOutputReader; import org.eclipse.rse.services.shells.IHostOutput; import org.eclipse.rse.services.shells.IHostShell; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalShellService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java similarity index 95% rename from rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalShellService.java rename to rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java index 86e425ffa40..a15d6d8e4e2 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/shells/LocalShellService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.local.shells; +package org.eclipse.rse.internal.services.local.shells; import java.io.BufferedReader; import java.io.InputStream; @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.LocalServiceResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.services.local.ILocalService; -import org.eclipse.rse.services.local.files.LocalServiceResources; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/.classpath b/rse/plugins/org.eclipse.rse.subsystems.files.local/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/.classpath +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF index e22d946dda4..377f0046ef1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.files.local;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.subsystems.files.local.Activator +Bundle-Activator: org.eclipse.rse.internal.subsystems.files.local.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui Eclipse-LazyStart: true Bundle-Vendor: %providerName -Export-Package: org.eclipse.rse.subsystems.files.local, - org.eclipse.rse.subsystems.files.local.model +Export-Package: org.eclipse.rse.internal.subsystems.files.local;x-internal:=true, + org.eclipse.rse.internal.subsystems.files.local.model;x-internal:=true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml index 589b1036117..cb5c0ab4f7c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml @@ -27,7 +27,7 @@ Contributors: iconlive="icons/full/obj16/systemfileslive_obj.gif" icon="icons/full/obj16/systemfiles_obj.gif" category="files" - class="org.eclipse.rse.subsystems.files.local.LocalFileSubSystemConfiguration" + class="org.eclipse.rse.internal.subsystems.files.local.LocalFileSubSystemConfiguration" vendor="%providerName" priority="100" id="local.files"> diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java index 30f913c3bd2..51832de9023 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local; +package org.eclipse.rse.internal.subsystems.files.local; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalFileSubSystemConfiguration.java similarity index 94% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalFileSubSystemConfiguration.java index b704bf6571a..3c0d01d37d6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalFileSubSystemConfiguration.java @@ -14,23 +14,24 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local; +package org.eclipse.rse.internal.subsystems.files.local; import java.util.Vector; -import org.eclipse.rse.connectorservice.local.LocalConnectorService; -import org.eclipse.rse.connectorservice.local.LocalConnectorServiceManager; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; 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.local.LocalConnectorService; +import org.eclipse.rse.internal.connectorservice.local.LocalConnectorServiceManager; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.files.LocalFileService; +import org.eclipse.rse.internal.services.local.search.LocalSearchService; +import org.eclipse.rse.internal.subsystems.files.local.model.LocalFileAdapter; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.files.IFileService; -import org.eclipse.rse.services.local.ILocalService; -import org.eclipse.rse.services.local.files.LocalFileService; -import org.eclipse.rse.services.local.search.LocalSearchService; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; @@ -42,7 +43,6 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; -import org.eclipse.rse.subsystems.files.local.model.LocalFileAdapter; /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalJavaLanguageUtility.java similarity index 94% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalJavaLanguageUtility.java index 25df9b329af..b1c5cfbe628 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalJavaLanguageUtility.java @@ -14,17 +14,17 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local; +package org.eclipse.rse.internal.subsystems.files.local; import java.io.File; import java.io.IOException; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.internal.subsystems.files.core.AbstractJavaLanguageUtility; +import org.eclipse.rse.internal.subsystems.files.local.model.LocalFile; import org.eclipse.rse.services.clientserver.java.ClassFileUtil; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; -import org.eclipse.rse.subsystems.files.local.model.LocalFile; /** * This class is the Java language utility for local. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalLanguageUtilityFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalLanguageUtilityFactory.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java index d0fc53fe50b..d73f096d8d0 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalLanguageUtilityFactory.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local; +package org.eclipse.rse.internal.subsystems.files.local; import java.util.HashMap; import java.util.Map; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java similarity index 98% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java index 48c2f87adcc..e2956d560d6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalSearchResultConfiguration.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local; +package org.eclipse.rse.internal.subsystems.files.local; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.files.IHostFile; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFile.java similarity index 94% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFile.java index aee1781e817..fcb79f44a02 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFile.java @@ -14,10 +14,10 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local.model; +package org.eclipse.rse.internal.subsystems.files.local.model; +import org.eclipse.rse.internal.services.local.files.LocalHostFile; import org.eclipse.rse.services.clientserver.SystemFileClassifier; -import org.eclipse.rse.services.local.files.LocalHostFile; 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.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFileAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFileAdapter.java similarity index 93% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFileAdapter.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFileAdapter.java index 3e8147fafac..70d38db7a13 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalFileAdapter.java @@ -14,15 +14,15 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local.model; +package org.eclipse.rse.internal.subsystems.files.local.model; import java.util.ArrayList; import java.util.List; +import org.eclipse.rse.internal.services.local.files.LocalHostFile; +import org.eclipse.rse.internal.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; import org.eclipse.rse.services.files.IHostFile; -import org.eclipse.rse.services.local.files.LocalHostFile; -import org.eclipse.rse.services.local.files.LocalVirtualHostFile; 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.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalVirtualFile.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java rename to rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalVirtualFile.java index 267843e506e..dc4f8d1e924 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/model/LocalVirtualFile.java @@ -14,13 +14,13 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.files.local.model; +package org.eclipse.rse.internal.subsystems.files.local.model; import java.io.File; +import org.eclipse.rse.internal.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild; -import org.eclipse.rse.services.local.files.LocalVirtualHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext; import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/.classpath b/rse/plugins/org.eclipse.rse.subsystems.processes.local/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/.classpath +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF index 8cffc0bf09a..4460dc8bc08 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.local;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.rse.subsystems.processes.local.Activator +Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.local.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui Eclipse-LazyStart: true Bundle-Vendor: %providerName -Export-Package: org.eclipse.rse.subsystems.processes.local +Export-Package: org.eclipse.rse.internal.subsystems.processes.local;x-internal:=true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties index 5d8efe1375c..f7d5695b93f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties @@ -19,5 +19,3 @@ pluginName = RSE Local Processes providerName = Eclipse.org - -Processes=Processes \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml index b58398d5d0c..4ca0b222c63 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml @@ -31,7 +31,7 @@ Contributors: iconlive="icons/full/obj16/processsubsystemlive_obj.gif" icon="icons/full/obj16/processsubsystem_obj.gif" category="processes" - class="org.eclipse.rse.subsystems.processes.local.LocalProcessSubSystemFactory" + class="org.eclipse.rse.internal.subsystems.processes.local.LocalProcessSubSystemFactory" vendor="%providerName" priority="200" id="local.processes"> diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java rename to rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/Activator.java index fb686c382cb..e9aa07d1b09 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.processes.local; +package org.eclipse.rse.internal.subsystems.processes.local; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.processes.ui.ProcessesPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessAdapter.java rename to rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessAdapter.java index 176ede61b37..ed9ecbb287b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessAdapter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.processes.local; +package org.eclipse.rse.internal.subsystems.processes.local; import org.eclipse.rse.services.clientserver.processes.IHostProcess; import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessSubSystemConfiguration.java similarity index 92% rename from rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java rename to rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessSubSystemConfiguration.java index 3b5517826a5..1e95bdb3fa9 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/internal/subsystems/processes/local/LocalProcessSubSystemConfiguration.java @@ -14,16 +14,16 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.processes.local; +package org.eclipse.rse.internal.subsystems.processes.local; -import org.eclipse.rse.connectorservice.local.LocalConnectorService; -import org.eclipse.rse.connectorservice.local.LocalConnectorServiceManager; 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.services.local.ILocalService; -import org.eclipse.rse.services.local.processes.LocalProcessService; +import org.eclipse.rse.internal.connectorservice.local.LocalConnectorService; +import org.eclipse.rse.internal.connectorservice.local.LocalConnectorServiceManager; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.processes.LocalProcessService; import org.eclipse.rse.services.processes.IProcessService; import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/.classpath b/rse/plugins/org.eclipse.rse.subsystems.shells.local/.classpath index 7bdc3fd5675..ce73933404a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/.classpath +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/.classpath @@ -1,11 +1,7 @@ - - - - - + diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF index ef40fe100c5..9d26655ef90 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.local;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-Activator: org.eclipse.rse.subsystems.shells.local.Activator +Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.local.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -17,5 +17,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.subsystems.files.core Eclipse-LazyStart: true Bundle-Vendor: %providerName -Export-Package: org.eclipse.rse.subsystems.shells.local +Export-Package: org.eclipse.rse.internal.subsystems.shells.local;x-internal:=true, + org.eclipse.rse.internal.subsystems.shells.local.model;x-internal:=true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml index f9c3e1e5eb9..6c1fbbd65f2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml @@ -31,7 +31,7 @@ Contributors: iconlive="icons/full/obj16/systemcommandslive_obj.gif" icon="icons/full/obj16/systemcommands_obj.gif" category="shells" - class="org.eclipse.rse.subsystems.shells.local.LocalShellSubSystemConfiguration" + class="org.eclipse.rse.internal.subsystems.shells.local.LocalShellSubSystemConfiguration" vendor="%providerName" priority="300" id="local.shells"> diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java rename to rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java index 2228cdeff6b..94e89a0b075 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.shells.local; +package org.eclipse.rse.internal.subsystems.shells.local; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/LocalShellSubSystemConfiguration.java similarity index 87% rename from rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java rename to rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/LocalShellSubSystemConfiguration.java index 80893d39669..bd56009481c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/LocalShellSubSystemConfiguration.java @@ -14,22 +14,22 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.shells.local; +package org.eclipse.rse.internal.subsystems.shells.local; -import org.eclipse.rse.connectorservice.local.LocalConnectorService; -import org.eclipse.rse.connectorservice.local.LocalConnectorServiceManager; 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.services.local.ILocalService; -import org.eclipse.rse.services.local.shells.LocalShellService; +import org.eclipse.rse.internal.connectorservice.local.LocalConnectorService; +import org.eclipse.rse.internal.connectorservice.local.LocalConnectorServiceManager; +import org.eclipse.rse.internal.services.local.ILocalService; +import org.eclipse.rse.internal.services.local.shells.LocalShellService; +import org.eclipse.rse.internal.subsystems.shells.local.model.LocalServiceCommandShell; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; 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; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration; -import org.eclipse.rse.subsystems.shells.local.model.LocalServiceCommandShell; @@ -90,7 +90,7 @@ public class LocalShellSubSystemConfiguration extends ShellServiceSubSystemConfi /** * Returns false - * @see org.eclipse.rse.internal.subsystems.shells.subsystems.RemoteCmdSubSystemConfiguration#supportsSubSystemConnect() + * @see org.eclipse.rse.subsystems.shells.core.subsystems.RemoteCmdSubSystemConfiguration#supportsSubSystemConnect() */ public boolean supportsSubSystemConnect() { return false; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java similarity index 98% rename from rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java rename to rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java index 0c85e8dfe60..11d8d1f3059 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.shells.local.model; +package org.eclipse.rse.internal.subsystems.shells.local.model; import java.io.File;