diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF index 5a1bfb6cb87..f4b76409fba 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.connectorservice.dstore.Activator +Bundle-Activator: org.eclipse.rse.internal.connectorservice.dstore.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui, org.eclipse.rse.core Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.connectorservice.dstore, +Export-Package: + org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.connectorservice.dstore.util Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index def8589ee4b..3a05c66c116 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -58,6 +58,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; +import org.eclipse.rse.internal.connectorservice.dstore.RexecDstoreServer; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.ISystemMessages; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java index ddb043edf2f..70ff2cd4461 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java @@ -19,6 +19,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java similarity index 94% rename from rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java rename to rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java index efd7676d36a..a357890fbc6 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java @@ -14,9 +14,10 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.dstore; +package org.eclipse.rse.internal.connectorservice.dstore; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.ui.ISystemPreferencesConstants; import org.eclipse.rse.ui.RSEUIPlugin; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java similarity index 95% rename from rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.java rename to rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java index 99c4c4d96f7..5d0c679ee35 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.dstore; +package org.eclipse.rse.internal.connectorservice.dstore; import org.eclipse.osgi.util.NLS; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/ConnectorServiceResources.properties rename to rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java similarity index 99% rename from rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java rename to rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java index 531cbf6bae4..9ea3efe08db 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.connectorservice.dstore; +package org.eclipse.rse.internal.connectorservice.dstore; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -24,6 +24,7 @@ import java.net.Socket; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.client.ClientConnection; import org.eclipse.dstore.core.client.ConnectionStatus; +import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.model.SystemSignonInformation; import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF index b93482746a5..0e774f1ccb4 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.dstore.security; singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.rse.dstore.security.UniversalSecurityPlugin +Bundle-Activator: org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml b/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml index 7a8bc4baf49..9ea992386e0 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml +++ b/rse/plugins/org.eclipse.rse.dstore.security/plugin.xml @@ -22,7 +22,7 @@ Contributors: @@ -31,7 +31,7 @@ Contributors: + class="org.eclipse.rse.internal.dstore.security.UniversalKeystoreProvider"> diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/ImageRegistry.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/ImageRegistry.java index 6f4d63ba5ea..7e41b6ae61c 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/ImageRegistry.java @@ -15,7 +15,7 @@ ********************************************************************************/ -package org.eclipse.rse.dstore.security; +package org.eclipse.rse.internal.dstore.security; import java.net.MalformedURLException; import java.net.URL; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalKeystoreProvider.java similarity index 94% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalKeystoreProvider.java index b7085576159..1788d88e4f5 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalKeystoreProvider.java @@ -14,13 +14,13 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security; +package org.eclipse.rse.internal.dstore.security; import java.util.List; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; -import org.eclipse.rse.dstore.security.wizards.SystemImportCertAction; +import org.eclipse.rse.internal.dstore.security.wizards.SystemImportCertAction; import org.eclipse.swt.widgets.Display; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityPlugin.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityPlugin.java index 376c5d6776f..e38172af8dc 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityPlugin.java @@ -15,7 +15,7 @@ ********************************************************************************/ -package org.eclipse.rse.dstore.security; +package org.eclipse.rse.internal.dstore.security; import java.util.MissingResourceException; import java.util.ResourceBundle; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityProperties.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityProperties.java index 3f2a25ae415..185a6f7c597 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityProperties.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security; +package org.eclipse.rse.internal.dstore.security; import org.eclipse.osgi.util.NLS; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.properties b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityProperties.properties similarity index 100% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.properties rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/UniversalSecurityProperties.properties diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertPropertiesDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertPropertiesDialog.java similarity index 84% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertPropertiesDialog.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertPropertiesDialog.java index 45337440bbe..1fafffe1086 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertPropertiesDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertPropertiesDialog.java @@ -15,12 +15,12 @@ ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.widgets.CertificatePropertiesForm; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.widgets.CertificatePropertiesForm; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableContentProvider.java similarity index 96% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableContentProvider.java index 049210b8e3b..bef4829962e 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableContentProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import java.util.ArrayList; import org.eclipse.jface.viewers.IStructuredContentProvider; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableLabelProvider.java similarity index 97% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableLabelProvider.java index 3ed93c68712..2be32d56feb 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableLabelProvider.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableSorter.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableSorter.java index a081f06141a..7886099904b 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/CertTableSorter.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import org.eclipse.jface.viewers.ITableLabelProvider; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/Element.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/Element.java similarity index 91% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/Element.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/Element.java index 3a896518734..660e2d47e78 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/Element.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/Element.java @@ -14,9 +14,9 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; -import org.eclipse.rse.dstore.security.ImageRegistry; +import org.eclipse.rse.internal.dstore.security.ImageRegistry; import org.eclipse.swt.graphics.Image; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyElement.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyElement.java similarity index 78% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyElement.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyElement.java index e2c2baad654..b49d8393201 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyElement.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyElement.java @@ -14,14 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import java.security.Key; -import org.eclipse.rse.dstore.security.ImageRegistry; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.ImageRegistry; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; import org.eclipse.swt.graphics.Image; @@ -52,7 +52,7 @@ public class KeyElement extends Element public Image getImage() { - return org.eclipse.rse.dstore.security.ImageRegistry.getImage(ImageRegistry.IMG_CERTIF_FILE); + return org.eclipse.rse.internal.dstore.security.ImageRegistry.getImage(ImageRegistry.IMG_CERTIF_FILE); } public Object getCert() diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyPropertiesDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyPropertiesDialog.java similarity index 94% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyPropertiesDialog.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyPropertiesDialog.java index 747bcd070bf..7fb2c6e404a 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/KeyPropertiesDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/KeyPropertiesDialog.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/NewCertDialog.java similarity index 93% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/NewCertDialog.java index a9410975a0b..e9f1d414b1d 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/NewCertDialog.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import java.io.FileNotFoundException; @@ -29,11 +29,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.util.GridUtil; -import org.eclipse.rse.dstore.security.util.StringModifier; -import org.eclipse.rse.dstore.security.widgets.CertificateForm; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.util.StringModifier; +import org.eclipse.rse.internal.dstore.security.widgets.CertificateForm; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/RenameCertDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/RenameCertDialog.java similarity index 91% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/RenameCertDialog.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/RenameCertDialog.java index 29e920231a2..c3b9361614e 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/RenameCertDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/RenameCertDialog.java @@ -15,12 +15,12 @@ ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/UniversalSecurityPreferencePage.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/UniversalSecurityPreferencePage.java index 4441a56ba3d..1c0cd451bd6 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/UniversalSecurityPreferencePage.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import java.io.IOException; @@ -42,10 +42,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.Window; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.util.GridUtil; -import org.eclipse.rse.dstore.security.util.StringModifier; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.util.StringModifier; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.swt.SWT; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificateElement.java similarity index 98% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificateElement.java index 20147fb4358..473af6d5441 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificateElement.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import java.security.cert.X509Certificate; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificatePropertiesDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificatePropertiesDialog.java similarity index 94% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificatePropertiesDialog.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificatePropertiesDialog.java index 09f197b3190..85b345b82e8 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificatePropertiesDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/preference/X509CertificatePropertiesDialog.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.preference; +package org.eclipse.rse.internal.dstore.security.preference; import org.eclipse.swt.widgets.Shell; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/GridUtil.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/GridUtil.java similarity index 97% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/GridUtil.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/GridUtil.java index d8721e3098d..c7fd14404f3 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/GridUtil.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/GridUtil.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.util; +package org.eclipse.rse.internal.dstore.security.util; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/StringModifier.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/StringModifier.java similarity index 96% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/StringModifier.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/StringModifier.java index 17d122552a6..6ec4441f7da 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/util/StringModifier.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/util/StringModifier.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.util; +package org.eclipse.rse.internal.dstore.security.util; /** * This class provides static methods for some of the * very used IString operations diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificateForm.java similarity index 95% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificateForm.java index 5da0d680cf2..385bec9f660 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificateForm.java @@ -15,7 +15,7 @@ ********************************************************************************/ -package org.eclipse.rse.dstore.security.widgets; +package org.eclipse.rse.internal.dstore.security.widgets; import java.io.File; import java.io.IOException; @@ -26,9 +26,9 @@ import java.security.cert.CertificateException; import java.util.ArrayList; import org.eclipse.dstore.core.util.ssl.DStoreKeyStore; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.swt.SWT; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificatePropertiesForm.java similarity index 96% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificatePropertiesForm.java index bf6b2dfc8ea..9a109c27a5a 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/widgets/CertificatePropertiesForm.java @@ -14,16 +14,16 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.widgets; +package org.eclipse.rse.internal.dstore.security.widgets; import java.security.Key; import java.security.cert.X509Certificate; import java.text.DateFormat; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.util.GridUtil; -import org.eclipse.rse.dstore.security.util.StringModifier; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.util.StringModifier; import org.eclipse.rse.ui.SystemBaseForm; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/NewCertTableLabelProvider.java similarity index 91% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/NewCertTableLabelProvider.java index 9d128cfbf72..d65a19c42a8 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/NewCertTableLabelProvider.java @@ -14,14 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.wizards; +package org.eclipse.rse.internal.dstore.security.wizards; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.rse.dstore.security.preference.Element; -import org.eclipse.rse.dstore.security.preference.X509CertificateElement; +import org.eclipse.rse.internal.dstore.security.preference.Element; +import org.eclipse.rse.internal.dstore.security.preference.X509CertificateElement; import org.eclipse.swt.graphics.Image; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertAction.java similarity index 90% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertAction.java index e8a9b9e79dd..3e42528dc49 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertAction.java @@ -14,14 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.wizards; +package org.eclipse.rse.internal.dstore.security.wizards; import java.util.List; import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; -import org.eclipse.rse.dstore.security.ImageRegistry; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.ImageRegistry; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; import org.eclipse.rse.ui.actions.SystemBaseWizardAction; import org.eclipse.swt.widgets.Display; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizard.java similarity index 95% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizard.java index 7dbcefd09c0..4b0deb105ea 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizard.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.wizards; +package org.eclipse.rse.internal.dstore.security.wizards; import java.security.KeyStore; import java.security.cert.X509Certificate; @@ -23,8 +23,8 @@ import java.util.List; import org.eclipse.dstore.core.util.ssl.DStoreKeyStore; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; -import org.eclipse.rse.dstore.security.ImageRegistry; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.ImageRegistry; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; import org.eclipse.rse.ui.wizards.AbstractSystemWizard; public class SystemImportCertWizard diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardAliasPage.java similarity index 95% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardAliasPage.java index 17b49748fa6..d30e6fedb4b 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardAliasPage.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.wizards; +package org.eclipse.rse.internal.dstore.security.wizards; import java.security.KeyStore; import java.security.cert.X509Certificate; @@ -23,9 +23,9 @@ import java.util.List; import org.eclipse.dstore.core.util.ssl.DStoreKeyStore; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.preference.X509CertificateElement; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.preference.X509CertificateElement; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardMainPage.java similarity index 92% rename from rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java rename to rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardMainPage.java index d2fd3d7549a..fce715e9150 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/internal/dstore/security/wizards/SystemImportCertWizardMainPage.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.dstore.security.wizards; +package org.eclipse.rse.internal.dstore.security.wizards; import java.security.cert.X509Certificate; import java.util.List; @@ -24,12 +24,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.rse.dstore.security.UniversalSecurityPlugin; -import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.dstore.security.preference.CertTableContentProvider; -import org.eclipse.rse.dstore.security.preference.X509CertificateElement; -import org.eclipse.rse.dstore.security.preference.X509CertificatePropertiesDialog; -import org.eclipse.rse.dstore.security.util.GridUtil; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin; +import org.eclipse.rse.internal.dstore.security.UniversalSecurityProperties; +import org.eclipse.rse.internal.dstore.security.preference.CertTableContentProvider; +import org.eclipse.rse.internal.dstore.security.preference.X509CertificateElement; +import org.eclipse.rse.internal.dstore.security.preference.X509CertificatePropertiesDialog; +import org.eclipse.rse.internal.dstore.security.util.GridUtil; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine;