diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs index 3185d61e906..7ea1ba44fb9 100644 --- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs +++ b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Fri Mar 30 13:59:16 CDT 2007 +#Fri Mar 30 16:58:07 EST 2007 eclipse.preferences.version=1 encoding//src/org/eclipse/rse/internal/persistence/messages.properties=8859_1 diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java new file mode 100644 index 00000000000..30c46b4ec2f --- /dev/null +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java @@ -0,0 +1,22 @@ +/******************************************************************************** + * Copyright (c) 2007 IBM Corporation. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight. + * + * Contributors: + * {Name} (company) - description of contribution. + ********************************************************************************/ +package org.eclipse.rse.core.model; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.core.subsystems.ISubSystem; + +public interface IRSECallback { + + public void operationComplete(String operationName, ISubSystem subsystem, IProgressMonitor monitor); +} diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java index 0d6774a2ba3..4036815450f 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java @@ -16,6 +16,8 @@ package org.eclipse.rse.core.model; +import org.eclipse.rse.internal.core.model.RSEModelResources; + /** * Provides common support for local RSE model objects * Extenders inherit property set support diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystem.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystem.java index 6cf8db1624b..ff975e2feae 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystem.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystem.java @@ -24,6 +24,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.model.IRSEModelObject; import org.eclipse.rse.core.model.IRSEPersistableContainer; import org.eclipse.rse.core.model.ISystemProfile; @@ -353,11 +354,14 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I */ public void connect() throws Exception; + /** * Connect to the remote system from a background job + * + * @param monitor the process monitor */ public void connect(IProgressMonitor monitor) throws Exception; - + /** * Connect to the remote system, optionally forcing a signon prompt even if the password * is cached in memory or on disk. @@ -366,6 +370,28 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I * in memory. */ public void connect(boolean forcePrompt) throws Exception; + + /** + * Connect to the remote system on a background job. The callback is + * called when the connect is complete. + * + * @param callback to call after connect is complete + * @throws Exception + */ + public void connect(IRSECallback callback) throws Exception; + + /** + * Connect to the remote system on a background job. The callback is + * called when the connect is complete. + * + * @param forcePrompt forces the prompt dialog even if the password is in mem + * @param callback to call after connect is complete + * @throws Exception + */ + public void connect(boolean forcePrompt, IRSECallback callback) throws Exception; + + + /** * Disconnect from the remote system. diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java index 0bd2622c0dc..8825f8d018f 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java @@ -22,7 +22,7 @@ import org.eclipse.rse.core.model.IProperty; import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.IPropertyType; import org.eclipse.rse.core.model.PropertyType; -import org.eclipse.rse.core.model.RSEModelResources; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.internal.core.subsystems.ServerLauncher; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java index a7bf3834ee6..dffd20270e3 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilter.java @@ -33,8 +33,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.filters.SystemFilterSimple; -import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.references.IRSEReferencedObject; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.internal.references.SystemReferencedObject; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java index 2b86f8dd960..63151db1309 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPool.java @@ -33,7 +33,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterSavePolicies; import org.eclipse.rse.core.filters.SystemFilterNamingPolicy; -import org.eclipse.rse.core.model.RSEModelResources; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.internal.references.SystemPersistableReferencedObject; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java index bcd1f1a24ef..18d73c41d42 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterString.java @@ -25,8 +25,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.references.IRSEBaseReferencingObject; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.internal.references.SystemReferencedObjectHelper; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RSEModelResources.java similarity index 93% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RSEModelResources.java index 5a2db0f2511..b0e9389dfbf 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RSEModelResources.java @@ -14,7 +14,7 @@ * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies ********************************************************************************/ -package org.eclipse.rse.core.model; +package org.eclipse.rse.internal.core.model; import org.eclipse.osgi.util.NLS; @@ -23,7 +23,7 @@ import org.eclipse.osgi.util.NLS; */ public class RSEModelResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.core.model.RSEModelResources"; //$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.core.model.RSEModelResources"; //$NON-NLS-1$ public static String RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION; public static String RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RSEModelResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelResources.properties rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RSEModelResources.properties diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/subsystems/ServerLauncher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/subsystems/ServerLauncher.java index 451b6748bbe..438a84bdc01 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/subsystems/ServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/subsystems/ServerLauncher.java @@ -18,9 +18,9 @@ package org.eclipse.rse.internal.core.subsystems; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; +import org.eclipse.rse.internal.core.model.RSEModelResources; public abstract class ServerLauncher extends RSEModelObject implements IServerLauncherProperties diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java index 373f177ca18..8203d1fb2b2 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/references/SystemReferencingObject.java @@ -17,9 +17,9 @@ package org.eclipse.rse.internal.references; import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.references.IRSEBaseReferencedObject; import org.eclipse.rse.core.references.IRSEReferencingObject; +import org.eclipse.rse.internal.core.model.RSEModelResources; /** * A class to encapsulate the operations required of an object which diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java index 97dbf62bed7..306df588a18 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java @@ -18,7 +18,7 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.files.ui.widgets.SystemEnterOrSelectRemoteFileForm; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java index de79f4b2131..6d91e0eb9bb 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java @@ -19,7 +19,7 @@ import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.files.ui.widgets.SystemRemoteFolderCombo; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.swt.SWT; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java index cbfd1a2346f..5547ff8edc4 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java @@ -17,8 +17,8 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java index dd7146dd074..c63a113182c 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java @@ -17,8 +17,8 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java index bccc3043027..6eceb4bba2a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java @@ -17,8 +17,8 @@ package org.eclipse.rse.files.ui.dialogs; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.view.SystemActionViewerFilter; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java index 8f1a255fbe4..f5382107b98 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java @@ -19,10 +19,10 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.ISystemAddFileListener; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.rse.ui.messages.ISystemMessageLine; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java index e5d58b8365b..e837969ac58 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java @@ -26,8 +26,8 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java index 1337065ceee..8e206b74576 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java @@ -23,8 +23,8 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java index e94190619d6..64a60ff53cd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java @@ -22,8 +22,8 @@ import java.util.Vector; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.ui.ISystemPreferencesConstants; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index ba3b0b00e70..3829b2db923 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -34,11 +34,11 @@ import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.files.ui.ISystemAddFileListener; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm; import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl; import org.eclipse.rse.internal.ui.view.SystemViewForm; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java index ae7011e2987..2f02ef8d7cd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java @@ -16,8 +16,8 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction; import org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java index c6fad3c3853..9069a335330 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java @@ -17,7 +17,7 @@ package org.eclipse.rse.internal.files.ui.actions; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemSelectFileTypesAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemSelectFileTypesAction.java index 3219b0361f5..ea82e36485b 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemSelectFileTypesAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemSelectFileTypesAction.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.ui.actions.SystemBaseDialogAction; import org.eclipse.rse.ui.dialogs.SystemSelectFileTypesDialog; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java index c29e0b3d1b4..d4282ecefc1 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemFilePropertyPage.java @@ -23,10 +23,10 @@ import java.util.Date; import java.util.List; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEncodingManager; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java index 722c40ca37e..cf2a1a02b0a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java @@ -25,9 +25,9 @@ import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; import org.eclipse.rse.internal.files.ui.FileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java index ee5ef131f91..9da58a8f51b 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java @@ -22,8 +22,8 @@ import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.SystemFilterSimple; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF index 2d25bf7ec01..0351c0e7d57 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.services.dstore Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.services.dstore.Activator +Bundle-Activator: org.eclipse.rse.internal.services.dstore.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services, @@ -17,13 +17,13 @@ Export-Package: org.eclipse.rse.dstore.universal.miners, org.eclipse.rse.dstore.universal.miners.filesystem, org.eclipse.rse.dstore.universal.miners.processes, org.eclipse.rse.internal.dstore.universal.miners.command.patterns, + org.eclipse.rse.internal.services.dstore.files, + org.eclipse.rse.internal.services.dstore.processes, + org.eclipse.rse.internal.services.dstore.rmtservice, + org.eclipse.rse.internal.services.dstore.search, org.eclipse.rse.internal.services.dstore.shell;x-internal:=true, + org.eclipse.rse.internal.services.dstore.shells, org.eclipse.rse.services.dstore, - org.eclipse.rse.services.dstore.files, - org.eclipse.rse.services.dstore.processes, - org.eclipse.rse.services.dstore.rmtservice, - org.eclipse.rse.services.dstore.search, - org.eclipse.rse.services.dstore.shells, org.eclipse.rse.services.dstore.util Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/Activator.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/Activator.java similarity index 96% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/Activator.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/Activator.java index 4a6b2160323..6905c0ca507 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/Activator.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore; +package org.eclipse.rse.internal.services.dstore; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/ServiceResources.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.java similarity index 90% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/ServiceResources.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.java index f8d2317400c..e83be6dc982 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/ServiceResources.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.java @@ -14,13 +14,13 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore; +package org.eclipse.rse.internal.services.dstore; import org.eclipse.osgi.util.NLS; public class ServiceResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.services.dstore.ServiceResources";//$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.services.dstore.ServiceResources";//$NON-NLS-1$ public static String DStore_Shell_Service_Label; public static String DStore_Search_Service_Label; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/ServiceResources.properties b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/ServiceResources.properties rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.properties diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index b79fbd0db49..4dd11da0520 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.files; +package org.eclipse.rse.internal.services.dstore.files; import java.io.BufferedInputStream; import java.io.File; @@ -40,6 +40,7 @@ import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalByteStreamHandler; import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; +import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.IMatcher; import org.eclipse.rse.services.clientserver.IServiceConstants; @@ -51,7 +52,6 @@ import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.dstore.AbstractDStoreService; -import org.eclipse.rse.services.dstore.ServiceResources; import org.eclipse.rse.services.dstore.util.DownloadListener; import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil; import org.eclipse.rse.services.files.IFileService; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreHostFile.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreHostFile.java index 2e392eb036e..e10fb57587c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreHostFile.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.files; +package org.eclipse.rse.internal.services.dstore.files; import java.io.File; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreInputStream.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreInputStream.java index 2cc0f18f5d9..24c6fa23363 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreInputStream.java @@ -11,7 +11,7 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.files; +package org.eclipse.rse.internal.services.dstore.files; import java.io.File; import java.io.FileInputStream; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreOutputStream.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreOutputStream.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java index d2a66fa460b..d7273c8888a 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreOutputStream.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreOutputStream.java @@ -11,7 +11,7 @@ * Contributors: * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.files; +package org.eclipse.rse.internal.services.dstore.files; import java.io.IOException; import java.io.OutputStream; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreVirtualHostFile.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreVirtualHostFile.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreVirtualHostFile.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreVirtualHostFile.java index deac515631a..a1716ca4414 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreVirtualHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreVirtualHostFile.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.files; +package org.eclipse.rse.internal.services.dstore.files; import org.eclipse.dstore.core.model.DataElement; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreHostProcess.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreHostProcess.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreHostProcess.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreHostProcess.java index 20002588b6c..1e6d17274e3 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreHostProcess.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreHostProcess.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.processes; +package org.eclipse.rse.internal.services.dstore.processes; import java.util.HashMap; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreProcessService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java similarity index 98% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreProcessService.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java index 0d91d3f2138..0e9987b5290 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/processes/DStoreProcessService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.processes; +package org.eclipse.rse.internal.services.dstore.processes; import java.util.ArrayList; import java.util.List; @@ -26,12 +26,12 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.rse.dstore.universal.miners.processes.IUniversalProcessDataStoreConstants; import org.eclipse.rse.dstore.universal.miners.processes.UniversalProcessMiner; +import org.eclipse.rse.internal.services.dstore.ServiceResources; 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.ISystemProcessRemoteConstants; -import org.eclipse.rse.services.dstore.ServiceResources; import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor; import org.eclipse.rse.services.processes.AbstractProcessService; import org.eclipse.rse.services.processes.IProcessService; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/rmtservice/DStoreRemoteServiceService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/rmtservice/DStoreRemoteServiceService.java similarity index 96% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/rmtservice/DStoreRemoteServiceService.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/rmtservice/DStoreRemoteServiceService.java index 868e0e1fe47..d1a83648ddd 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/rmtservice/DStoreRemoteServiceService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/rmtservice/DStoreRemoteServiceService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.rmtservice; +package org.eclipse.rse.internal.services.dstore.rmtservice; import org.eclipse.dstore.core.java.IRemoteClassInstance; import org.eclipse.dstore.core.model.IDataStoreProvider; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchResultConfiguration.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchResultConfiguration.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchResultConfiguration.java index 01720b29ebf..9b351d59d79 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchResultConfiguration.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.search; +package org.eclipse.rse.internal.services.dstore.search; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.extra.DomainEvent; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java similarity index 96% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchService.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java index cd078405733..da5850f70b9 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/search/DStoreSearchService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.search; +package org.eclipse.rse.internal.services.dstore.search; import java.util.ArrayList; @@ -23,11 +23,11 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.rse.dstore.universal.miners.filesystem.UniversalFileSystemMiner; +import org.eclipse.rse.internal.services.dstore.ServiceResources; +import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.dstore.AbstractDStoreService; -import org.eclipse.rse.services.dstore.ServiceResources; -import org.eclipse.rse.services.dstore.files.DStoreHostFile; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchConstants; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java index 117e6ed4e3d..7041487c1bb 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java @@ -19,7 +19,7 @@ package org.eclipse.rse.internal.services.dstore.shell; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.rse.services.dstore.shells.DStoreHostOutput; +import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput; 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.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostOutput.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostOutput.java similarity index 95% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostOutput.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostOutput.java index e369f663961..dca8a8d8438 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostOutput.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostOutput.java @@ -12,7 +12,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.shells; +package org.eclipse.rse.internal.services.dstore.shells; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.rse.services.shells.IHostOutput; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostShell.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostShell.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java index 8fbbec090a1..3433d6f9d83 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.shells; +package org.eclipse.rse.internal.services.dstore.shells; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreShellService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreShellService.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java index 70538dae07e..ba413e7a8cd 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreShellService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.services.dstore.shells; +package org.eclipse.rse.internal.services.dstore.shells; import java.util.ArrayList; import java.util.List; @@ -26,10 +26,10 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; import org.eclipse.rse.dstore.universal.miners.command.CommandMiner; import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.dstore.AbstractDStoreService; -import org.eclipse.rse.services.dstore.ServiceResources; import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java index 09841fdf146..c0f78263ae7 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.IDataStoreProvider; +import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java index cc2642c2948..d6dae62d617 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java @@ -28,8 +28,8 @@ import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; +import org.eclipse.rse.internal.services.dstore.ServiceResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.services.dstore.ServiceResources; import org.eclipse.swt.widgets.Display; public class DownloadListener implements IDomainListener,IUniversalDataStoreConstants diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java index 30423a01e4e..e94cca0e1ad 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellHistoryAction.java @@ -20,7 +20,7 @@ import java.io.FileWriter; import org.eclipse.rse.internal.shells.ui.ShellResources; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java index b7bde7739c9..5b6fe025744 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemExportShellOutputAction.java @@ -21,7 +21,7 @@ import java.io.FileWriter; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.rse.internal.shells.ui.ShellResources; import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java rename to rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java index de758a0e2f9..c0c8b5cc0fc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java @@ -15,14 +15,14 @@ * {Name} (company) - description of contribution. *******************************************************************************/ -package org.eclipse.rse.subsystems.files.core; +package org.eclipse.rse.internal.subsystems.files.core; import org.eclipse.osgi.util.NLS; public class SystemFileResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.files.core.SystemFileResources"; //$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.subsystems.files.core.SystemFileResources"; //$NON-NLS-1$ // ------------------- // DEFAULT FILTERS... diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties rename to rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/SearchJob.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/SearchJob.java index 9bdc97114e7..8941e50dd70 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/SearchJob.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/SearchJob.java @@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.ISearchService; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.swt.widgets.Display; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java index 0b50fea5637..223013d06ba 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java @@ -27,7 +27,7 @@ import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.subsystems.IFileConstants; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileFilterString; import org.eclipse.rse.ui.validators.ISystemValidator; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java index fbc0f77d771..6a93145d16a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFile.java @@ -21,7 +21,7 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; -import org.eclipse.rse.services.dstore.files.DStoreHostFile; +import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile; 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.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java index 80fc85a4a0d..dca6fdbbe5a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java @@ -23,8 +23,8 @@ import java.util.List; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService; import org.eclipse.rse.core.subsystems.SubSystem; -import org.eclipse.rse.services.dstore.files.DStoreHostFile; -import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile; +import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile; +import org.eclipse.rse.internal.services.dstore.files.DStoreVirtualHostFile; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java index 2d617a12f18..7d0412e44ea 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java @@ -22,8 +22,8 @@ import java.util.List; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; +import org.eclipse.rse.internal.services.dstore.search.DStoreSearchResultConfiguration; import org.eclipse.rse.services.clientserver.SystemSearchString; -import org.eclipse.rse.services.dstore.search.DStoreSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResult; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreJavaLanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreJavaLanguageUtility.java index e2feb43bda3..85d7587e45e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreJavaLanguageUtility.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreJavaLanguageUtility.java @@ -22,8 +22,8 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; +import org.eclipse.rse.internal.services.dstore.files.DStoreHostFile; import org.eclipse.rse.internal.subsystems.files.core.AbstractJavaLanguageUtility; -import org.eclipse.rse.services.dstore.files.DStoreHostFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreVirtualFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreVirtualFile.java index 29da8e3d2f9..2851e4eadc8 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreVirtualFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreVirtualFile.java @@ -16,7 +16,7 @@ package org.eclipse.rse.internal.subsystems.files.dstore; -import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile; +import org.eclipse.rse.internal.services.dstore.files.DStoreVirtualHostFile; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java index fe514a28192..5782345624a 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java @@ -34,9 +34,9 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.SystemRegistry; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java index 8f1c61895f9..3865896ec03 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java @@ -22,13 +22,13 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager; 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.services.dstore.files.DStoreFileService; +import org.eclipse.rse.internal.services.dstore.search.DStoreSearchService; import org.eclipse.rse.internal.subsystems.files.dstore.DStoreFileAdapter; import org.eclipse.rse.internal.subsystems.files.dstore.DStoreFileSubSystemSearchResultConfiguration; import org.eclipse.rse.internal.subsystems.files.dstore.DStoreLanguageUtilityFactory; import org.eclipse.rse.services.clientserver.SystemSearchString; import org.eclipse.rse.services.dstore.IDStoreService; -import org.eclipse.rse.services.dstore.files.DStoreFileService; -import org.eclipse.rse.services.dstore.search.DStoreSearchService; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java index 44767ceaef0..aa602213fd2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreWindowsFileSubSystemConfiguration.java @@ -23,7 +23,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; +import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; public class DStoreWindowsFileSubSystemConfiguration extends DStoreFileSubSystemConfiguration 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/subsystems/files/local/LocalFileSubSystemConfiguration.java index e0b0f7f0d6d..5a43692a158 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/subsystems/files/local/LocalFileSubSystemConfiguration.java @@ -29,6 +29,7 @@ import org.eclipse.rse.internal.connectorservice.local.LocalConnectorServiceMana 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.core.SystemFileResources; import org.eclipse.rse.internal.subsystems.files.local.LocalLanguageUtilityFactory; import org.eclipse.rse.internal.subsystems.files.local.LocalSearchResultConfiguration; import org.eclipse.rse.internal.subsystems.files.local.model.LocalFileAdapter; @@ -38,7 +39,6 @@ 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.subsystems.files.core.ILanguageUtilityFactory; -import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistry; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF index eebaf6ebea6..533b67420bc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF @@ -5,7 +5,9 @@ Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true Bundle-Version: 1.0.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.rse.subsystems.processes.core, +Export-Package: + org.eclipse.rse.internal.subsystems.processes.core;x-internal:=true, + org.eclipse.rse.internal.subsystems.processes.core.subsystem;x-internal:=true, org.eclipse.rse.subsystems.processes.core.subsystem, org.eclipse.rse.subsystems.processes.core.subsystem.impl, org.eclipse.rse.subsystems.processes.servicesubsystem @@ -16,6 +18,6 @@ Require-Bundle: org.eclipse.rse.services, org.eclipse.ui, org.eclipse.rse.core, org.eclipse.rse.ui -Bundle-Activator: org.eclipse.rse.subsystems.processes.core.Activator +Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.core.Activator Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java similarity index 97% rename from rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/Activator.java rename to rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java index 46f2c3b55b3..6431b9cd20b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.processes.core; +package org.eclipse.rse.internal.subsystems.processes.core; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java similarity index 85% rename from rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java rename to rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java index 5b5d08d5278..2af6401c445 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java @@ -14,14 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.subsystems.processes.core.subsystem; +package org.eclipse.rse.internal.subsystems.processes.core.subsystem; import org.eclipse.osgi.util.NLS; public class SystemProcessesCoreResources extends NLS { - private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; //$NON-NLS-1$ + private static String BUNDLE_NAME = "org.eclipse.rse.internal.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; //$NON-NLS-1$ // PROCESS PROPERTIES public static String RESID_PROPERTY_PROCESS_DEFAULTFILTER_LABEL; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/subsystem/SystemProcessesCoreResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.properties rename to rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/subsystem/SystemProcessesCoreResources.properties diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java index 8570157ecc6..e7cf472196b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java @@ -23,9 +23,9 @@ import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPoolManager; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; +import org.eclipse.rse.internal.subsystems.processes.core.subsystem.SystemProcessesCoreResources; import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration; -import org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorServerPortInput; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/DStoreProcessAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/DStoreProcessAdapter.java index 9dea636d92b..806b6cfe9aa 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/DStoreProcessAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/internal/subsystems/processes/dstore/DStoreProcessAdapter.java @@ -19,8 +19,8 @@ package org.eclipse.rse.internal.subsystems.processes.dstore; import java.util.ArrayList; import org.eclipse.dstore.core.model.DataElement; +import org.eclipse.rse.internal.services.dstore.processes.DStoreHostProcess; import org.eclipse.rse.services.clientserver.processes.IHostProcess; -import org.eclipse.rse.services.dstore.processes.DStoreHostProcess; import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessContext; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java index 070e290e5b5..a3d2bc532c3 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java @@ -21,9 +21,9 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager; 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.services.dstore.processes.DStoreProcessService; import org.eclipse.rse.internal.subsystems.processes.dstore.DStoreProcessAdapter; import org.eclipse.rse.services.dstore.IDStoreService; -import org.eclipse.rse.services.dstore.processes.DStoreProcessService; 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.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java index 1dc6f083233..3e52123bee4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java @@ -18,9 +18,9 @@ package org.eclipse.rse.internal.subsystems.shells.dstore; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.rse.internal.services.dstore.shell.DStoreShellOutputReader; +import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput; +import org.eclipse.rse.internal.services.dstore.shells.DStoreHostShell; import org.eclipse.rse.internal.subsystems.shells.servicesubsystem.OutputRefreshJob; -import org.eclipse.rse.services.dstore.shells.DStoreHostOutput; -import org.eclipse.rse.services.dstore.shells.DStoreHostShell; import org.eclipse.rse.services.shells.IHostOutput; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IHostShellChangeEvent; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java index ca3c2aaa89b..8d17348ccfe 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java @@ -22,9 +22,9 @@ import org.eclipse.rse.connectorservice.dstore.DStoreConnectorServiceManager; 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.services.dstore.shells.DStoreShellService; import org.eclipse.rse.internal.subsystems.shells.dstore.DStoreServiceCommandShell; import org.eclipse.rse.services.dstore.IDStoreService; -import org.eclipse.rse.services.dstore.shells.DStoreShellService; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java index a9e161167f2..ecf2bdc999d 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java @@ -30,7 +30,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemHostPool; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.core.model.RSEModelResources; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.ui.RSESystemTypeAdapter; diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java index d49369b176d..df944423156 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java @@ -26,8 +26,8 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfileManager; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.RSEModelObject; -import org.eclipse.rse.core.model.RSEModelResources; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.core.model.RSEModelResources; import org.eclipse.rse.ui.RSEUIPlugin; /** diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index f3fef31b1f1..4d52f3f4bb7 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -44,6 +44,7 @@ import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterString; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.model.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; @@ -1569,10 +1570,13 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS public class ConnectJob extends SubSystemOperationJob { private SubSystem _ss; - public ConnectJob(SubSystem ss) + private IRSECallback _callback; + + public ConnectJob(SubSystem ss, IRSECallback callback) { super(GenericMessages.RSESubSystemOperation_Connect_message); _ss = ss; + _callback = callback; } public void performOperation(IProgressMonitor mon) throws InterruptedException, Exception @@ -1588,6 +1592,11 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry(); registry.connectedStatusChange(_ss, true, false); + + if (_callback != null) + { + _callback.operationComplete(this.getName(), _ss, mon); + } } } @@ -2357,6 +2366,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS } } + + /** * Required for Bug 176603 */ @@ -2400,6 +2411,17 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS } } + + public void connect(IRSECallback callback) throws Exception + { + connect(false, callback); + } + + public void connect(boolean forcePrompt) throws Exception + { + connect(forcePrompt, null); + } + /** * Connect to the remote system, optionally forcing a signon prompt even if the password * is cached in memory or on disk. @@ -2411,7 +2433,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * @param forcePrompt Forces the signon prompt to be displayed even if a valid password in cached in memory * or saved on disk. */ - public void connect(boolean forcePrompt) throws Exception { + public void connect(boolean forcePrompt, IRSECallback callback) throws Exception { // yantzi: artemis60, (defect 53082) check that the connection has not been deleted before continuing, // this is a defenisve measure to protect against code that stores a handle to subsystems but does // not do this check @@ -2438,7 +2460,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS //dwd ((ProgressMonitorDialog) runnableContext).setCancelable(true); //dwd } getConnectorService().acquireCredentials(forcePrompt); // prompt for userid and password - ConnectJob job = new ConnectJob(this); + ConnectJob job = new ConnectJob(this, callback); scheduleJob(job, null); } }