Changes since initial population. Bringing support up to Eclipse M6 level. Significant refactoring.

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java

@@ -19,6 +19,7 @@ package org.eclipse.dstore.core.client;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
@@ -37,6 +38,7 @@ import org.eclipse.dstore.core.model.DE;
 import org.eclipse.dstore.core.model.DataElement;
 import org.eclipse.dstore.core.model.DataStore;
 import org.eclipse.dstore.core.model.DataStoreAttributes;
+import org.eclipse.dstore.core.model.IDataStoreConstants;
 import org.eclipse.dstore.core.model.ISSLProperties;
 import org.eclipse.dstore.core.server.ServerCommandHandler;
 import org.eclipse.dstore.core.server.ServerLauncher;
@@ -67,7 +69,7 @@ import org.eclipse.dstore.extra.internal.extra.DomainNotifier;
  * 
  *
  */
-public class ClientConnection
+public class ClientConnection implements IDataStoreConstants
 {
 
 
@@ -91,6 +93,7 @@ public class ClientConnection
 	private String _host;
 	private String _port;
 	private String _hostDirectory;
+	private Socket _launchSocket;
 	
 	private DataStoreTrustManager _trustManager;
 
@@ -103,6 +106,7 @@ public class ClientConnection
 	private static final int HANDSHAKE_SERVER_NEWER = 4;
 	private static final int HANDSHAKE_SERVER_RECENT_OLDER = 5;
 	private static final int HANDSHAKE_SERVER_RECENT_NEWER = 6;
+	private static final int HANDSHAKE_TIMEOUT = 7;
 	
 	private static final int VERSION_INDEX_PROTOCOL = 0;
 	private static final int VERSION_INDEX_VERSION  = 1;
@@ -112,6 +116,7 @@ public class ClientConnection
 	public static String SERVER_OLDER = "Older DataStore Server.";
 	public static String CLIENT_OLDER = "Older DataStore Client.";
 	public static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol.";
+	public static String CANNOT_CONNECT = "Cannot connect to server.";
 
 	/**
 	 * Creates a new ClientConnection instance
@@ -431,7 +436,7 @@ public class ClientConnection
 	 */
 	public ConnectionStatus connect(String ticket)
 	{
-		return connect(ticket, -1);
+		return connect(ticket, 0);
 	}
 	
 	public ConnectionStatus connect(String ticket, int timeout)
@@ -446,7 +451,13 @@ public class ClientConnection
 				port = Integer.parseInt(_port);
 			}
 
-			if (_dataStore.usingSSL())
+			if (!_dataStore.usingSSL())
+			{
+				_theSocket = new Socket(_host, port);
+				if (doTimeOut && (_theSocket != null))
+					_theSocket.setSoTimeout(timeout);
+			}
+			else
 			{
 				String location = _dataStore.getKeyStoreLocation();
 				String pw = _dataStore.getKeyStorePassword();
@@ -477,12 +488,6 @@ public class ClientConnection
 					return result;
 				}
 			}
-			else
-			{
-				_theSocket = new Socket(_host, port);
-				if (doTimeOut && (_theSocket != null))
-					_theSocket.setSoTimeout(timeout);
-			}
 
 			String msg = null;
 			int handshakeResult = doHandShake();
@@ -521,7 +526,8 @@ public class ClientConnection
 			}
 			case HANDSHAKE_INCORRECT:
 			{
-				msg = INCOMPATIBLE_PROTOCOL;
+				msg = CANNOT_CONNECT;
+				msg += INCOMPATIBLE_PROTOCOL;
 				msg += "\nThe server running on "
 					+ _host
 					+ " under port "
@@ -531,7 +537,14 @@ public class ClientConnection
 			}
 			case HANDSHAKE_UNEXPECTED:
 			{
-				msg = "Unexpected exception";
+				msg = CANNOT_CONNECT;
+				msg += "Unexpected exception.";
+				break;
+			}
+			case HANDSHAKE_TIMEOUT:
+			{
+				msg = CANNOT_CONNECT;
+				msg += "Timeout waiting for socket activity.";
 				break;
 			}	
 			default:
@@ -615,78 +628,44 @@ public class ClientConnection
 	 */
 	public ConnectionStatus launchServer(String user, String password, int daemonPort)
 	{
-		ConnectionStatus result = null;
+		return launchServer(user, password, daemonPort, 0);
+	}
+	
+	public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout)
+	{
+		ConnectionStatus result = connectDaemon(daemonPort);
+		boolean doTimeOut = timeout > 0;
+		if (!result.isConnected()) {
+			return result;
+		}
 		try
 		{
-			Socket launchSocket = null;
-			if (_dataStore.usingSSL())
-			{
-				try
-				{
-					String location = _dataStore.getKeyStoreLocation();
-					String pw = _dataStore.getKeyStorePassword();
-					DataStoreTrustManager mgr = getTrustManager();
-					SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr);
-				
-					try
-					{
-						SocketFactory factory = context.getSocketFactory();
-						SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
-						launchSocket = lSocket;
-
-						lSocket.startHandshake();
-
-						SSLSession session = lSocket.getSession();
-						if (session == null)
-						{
-							System.out.println("handshake failed");
-							lSocket.close();
-						}
-					}
-					catch (SSLHandshakeException e)
-					{						
-
-						result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
-						return result;
-					}
-					catch (Exception e)
-					{
-						if (launchSocket != null)
-						{
-							launchSocket.close();
-						}
-						e.printStackTrace();
-						result = new ConnectionStatus(false, e);
-						
-						return result;
-					}
-				}
-				catch (Exception e)
-				{
-					e.printStackTrace();
-				}
-			}
-			else
-			{
-				launchSocket = new Socket(_host, daemonPort);
-			}
-
 			PrintWriter writer = null;
 			BufferedReader reader = null;
 
 			// create output stream for server launcher
 			try
 			{
-				writer = new PrintWriter(new OutputStreamWriter(launchSocket.getOutputStream(), DE.ENCODING_UTF_8));
+				if (doTimeOut) _launchSocket.setSoTimeout(timeout);
+				writer = new PrintWriter(new OutputStreamWriter(_launchSocket.getOutputStream(), DE.ENCODING_UTF_8));
 				writer.println(user);
 				writer.println(password);
 				writer.println(_port);
 				writer.flush();
 
-				reader = new BufferedReader(new InputStreamReader(launchSocket.getInputStream(), DE.ENCODING_UTF_8));
+				reader = new BufferedReader(new InputStreamReader(_launchSocket.getInputStream(), DE.ENCODING_UTF_8));
-				String status = reader.readLine();
+				String status = null;
+				try
+				{
+					status = reader.readLine();
+				}
+				catch (InterruptedIOException e)
+				{
+					result = new ConnectionStatus(false, e);
+				}
 
-				if (status != null && !status.equals("connected"))
+
+				if (status != null && !status.equals(CONNECTED))
 				{
 					result = new ConnectionStatus(false, status);
 				}
@@ -710,7 +689,81 @@ public class ClientConnection
 
 			if (writer != null)
 				writer.close();
-			launchSocket.close();
+			_launchSocket.close();
+		}
+		catch (IOException ioe)
+		{
+			System.out.println(ioe);
+			ioe.printStackTrace();
+			result = new ConnectionStatus(false, ioe);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Connect to a remote daemon
+	 * 
+	 * @param daemonPort the port of the daemon
+	 * @return the status of the connection
+	 */
+	public ConnectionStatus connectDaemon(int daemonPort) {
+		ConnectionStatus result = new ConnectionStatus(true);
+		try
+		{
+			_launchSocket = null;
+			if (_dataStore.usingSSL())
+			{
+				try
+				{
+					String location = _dataStore.getKeyStoreLocation();
+					String pw = _dataStore.getKeyStorePassword();
+					DataStoreTrustManager mgr = getTrustManager();
+					SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr);
+				
+					try
+					{
+						SocketFactory factory = context.getSocketFactory();
+						SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
+						_launchSocket = lSocket;
+
+						lSocket.startHandshake();
+		
+
+						SSLSession session = lSocket.getSession();
+						if (session == null)
+						{
+							System.out.println("handshake failed");
+							lSocket.close();
+						}
+					}
+					catch (SSLHandshakeException e)
+					{						
+
+						result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
+						return result;
+					}
+					catch (Exception e)
+					{
+						if (_launchSocket != null)
+						{
+							_launchSocket.close();
+						}
+						e.printStackTrace();
+						result = new ConnectionStatus(false, e);
+						
+						return result;
+					}
+				}
+				catch (Exception e)
+				{
+					e.printStackTrace();
+				}
+			}
+			else
+			{
+				_launchSocket = new Socket(_host, daemonPort);
+			}
 		}
 		catch (java.net.ConnectException e)
 		{
@@ -732,6 +785,15 @@ public class ClientConnection
 		return result;
 	}
 	
+	/**
+	 * Reeturns the launch socket
+	 * 
+	 * @return the launch socket
+	 */
+	public Socket getLaunchSocket() {
+		return _launchSocket;
+	}
+	
 	/**
 	 * Returns the DataStore that the client is connected to.
 	 * @return the DataStore
@@ -749,31 +811,50 @@ public class ClientConnection
 	private void init(int initialSize)
 	{
 		_clientAttributes = new ClientAttributes();
-		_clientAttributes.setAttribute(DataStoreAttributes.A_ROOT_NAME, _name);
+		_clientAttributes.setAttribute(ClientAttributes.A_ROOT_NAME, _name);
 
 
 		_dataStore = new DataStore(_clientAttributes, initialSize);
 		_dataStore.setDomainNotifier(_domainNotifier);
 		_dataStore.createRoot();
 
-		_host = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME);
+		_host = _clientAttributes.getAttribute(ClientAttributes.A_HOST_NAME);
-		_hostDirectory = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH);
+		_hostDirectory = _clientAttributes.getAttribute(ClientAttributes.A_HOST_PATH);
-		_port = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PORT);
+		_port = _clientAttributes.getAttribute(ClientAttributes.A_HOST_PORT);
-		
-		String[] clientVersionStr = DataStoreAttributes.DATASTORE_VERSION.split("\\.");		
-		_clientVersion =  Integer.parseInt(clientVersionStr[VERSION_INDEX_VERSION]);
-		_clientMinor = Integer.parseInt(clientVersionStr[VERSION_INDEX_MINOR]);
 	}
 
+	private void flush(DataElement object)
+	{
+		_dataStore.flush(object);
+	}
+
+	private void flush()
+	{
+		_dataStore.flush(_dataStore.getHostRoot());
+		_dataStore.flush(_dataStore.getLogRoot());
+		_dataStore.flush(_dataStore.getDescriptorRoot());
+		_dataStore.createRoot();
+	}
 	private int doHandShake()
 	{
 		try
 		{
 			BufferedReader reader = new BufferedReader(new InputStreamReader(_theSocket.getInputStream(), DE.ENCODING_UTF_8));
+			PrintWriter writer = new PrintWriter(new OutputStreamWriter(_theSocket.getOutputStream(), DE.ENCODING_UTF_8));
+			writer.println("");
+			writer.println("");
+			writer.println("");
+			writer.flush();
 			
-			
+			String handshake = null;
-			String handshake = reader.readLine();
+			try
-			
+			{
+				handshake = reader.readLine();
+			}
+			catch (InterruptedIOException e)
+			{
+				return HANDSHAKE_TIMEOUT;
+			}
 			_theSocket.setSoTimeout(0);
 
 			String[] clientVersionStr = DataStoreAttributes.DATASTORE_VERSION.split("\\.");			
@@ -845,4 +926,13 @@ public class ClientConnection
 
 	}
 		
+	public boolean isKnownStatus(String status)
+	{
+		return  status.equals(CONNECTED) ||
+				status.equals(AUTHENTICATION_FAILED) ||
+				status.equals(UNKNOWN_PROBLEM) ||
+				status.startsWith(SERVER_FAILURE) ||
+				status.equals(PASSWORD_EXPIRED) ||
+				status.equals(NEW_PASSWORD_INVALID);
+	}
 }

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java

@@ -2977,7 +2977,7 @@ public final class DataStore
 	 *
 	 * @param root the element to persist from
 	 * @param remotePath the path where the persisted file should be saved
-	 * @param depth the depth of persistance from the root
+	 * @param depth the depth of persistence from the root
 	 */
 	public void saveFile(DataElement root, String remotePath, int depth)
 	{
@@ -3302,7 +3302,16 @@ public final class DataStore
 		if (_userPreferencesDirectory == null) {
 			
 			_userPreferencesDirectory = System.getProperty("user.home");
-			String userID = System.getProperty("user.name");
+			
+			String clientUserID = System.getProperty("client.username");
+			if (clientUserID == null || clientUserID.equals(""))
+			{
+				clientUserID = "";
+			}
+			else
+			{
+				clientUserID += File.separator;
+			}
 			
  			// append a '/' if not there
   			if ( _userPreferencesDirectory.length() == 0 || 
@@ -3312,13 +3321,12 @@ public final class DataStore
 		    }
   		
   			_userPreferencesDirectory = _userPreferencesDirectory + ".eclipse" + File.separator + 
-  																	"RSE" + File.separator + userID + File.separator;
+  			         												"RSE" + File.separator + clientUserID;
 	  		File dirFile = new File(_userPreferencesDirectory);
 	  		if (!dirFile.exists()) {
 	 	 		dirFile.mkdirs();
 	  		}
 		}
-	  	
 	  return _userPreferencesDirectory;
 	}
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java

@@ -0,0 +1,28 @@
+/********************************************************************************
+ * Copyright (c) 2006 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, Kushal Munir, 
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ * 
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+
+package org.eclipse.dstore.core.model;
+
+public interface IDataStoreConstants 
+{
+    public static final String PASSWORD_EXPIRED = "password expired";
+    public static final String NEW_PASSWORD_INVALID = "new password not valid";
+    public static final String AUTHENTICATION_FAILED = "Authentification Failed";
+    public static final String CONNECTED = "connected";
+    public static final String UNKNOWN_PROBLEM = "unknown problem connecting to server";
+    public static final String SERVER_FAILURE = "server failure: ";
+    public static final String ATTEMPT_RECONNECT = "attempt reconnect";
+}

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java

@@ -37,6 +37,7 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 
 import org.eclipse.dstore.core.model.DE;
+import org.eclipse.dstore.core.model.IDataStoreConstants;
 import org.eclipse.dstore.core.model.ISSLProperties;
 import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
 
@@ -285,7 +286,7 @@ public class ServerLauncher extends Thread
 
 					if ((launchStatus == null) || !launchStatus.equals("success"))
 					{
-						_writer.println("Authentification Failed");
+						_writer.println(IDataStoreConstants.AUTHENTICATION_FAILED);
 					}
 					else
 					{
@@ -295,7 +296,7 @@ public class ServerLauncher extends Thread
 						if ((status != null) && status.equals(ServerReturnCodes.RC_SUCCESS))
 						{
 							_errReader.readLine();
-							_writer.println("connected");
+							_writer.println(IDataStoreConstants.CONNECTED);
 							_writer.println(_port);
 							_writer.println(ticket);
 
@@ -306,7 +307,7 @@ public class ServerLauncher extends Thread
 						{
 							if (status == null)
 							{
-								status = new String("unknown problem connecting to server");
+								status = new String(IDataStoreConstants.UNKNOWN_PROBLEM);
 							}
 
 							_writer.println(status);
@@ -323,7 +324,7 @@ public class ServerLauncher extends Thread
 				}
 				catch (IOException e)
 				{
-					_writer.println("server failure: " + e);
+					_writer.println(IDataStoreConstants.SERVER_FAILURE + e);
 				}
 			}
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java

@@ -110,7 +110,7 @@ public class DataStoreTrustManager implements X509TrustManager
 					X509Certificate tcert = (X509Certificate)_trustedCerts.get(j);
 					try
 					{
-						tcert.verify(cert.getPublicKey());
+						cert.verify(tcert.getPublicKey());
 						foundMatch = true;
 					}
 					catch (Exception e)

rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF

@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.dstore,
  org.eclipse.dstore.core,
  org.eclipse.dstore.extra,
- org.eclipse.rse.ui
+ org.eclipse.rse.ui,
+ org.eclipse.rse.core
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.dstore,
  org.eclipse.rse.connectorservice.dstore.util

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/Activator.java

@@ -16,7 +16,11 @@
 
 package org.eclipse.rse.connectorservice.dstore;
 
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
+import org.eclipse.rse.ui.ISystemPreferencesConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.osgi.framework.BundleContext;
 
 
@@ -38,8 +42,14 @@ public class Activator extends SystemBasePlugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
-	public void start(BundleContext context) throws Exception {
+	public void start(BundleContext context) throws Exception 
+	{
 		super.start(context);
+        IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+    	store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IUniversalDStoreConstants.DEFAULT_PREF_SOCKET_TIMEOUT);
+		store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
+		store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
+
 	}
 
 	/**

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java

@@ -33,15 +33,17 @@ import org.eclipse.dstore.core.java.RemoteClassLoader;
 import org.eclipse.dstore.core.model.DE;
 import org.eclipse.dstore.core.model.DataElement;
 import org.eclipse.dstore.core.model.DataStore;
+import org.eclipse.dstore.core.model.IDataStoreConstants;
 import org.eclipse.dstore.core.model.IDataStoreProvider;
 import org.eclipse.dstore.core.model.ISSLProperties;
+import org.eclipse.dstore.core.server.ServerLauncher;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.connectorservice.dstore.util.ConnectionStatusListener;
 import org.eclipse.rse.connectorservice.dstore.util.StatusMonitor;
 import org.eclipse.rse.connectorservice.dstore.util.StatusMonitorFactory;
-import org.eclipse.rse.core.ISystemTypes;
+import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
 import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
 import org.eclipse.rse.core.subsystems.AbstractConnectorService;
@@ -58,7 +60,10 @@ import org.eclipse.rse.model.SystemSignonInformation;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.ISystemPreferencesConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemPropertyResources;
+import org.eclipse.rse.ui.actions.DisplayHidableSystemMessageAction;
 import org.eclipse.rse.ui.actions.DisplaySystemMessageAction;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Display;
@@ -266,7 +271,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	    // fall back to getting local machine ip address
 	    // this may be incorrect for the server in certain cases
 	    // like over VPN
-	    return SystemPlugin.getLocalMachineIPAddress();
+	    return RSEUIPlugin.getLocalMachineIPAddress();
 	}
 	
 	/**
@@ -279,7 +284,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	
 	protected int getSocketTimeOutValue()
 	{
-		IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 		return store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT);
 	}
 
@@ -345,7 +350,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 
 	protected void setPluginPathProperty()
 	{
-		Bundle bundle = SystemPlugin.getDefault().getBundle();
+		Bundle bundle = RSEUIPlugin.getDefault().getBundle();
 		URL pluginsURL = bundle.getEntry("/");
 	
 		try
@@ -468,20 +473,6 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 
 		clientConnection = new ClientConnection(getPrimarySubSystem().getHost().getAliasName());
 
-		boolean useSSL = isUsingSSL();
-		if (useSSL)
-		{
-			ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-			if (provider != null)
-			{
-				String keyStore = provider.getKeyStorePath();
-				String password = provider.getKeyStorePassword();
-				
-				ISSLProperties properties = new ClientSSLProperties(true, keyStore, password);
-				clientConnection.setSSLProperties(properties);
-			}
-		}
-
 		clientConnection.setHost(getHostName());
 		clientConnection.setPort(Integer.toString(getPort()));
 
@@ -504,13 +495,12 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 
 		// get Socket Timeout Value Preference
 		int timeout = getSocketTimeOutValue();
-		if (timeout <= 0) timeout = IUniversalDStoreConstants.DEFAULT_PREF_SOCKET_TIMEOUT;
 		
 		if (serverLauncherType == ServerLaunchType.REXEC_LITERAL)
 		{	
 			if (monitor != null)
 			{
-				SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_REXEC);
+				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_REXEC);
 				monitor.subTask(cmsg.getLevelOneText());	
 			}
 			
@@ -523,33 +513,33 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			starter.setServerLauncherProperties(serverLauncher);
 
 
-			String serverPort = (String)starter.launch(monitor);	
+			int iServerPort = launchUsingRexec(monitor, info, serverLauncher);
-			if (monitor.isCanceled())
-			{
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED);
-				throw new SystemMessageException(msg);
-			}
 			
-			if(!serverPort.equals("0"))
+			if(iServerPort != 0)
 			{				
-				int iServerPort = 0;
+				clientConnection.setPort("" + iServerPort);
-				if (serverPort != null)
-				{
-					iServerPort = Integer.parseInt(serverPort);		
-				}
-				
-				clientConnection.setPort(serverPort);
 				
 				if (monitor != null)
 				{
-					SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
+					SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
 					cmsg.makeSubstitution(clientConnection.getPort());
 					monitor.subTask(cmsg.getLevelOneText());
 				}
 				
 				// connect to launched server
 				connectStatus = clientConnection.connect(null, timeout);
-				
+				if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT))
+				{
+					if (setSSLProperties(true))
+					{
+						iServerPort = launchUsingRexec(monitor, info, serverLauncher);
+						if (iServerPort != 0)
+						{
+							clientConnection.setPort("" + iServerPort);
+							connectStatus = clientConnection.connect(null, timeout);
+						}
+					}
+				}
 			}
 			else
 			{
@@ -559,7 +549,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				String errorMsg = null;
 				if (msg == null)
 				{
-					errorMsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText();
+					errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText();
 				}
 				else
 				{
@@ -573,7 +563,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		{
 			if (monitor != null)
 			{
-				SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_DAEMON);
+				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_STARTING_SERVER_VIA_DAEMON);
 				monitor.subTask(cmsg.getLevelOneText());		
 			}
 
@@ -593,41 +583,80 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			
 			// DKM - changed to use protected member so that others can override
 			//launchStatus = clientConnection.launchServer(info.getUserid(), info.getPassword(), daemonPort);
+			boolean usedSSL = false;
 			launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
+			if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage()))
+			{
+				if (setSSLProperties(true))
+				{
+					usedSSL = true;
+					launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
+				}
+			}
 			
 			if (!launchStatus.isConnected())
 			{
-				launchFailed = true;
+				String launchMsg = launchStatus.getMessage();
-				SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null);
+				// If password has expired and must be changed
+				if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
+				{
+					NewPasswordInfo newPasswordInfo = null;
+					while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
+					{
+						newPasswordInfo = promptForNewPassword(isPasswordExpired(launchMsg) ? RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_EXPIRED) : RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_INVALID));
+						launchStatus = changePassword(clientConnection, getPasswordInformation(), serverLauncher, monitor, newPasswordInfo.newPassword);
+						launchMsg = launchStatus.getMessage();
+					}
+					if (newPasswordInfo != null) 
+					{
+						setPassword(info.getUserid(), newPasswordInfo.newPassword, newPasswordInfo.savePassword);
+						info = getPasswordInformation();
+					}
+					if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
+					{
+						connect(monitor);
+						return;
+					}
+				}
+				else
+				{
+					launchFailed = true;
+					SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null);
+				}
 			}
 			if (launchStatus.isConnected())
 			{
 				if (monitor != null)
 				{
-					SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
+					SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
 					cmsg.makeSubstitution(clientConnection.getPort());
 					monitor.subTask(cmsg.getLevelOneText());
 				}
 				// connect to launched server
+				setSSLProperties(false);
 				connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
-				
+				if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT))
-				if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
 				{
-	
+					setSSLProperties(usedSSL);
-					
+					launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
-					List certs = connectStatus.getUntrustedCertificates();
+					if (!launchStatus.isConnected())
-					if (certs != null && certs.size() > 0)
 					{
-						ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
+						launchFailed = true;
-						if (provider != null)
+						SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null);
+					}
+					else
+					{
+						if (setSSLProperties(true))
 						{
-							if (provider.importCertificates(certs))
+							connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
-							{
-								connect(monitor);
-							}
 						}
 					}
 				}
+				if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
+				{					
+					importCertsAndReconnect(connectStatus, monitor);
+					return;
+				}
 
 				/*
 				if (connectStatus != null && connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_UPDATE))
@@ -641,30 +670,71 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			{
 				connectStatus = new ConnectionStatus(false);
 				connectStatus.setMessage(
-					SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText());
+					RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED).getLevelOneText());
 			}
 		}
 		else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL)
 		{
 			if (monitor != null)
 			{
-				SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
+				SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
 				cmsg.makeSubstitution(clientConnection.getPort());
 				monitor.subTask(cmsg.getLevelOneText());
 			}
 			// connection directly
-			connectStatus = clientConnection.connect(null, timeout);
+			boolean useSSL = isUsingSSL();
+			if (setSSLProperties(useSSL))
+				connectStatus = clientConnection.connect(null, timeout);
 		}
 		// server launcher type is unknown
 		else
 		{
 			SystemSignonInformation info = getPasswordInformation();
 			connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
+			if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage()))
+			{
+				if (setSSLProperties(true))
+				{
+					connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
+					if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
+					{
+						importCertsAndReconnect(connectStatus, monitor);
+						return;
+					}
+				}
+			}
+
 		}
 
 		// if connected
 		if (connectStatus != null && connectStatus.isConnected())
 		{
+			IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+			if (clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_SSL))
+			{
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_USING_SSL);
+				msg.makeSubstitution(getHostName());
+				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_SSL);
+				Display.getDefault().syncExec(msgAction);
+				if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
+				{
+					disconnect();
+					throw new InterruptedException();
+				}
+			}
+			else if (!clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL))
+			{
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_NOT_USING_SSL);
+				msg.makeSubstitution(getHostName());
+				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL);
+				Display.getDefault().syncExec(msgAction);
+				if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
+				{
+					disconnect();
+					throw new InterruptedException();
+				}
+			}
+	
 			DataStore dataStore = clientConnection.getDataStore();
 
 			_connectionStatusListener = new ConnectionStatusListener(dataStore.getStatus(), this);
@@ -707,12 +777,12 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				if (message.startsWith(ClientConnection.CLIENT_OLDER))
 				{
 					
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CLIENT_OLDER_WARNING);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CLIENT_OLDER_WARNING);
 					msg.makeSubstitution(getHostName());
 				}
 				else if (message.startsWith(ClientConnection.SERVER_OLDER))
 				{
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_OLDER_WARNING);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_OLDER_WARNING);
 					msg.makeSubstitution(getHostName());
 				}
 				ShowConnectMessage msgAction = new ShowConnectMessage(msg);
@@ -726,7 +796,6 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			if (serverVersion >= 8 || (serverVersion == 7 && getServerMinor() >= 1))
 			{
 				//	 register the preference for remote class caching with the datastore
-				IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
 				store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, IUniversalDStoreConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES);
 				boolean cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
 				
@@ -741,7 +810,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		         // Initialzie the miners
 		         if (monitor != null)
 		         {
-		            SystemMessage imsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_INITIALIZING_SERVER);
+		            SystemMessage imsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_INITIALIZING_SERVER);
 		            monitor.subTask(imsg.getLevelOneText());
 		         }
 		         DataElement initStatus = dataStore.initMiners();	         
@@ -771,7 +840,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 						ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
 						if (provider != null)
 						{
-							if (provider.importCertificates(certs))
+							if (provider.importCertificates(certs, getHostName()))
 							{
 								connect(monitor);
 								return;
@@ -781,7 +850,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 					else
 					{
 					
-						msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_SSL_EXCEPTION);
+						msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_SSL_EXCEPTION);
 						msg.makeSubstitution(launchStatus.getMessage());
 					}
 				} 	
@@ -794,10 +863,10 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				if (launchStatus.getException() != null)
 				{
 					Throwable exception = launchStatus.getException();
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED_EXCEPTION);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED_EXCEPTION);
 					msg.makeSubstitution(getHostName(), ""+serverLauncher.getDaemonPort(), exception);
 				}
-				else if (launchMsg != null && launchMsg.indexOf("Authentification Failed") != -1)
+				else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1)
 				{
 					if (launchFailed)
 				    {
@@ -805,7 +874,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				    }
 				
 					// Display error message
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_AUTH_FAILED);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_AUTH_FAILED);
 					msg.makeSubstitution(getHostName());
 					DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg);
 					Display.getDefault().syncExec(msgAction);
@@ -841,9 +910,29 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 					// Since we got here we must be connected so skip error checking below
 					return;
 				}
+				// If password has expired and must be changed
+				else if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
+				{
+					NewPasswordInfo newPasswordInfo = null;
+					while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
+					{
+						newPasswordInfo = promptForNewPassword(isPasswordExpired(launchMsg) ? RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_EXPIRED) : RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_INVALID));
+						launchStatus = changePassword(clientConnection, getPasswordInformation(), serverLauncher, monitor, newPasswordInfo.newPassword);
+						launchMsg = launchStatus.getMessage();
+					}
+					if (newPasswordInfo != null) 
+					{
+						setPassword(getPasswordInformation().getUserid(), newPasswordInfo.newPassword, newPasswordInfo.savePassword);
+					}
+					if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
+					{
+						connect(monitor);
+						return;
+					}
+				}
 				else if (launchMsg != null)
 				{					
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED);
 					msg.makeSubstitution(getHostName(), clientConnection.getPort(), launchMsg);
 				}
 			}
@@ -853,12 +942,12 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			{
 				if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_SERVER_UPDATE))
 				{
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_UPDATE);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_UPDATE);
 					msg.makeSubstitution(getHostName());
 				}
 				else if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_PROTOCOL))
 				{
-					msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_PROTOCOL);
+					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INCOMPATIBLE_PROTOCOL);
 					msg.makeSubstitution(getHostName());
 				}
 				else
@@ -866,7 +955,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 					Throwable exception = connectStatus.getException();
 					if (exception != null)
 					{
-						msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
+						msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
 						msg.makeSubstitution(getHostName(), exception);
 					}
 				}
@@ -876,7 +965,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			else if (connectStatus == null)
 			{
 				SystemBasePlugin.logError("Failed to connect to remote system", null);
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
 				msg.makeSubstitution(getHostName());
 			}
 
@@ -884,7 +973,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			if (msg == null)
 			{
 				SystemBasePlugin.logError("Failed to connect to remote system" + connectStatus.getMessage(), null);
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_CONNECT_FAILED);
 				msg.makeSubstitution(getHostName());
 			}
 
@@ -938,6 +1027,75 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		}
 	}
 	
+	protected boolean isPasswordExpired(String message)
+	{
+		return message.indexOf(IDataStoreConstants.PASSWORD_EXPIRED) != -1;
+	}
+	
+	protected boolean isNewPasswordInvalid(String message)
+	{
+		return message.indexOf(IDataStoreConstants.NEW_PASSWORD_INVALID) != -1;
+	}
+	
+	protected void importCertsAndReconnect(ConnectionStatus connectStatus, IProgressMonitor monitor) throws Exception
+	{
+		List certs = connectStatus.getUntrustedCertificates();
+		if (certs != null && certs.size() > 0)
+		{	
+			ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
+			if (provider != null)
+			{
+				if (provider.importCertificates(certs, getHostName()))
+				{
+					connect(monitor);
+					return;
+				}
+				else
+				{
+					throw new InterruptedException();
+				}
+			}
+		}
+	}
+	
+	protected int launchUsingRexec(IProgressMonitor monitor, SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties) throws Exception
+	{
+		IServerLauncher starter = getRemoteServerLauncher();
+		starter.setSignonInformation(info);
+		starter.setServerLauncherProperties(serverLauncherProperties);
+
+		String serverPort = (String)starter.launch(monitor);	
+		if (monitor.isCanceled())
+		{
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED);
+			throw new SystemMessageException(msg);
+		}
+		
+		int iServerPort = 0;
+		if (serverPort != null)
+		{
+			iServerPort = Integer.parseInt(serverPort);		
+		}
+		return iServerPort;
+	}
+	
+	protected boolean setSSLProperties(boolean enable)
+	{
+		ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
+		if (provider != null)
+		{
+			String keyStore = provider.getKeyStorePath();
+			String password = provider.getKeyStorePassword();
+			
+			ISSLProperties properties = new ClientSSLProperties(enable, keyStore, password);
+			clientConnection.setSSLProperties(properties);
+			return true;
+		}
+		else return false;
+	}
+
+	
+	
 	protected boolean promptForTrusting(Shell shell, X509Certificate cert)
 	{
 		return true;
@@ -950,7 +1108,17 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	 */
 	 protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor)
 	 {
-	     return clientConnection.launchServer(info.getUserid(), info.getPassword(), daemonPort);
+	     return launchServer(clientConnection, info, daemonPort, monitor, 0);
+	 }
+	 
+	 
+	/* 
+	 * Launch a DataStore server using a daemon.   This method can be overridden if a custom implementation is required.
+	 * The default implementation uses the daemon client that is built into ClientConnection.
+	 */
+	 protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor, int timeout)
+	 {
+	     return clientConnection.launchServer(info.getUserid(), info.getPassword(), daemonPort, timeout);
 	 }
 
 	 /*
@@ -963,6 +1131,25 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		 return null;
 	 }
 	 
+	 /**
+	  * Change the password on a remote system and optionally remain connected to it. Subclasses must implement this
+	  * method if they wish to 
+	  * @param clientConnection The connection on which the password must be changed
+	  * @param info The old SystemSignonInformation, including the old password.
+	  * @param serverLauncherProperties The properties of the server launcher used to connect to the server. Use this object to get the type of serverlauncher, if your implementation varies depending on the type.
+	  * @param monitor a progress monitor
+	  * @param newPassword the new password to which the old one will be changed.
+	  * @return the status of the password change and optionally the connection. If the new password is rejected by the remote
+	  * system, return new ConnectionStatus(false, IDataStoreConstants.NEW_PASSWORD_INVALID).
+	  * If the system is now connected, and the server is ready to be connected, construct a new ConnectionStatus(true) and if using the RSE daemon, set the ticket on it
+	  * to the ticket number of the server. If you wish to just have the UniversalSystem attempt a reconnect from the beginning after changing the password,
+	  * return new ConnectionStatus(true, IDataStoreConstants.ATTEMPT_RECONNECT).
+	  */
+	 protected ConnectionStatus changePassword(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties, IProgressMonitor monitor, String newPassword)
+	 {
+		 return new ConnectionStatus(false, IDataStoreConstants.AUTHENTICATION_FAILED);
+	 }
+	 
 	/**
 	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected()
 	 */
@@ -998,7 +1185,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	{
 		for (int idx = 0; idx < warnings.size(); idx++)
 		{
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_GENERIC_W);
 			msg.makeSubstitution((warnings.elementAt(idx)).toString());
 			SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
 			msgDlg.open();
@@ -1029,7 +1216,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		// really authenticate with the remote system and this would be decieving 
 		// for the end user
 
-		if (getPrimarySubSystem().getHost().getSystemType().equals(ISystemTypes.SYSTEMTYPE_WINDOWS))
+		if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS))
 		{
 			String userid = getPrimarySubSystem().getUserId();
 			if (userid == null)
@@ -1037,7 +1224,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				userid = "remoteuser";
 			}
 			SystemSignonInformation info = new SystemSignonInformation(getPrimarySubSystem().getHost().getHostName(),
-																	   userid, "", ISystemTypes.SYSTEMTYPE_WINDOWS);
+																	   userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS);
 			return info;
 		}
 		else
@@ -1053,7 +1240,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	{
 		// For Windows we never prompt for userid / password so we don't need 
 		// to clear the password cache
-		if (getPrimarySubSystem().getHost().getSystemType().equals(ISystemTypes.SYSTEMTYPE_WINDOWS))
+		if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS))
 		{
 			return false;
 		}

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java

@@ -25,13 +25,13 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.dstore.core.client.ClientConnection;
 import org.eclipse.dstore.core.client.ConnectionStatus;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.IIBMServerLauncher;
 import org.eclipse.rse.core.subsystems.IServerLauncher;
 import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
 import org.eclipse.rse.model.SystemSignonInformation;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 
 /**
  * Launch Datastore server on selected host using the rexec
@@ -452,7 +452,7 @@ public class RexecDstoreServer implements IServerLauncher
 			// this should be stored in some resource bundle later 
 			//cmd = new String ("echo USSTEST;cd ~/dstore;start_anyport");
 			//cmd = new String("echo " + ASCII_TEST_STRING + ";cd ~/rseserver;start_anyport");
-			cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation);
+			cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation + " " + System.getProperty("user.name"));
 			logMessage("The command is " + cmd);
 			SystemBasePlugin.logInfo("RexecDstoreServer :");
 
@@ -476,7 +476,7 @@ public class RexecDstoreServer implements IServerLauncher
 			}
 			
 			if (timeout == 0) {
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
 				msg.makeSubstitution(signonInfo.getHostname(), "");
 				_errorMessage = msg;
 				return port;
@@ -557,11 +557,11 @@ public class RexecDstoreServer implements IServerLauncher
 		if (index > -1)  // remove the embedded ASCII_TEST_STRING
 			hostMessage = hostMessage.substring(0,index) + hostMessage.substring(index+1+ASCII_TEST_STRING.length());
 		if (hostMessage.indexOf(EZYRD11E) >0 ){
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
 			msg.makeSubstitution(signonInfo.getHostname(), hostMessage);
 			_errorMessage = msg;
 		} else {
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
 			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), hostMessage);
 			_errorMessage = msg;
 			
@@ -654,7 +654,7 @@ public class RexecDstoreServer implements IServerLauncher
 							cChar = (char) rxIn.readByte();
 							buf.append(cChar);
 						}
-						SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
+						SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
 						msg.makeSubstitution(signonInfo.getHostname(), buf.toString());
 						_errorMessage = msg;
 					}
@@ -668,7 +668,7 @@ public class RexecDstoreServer implements IServerLauncher
 		catch (Exception e)
 		{
 			System.out.println(e);
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
 			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage());
 			_errorMessage = msg;
 		}
@@ -782,7 +782,7 @@ public class RexecDstoreServer implements IServerLauncher
 							cChar = (char) rxIn.readByte();
 							buf.append(cChar);
 						}
-						SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
+						SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
 						msg.makeSubstitution(signonInfo.getHostname(), buf.toString());
 						_errorMessage = msg;
 					}
@@ -797,7 +797,7 @@ public class RexecDstoreServer implements IServerLauncher
 		catch (Exception e)
 		{
 			System.out.println(e);
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
 			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage());
 			_errorMessage = msg;
 		}
@@ -831,7 +831,7 @@ public class RexecDstoreServer implements IServerLauncher
 				
 		if (monitor != null)
 		{
-			SystemMessage cmsg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
+			SystemMessage cmsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECTING_TO_SERVER);
 			cmsg.makeSubstitution(clientConnection.getPort());
 			monitor.subTask(cmsg.getLevelOneText());
 		}
@@ -1033,7 +1033,7 @@ public class RexecDstoreServer implements IServerLauncher
 			{
 			}
 
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_NOTSTARTED);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_NOTSTARTED);
 			diagnosticString.insert(0, "\n\n");
 			msg.makeSubstitution(signonInfo.getHostname(), diagnosticString.toString());
 

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java

@@ -26,12 +26,12 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -112,7 +112,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
 		{
 			Shell shell = getShell();
 			_connectionDown = true;
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
 			msg.makeSubstitution(_connection.getPrimarySubSystem().getHost().getAliasName());
 			SystemMessageDialog dialog = new SystemMessageDialog(internalGetShell(), msg);
 			dialog.open();
@@ -121,7 +121,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
 				IRunnableContext runnableContext = getRunnableContext(getShell());
 		    	runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress
 		    	_connection.reset();
-				ISystemRegistry sr = SystemPlugin.getDefault().getSystemRegistry();    	    
+				ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry();    	    
 	            sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
 			}
 	    	catch (InterruptedException exc) // user cancelled
@@ -216,7 +216,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
        	IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
        	if (win != null)
        	{
-       		Shell winShell = SystemPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+       		Shell winShell = RSEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
        		if (winShell != null && !winShell.isDisposed() && winShell.isVisible())
        		{
        			SystemBasePlugin.logInfo("Using active workbench window as runnable context");
@@ -247,12 +247,12 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
      */
     protected void showDisconnectErrorMessage(Shell shell, String hostName, int port, Exception exc)
     {
-         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR,shell,SystemPlugin.getResourceBundle(),
+         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR,shell,RSEUIPlugin.getResourceBundle(),
          //                             ISystemMessages.MSG_DISCONNECT_FAILED,
          //                             hostName, exc.getMessage()); 	
-         //SystemPlugin.logError("Disconnect failed",exc); // temporary
+         //RSEUIPlugin.logError("Disconnect failed",exc); // temporary
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-    	            SystemPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_FAILED).makeSubstitution(hostName,exc));
+    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_FAILED).makeSubstitution(hostName,exc));
     	 msgDlg.setException(exc);
     	 msgDlg.open();
     }	
@@ -263,10 +263,10 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
      */
     protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
     {
-         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, SystemPlugin.getResourceBundle(),
+         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(),
          //                             ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName);
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,
-    	            SystemPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_CANCELLED).makeSubstitution(hostName));
+    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DISCONNECT_CANCELLED).makeSubstitution(hostName));
     	 msgDlg.open();
     }
 }

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java

@@ -26,10 +26,10 @@ import org.eclipse.dstore.core.model.DataStore;
 import org.eclipse.dstore.extra.internal.extra.DomainEvent;
 import org.eclipse.dstore.extra.internal.extra.IDomainListener;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 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.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 

rse/plugins/org.eclipse.rse.core/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF

@@ -1,19 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: RSE Core
-Bundle-SymbolicName: org.eclipse.rse.core; singleton:=true
+Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
 Bundle-Version: 1.0.0
+Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.core.runtime
- org.eclipse.core.runtime,
+Eclipse-LazyStart: true
- org.eclipse.rse.services,
+Export-Package: org.eclipse.rse.core
- org.eclipse.rse.logging,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.ui.views,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.debug.ui,
- org.eclipse.ui.workbench.texteditor
-Eclipse-LazyStart: false
-Bundle-Vendor: Eclipse.org

rse/plugins/org.eclipse.rse.core/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml

rse/plugins/org.eclipse.rse.core/plugin.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension-point id="systemTypes" name="RSE System Types" schema="schema/systemTypes.exsd"/>
+
+</plugin>

rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd

@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.rse.core">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.rse.core" id="systemTypes" name="RSE System Types"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="systemType">
+      <complexType>
+         <sequence>
+            <element ref="property"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="property">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="value" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java

@@ -0,0 +1,46 @@
+/********************************************************************************
+ * Copyright (c) 2006 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, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+package org.eclipse.rse.core;
+
+/**
+ * Interface for RSE core registry. Clients should use this interface as the starting point for querying and
+ * manipulating model objects in the RSE framework.
+ *
+ * This interface is not intended to be implemented by clients.
+ */
+public interface IRSECoreRegistry {
+
+	public static final String PI_RSE_CORE = "org.eclipse.rse.core";
+	public static final String PI_SYSTEM_TYPES = "systemTypes";
+
+	/**
+	 * Returns all defined system types.
+	 * @return an array of all defined system types.
+	 */
+	public IRSESystemType[] getSystemTypes();
+
+	/**
+	 * Returns the names of all defined system types.
+	 */
+	public String[] getSystemTypeNames();
+
+	/**
+	 * Returns a system type object given the name.
+	 * @param name the name of the system type
+	 * @return the system type object with the given name, or <code>null</code> if none is found
+	 */
+	public IRSESystemType getSystemType(String name);
+}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java

@@ -15,12 +15,17 @@
  ********************************************************************************/
 
 package org.eclipse.rse.core;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.osgi.framework.Bundle;
+
 /**
- * Constants for system types.
+ * Interface for a system type. Constants are defined for various system types.
- * These are kept in synch with the definitions from plugin.xml in org.eclipse.rse.core.
+ * These constants are kept in sync with definitions in plugin.xml.
+ * 
+ * This interface is not intended to be implemented by clients.
  */
-public interface ISystemTypes
+public interface IRSESystemType extends IAdaptable {
-{
 	
 	/**
 	 * Linux system type, "Linux".
@@ -71,4 +76,40 @@ public interface ISystemTypes
 	 * Windows system type, "Windows".
 	 */
 	public static final String SYSTEMTYPE_WINDOWS = "Windows";
+	
+	/**
+	 * Returns the id of the system type.
+	 * @return the id of the system type
+	 */
+	public String getId();
+	
+	/**
+	 * Returns the name of the system type.
+	 * @return the name of the system type
+	 */
+	public String getName();
+	
+	/**
+	 * Returns the description of the system type.
+	 * @return the description of the system type
+	 */
+	public String getDescription();
+	
+	/**
+	 * Returns the property of this system type with the given key.
+	 * <code>null</code> is returned if there is no such key/value pair.
+	 * 
+	 * @param key the name of the property to return
+	 * @return the value associated with the given key or <code>null</code> if none
+	 */
+	public String getProperty(String key);
+	
+	/**
+	 * Returns the bundle which is responsible for the definition of this system type.
+	 * Typically this is used as a base for searching for images and other files 
+	 * that are needed in presenting the system type.
+	 * 
+	 * @return the bundle which defines this system type or <code>null</code> if none
+	 */
+	public Bundle getDefiningBundle();
 }

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java

@@ -0,0 +1,68 @@
+/********************************************************************************
+ * Copyright (c) 2006 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, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+package org.eclipse.rse.core;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.rse.core.internal.RSECoreRegistry;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The RSE core plugin class. Clients may extend this class.
+ */
+public class RSECorePlugin extends Plugin {
+
+	// the shared instance
+	private static RSECorePlugin plugin;
+
+	/**
+	 * The constructor.
+	 */
+	public RSECorePlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * Starts the bundle.
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped.
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 * @return the shared instance.
+	 */
+	public static RSECorePlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the RSE core registry. Clients should use this method to get the registry which
+	 * is the starting point for working with the RSE framework.
+	 * @return the RSE core registry.
+	 */
+	public IRSECoreRegistry getRegistry() {
+		return RSECoreRegistry.getDefault();
+	}
+}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java

@@ -0,0 +1,151 @@
+/********************************************************************************
+ * Copyright (c) 2006 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, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+package org.eclipse.rse.core.internal;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.rse.core.IRSECoreRegistry;
+import org.eclipse.rse.core.IRSESystemType;
+
+/**
+ * Singleton class representing the RSE core registry.
+ */
+public class RSECoreRegistry implements IRSECoreRegistry {
+
+	// the singleton instance
+	private static RSECoreRegistry instance;
+
+	// extension registry
+	private IExtensionRegistry registry;
+
+	// state variables
+	private boolean hasReadSystemTypes;
+
+	// model objects
+	private IRSESystemType[] systemTypes;
+
+	// constants
+	private static final String ELEMENT_SYTEM_TYPE = "systemType";
+
+	/**
+	 * Constructor.
+	 */
+	private RSECoreRegistry() {
+		super();
+		init();
+	}
+
+	/**
+	 * Initializes the registry. This should only be called from the constructor.
+	 */
+	private void init() {
+		registry = Platform.getExtensionRegistry();
+	}
+
+	/**
+	 * Returns the singleton instance of the registry.
+	 * @return the singleton instance
+	 */
+	public static final RSECoreRegistry getDefault() {
+
+		if (instance == null) {
+			instance = new RSECoreRegistry();
+		}
+
+		return instance;
+	}
+
+	/**
+	 * Returns all system types that have been defined.
+	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemTypes()
+	 */
+	public IRSESystemType[] getSystemTypes() {
+
+		if (!hasReadSystemTypes) {
+			systemTypes = readSystemTypes();
+			hasReadSystemTypes = true;
+		}
+
+		return systemTypes;
+	}
+
+	/**
+	 * Returns the system type with the given name.
+	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemType(java.lang.String)
+	 */
+	public IRSESystemType getSystemType(String name) {
+
+		IRSESystemType[] types = getSystemTypes();
+
+		for (int i = 0; i < types.length; i++) {
+			IRSESystemType type = types[i];
+
+			if (type.getName().equals(name)) {
+				return type;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.rse.core.IRSECoreRegistry#getSystemTypeNames()
+	 */
+	public String[] getSystemTypeNames() {
+		IRSESystemType[] types = getSystemTypes();
+		String[] names = new String[types.length];
+
+		for (int i = 0; i < types.length; i++) {
+			IRSESystemType type = types[i];
+			names[i] = type.getName();
+		}
+
+		return names;
+	}
+
+	/**
+	 * Reads system types from the extension point registry and returns the defined system types.
+	 * @return an array of system types that have been defined
+	 */
+	private IRSESystemType[] readSystemTypes() {
+
+		IExtensionRegistry registry = getExtensionRegistry();
+		IConfigurationElement[] elements = registry.getConfigurationElementsFor(PI_RSE_CORE, PI_SYSTEM_TYPES);
+		IRSESystemType[] types = new IRSESystemType[elements.length];
+
+		for (int i = 0; i < elements.length; i++) {
+			IConfigurationElement element = elements[i];
+
+			if (element.getName().equals(ELEMENT_SYTEM_TYPE)) {
+				RSESystemType type = new RSESystemType(element);
+				types[i] = type;
+			}
+		}
+
+		return types;
+	}
+
+	/**
+	 * Returns the platform extension registry.
+	 * @return the platform extension registry
+	 */
+	private IExtensionRegistry getExtensionRegistry() {
+		return registry;
+	}
+}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java

@@ -0,0 +1,120 @@
+/********************************************************************************
+ * Copyright (c) 2006 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, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+package org.eclipse.rse.core.internal;
+
+import java.util.HashMap;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.rse.core.IRSESystemType;
+import org.osgi.framework.Bundle;
+
+/**
+ * Class representing a system type.
+ */
+public class RSESystemType implements IRSESystemType {
+
+	private static final String ATTR_ID = "id";
+	private static final String ATTR_NAME = "name";
+	private static final String ATTR_DESCRIPTION = "description";
+	private static final String ATTR_VALUE = "value";
+
+	String id = null;
+	String name = null;
+	String description = null;
+	HashMap properties;
+	Bundle definingBundle = null;
+
+	/**
+	 * Constructor for an object representing a system type.
+	 * @param element the configuration element describing the system type
+	 */
+	public RSESystemType(IConfigurationElement element) {
+
+		id = element.getAttribute(ATTR_ID);
+		name = element.getAttribute(ATTR_NAME);
+		description = element.getAttribute(ATTR_DESCRIPTION);
+
+		loadProperties(element);
+
+		definingBundle = Platform.getBundle(element.getContributor().getName());
+	}
+
+	/**
+	 * Loads properties defined for the system type.
+	 * @param element the configuration element
+	 */
+	private void loadProperties(IConfigurationElement element) {
+		IConfigurationElement[] children = element.getChildren();
+		properties = new HashMap(children.length);
+
+		for (int i = 0; i < children.length; i++) {
+			IConfigurationElement child = children[i];
+			String key = child.getAttribute(ATTR_NAME);
+			String value = child.getAttribute(ATTR_VALUE);
+
+			if (key != null && value != null)
+				properties.put(key, value);
+		}
+	}
+
+	/**
+	 * Returns the id of the system type.
+	 * @see org.eclipse.rse.core.IRSESystemType#getId()
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * Returns the name of the system type.
+	 * @see org.eclipse.rse.core.IRSESystemType#getName()
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Returns the description of the system type.
+	 * @see org.eclipse.rse.core.IRSESystemType#getDescription()
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Returns a property of the system type given a key.
+	 * @see org.eclipse.rse.core.IRSESystemType#getProperty(java.lang.String)
+	 */
+	public String getProperty(String key) {
+		return (String)(properties.get(key));
+	}
+
+	/**
+	 * Returns the bundle which is responsible for the definition of this system type.
+	 * @see org.eclipse.rse.core.IRSESystemType#getDefiningBundle()
+	 */
+	public Bundle getDefiningBundle() {
+		return definingBundle;
+	}
+
+	/**
+	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+	 */
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+}

rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java

@@ -32,11 +32,13 @@ public class UniversalKeystoreProvider implements ISystemKeystoreProvider
 		private List _certificates;
 		private ISystemKeystoreProvider _provider;
 		private boolean _wasCancelled = false;
+		private String _systemName;
 		
-		public ImportCertificateRunnable(ISystemKeystoreProvider provider, List certs)
+		public ImportCertificateRunnable(ISystemKeystoreProvider provider, List certs, String systemName)
 		{			
 			_certificates = certs;
 			_provider = provider;
+			_systemName = systemName;
 		}
 				
 		public boolean wasCancelled()
@@ -47,7 +49,7 @@ public class UniversalKeystoreProvider implements ISystemKeystoreProvider
 		public void run()
 		{
 			Shell shell = Display.getDefault().getActiveShell();
-			SystemImportCertAction importAction = new SystemImportCertAction(_provider, _certificates);
+			SystemImportCertAction importAction = new SystemImportCertAction(_provider, _certificates, _systemName);
 			importAction.run();
 			_wasCancelled = importAction.wasCancelled();
 		}	
@@ -63,10 +65,10 @@ public class UniversalKeystoreProvider implements ISystemKeystoreProvider
 		return UniversalSecurityPlugin.getKeyStoreLocation();
 	}
 
-	public boolean importCertificates(List certs)
+	public boolean importCertificates(List certs, String systemName)
 	{
 		Display display = Display.getDefault(); 
-		ImportCertificateRunnable impRun = new ImportCertificateRunnable(this, certs);
+		ImportCertificateRunnable impRun = new ImportCertificateRunnable(this, certs, systemName);
 		display.syncExec(impRun);
 		
 		return !impRun.wasCancelled();

rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java

@@ -43,11 +43,11 @@ 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.core.SystemPlugin;
 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.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -119,7 +119,7 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements
 		createButtons(buttons);
 		initializeValues();
 
-		SystemWidgetHelpers.setCompositeHelp(parent, SystemPlugin.HELPPREFIX + "ssls0000");
+		SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "ssls0000");
 		return composite;
 	}
 

rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java

@@ -30,7 +30,9 @@ public class SystemImportCertAction extends SystemBaseWizardAction
 	{
 		private List _certificates;
 		private ISystemKeystoreProvider _provider;
-		public SystemImportCertAction(ISystemKeystoreProvider provider, List certs)
+		private String _systemName;
+		
+		public SystemImportCertAction(ISystemKeystoreProvider provider, List certs, String systemName)
 		{
 			super(UniversalSecurityProperties.RESID_SECURITY_TRUST_IMPORT_CERTIFICATE_WIZARD, 
 					ImageRegistry.getImageDescriptor(ImageRegistry.IMG_CERTIF_FILE),
@@ -38,12 +40,13 @@ public class SystemImportCertAction extends SystemBaseWizardAction
 					);
 			_certificates = certs;
 			_provider = provider;
+			_systemName = systemName;
 		}
 		
 		public IWizard createWizard()
 		{
 			Shell shell = Display.getDefault().getActiveShell();
-			SystemImportCertWizard importWiz = new SystemImportCertWizard(_provider);
+			SystemImportCertWizard importWiz = new SystemImportCertWizard(_provider, _systemName);
 			importWiz.setInputObject(_certificates);
 			return importWiz;
 		}	

rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java

@@ -23,12 +23,12 @@ import java.util.List;
 import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 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.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
 
 public class SystemImportCertWizard 
@@ -39,16 +39,18 @@ public class SystemImportCertWizard
 	private SystemImportCertWizardMainPage  _mainPage;
 	private SystemImportCertWizardAliasPage _aliasPage;
 	private ISystemKeystoreProvider _provider;
+	private String _systemName;
   
 
     /**
      * Constructor
      */	
-	public SystemImportCertWizard(ISystemKeystoreProvider provider)
+	public SystemImportCertWizard(ISystemKeystoreProvider provider, String systemName)
 	{
 	   	super(UniversalSecurityProperties.RESID_SECURITY_TRUST_IMPORT_CERTIFICATE_WIZARD,
 				ImageRegistry.getImageDescriptor(ImageRegistry.IMG_WZ_IMPORT_CERTIF));	
 		_provider = provider;
+		_systemName = systemName;
 	}
 	
 	/**
@@ -92,7 +94,7 @@ public class SystemImportCertWizard
 	{
 		SystemMessage errMsg = null;
 		
-   	    _aliasPage = new SystemImportCertWizardAliasPage(this, getCertificates()); 
+   	    _aliasPage = new SystemImportCertWizardAliasPage(this, getCertificates(), _systemName); 
    	    if (errMsg != null)
    	      _aliasPage.setErrorMessage(errMsg);
    	    return _aliasPage;

rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java

@@ -16,10 +16,14 @@
 
 package org.eclipse.rse.dstore.security.wizards;
 
+import java.security.KeyStore;
 import java.security.cert.X509Certificate;
+import java.util.Enumeration;
 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.services.clientserver.messages.SystemMessage;
@@ -48,16 +52,18 @@ public class SystemImportCertWizardAliasPage
 	protected SystemMessage errorMessage;
 	protected ISystemValidator nameValidator;
 	protected ISystemMessageLine msgLine;
+	private String _systemName;
 	
     private Text _alias;
 	/**
 	 * Constructor.
 	 */
-	public SystemImportCertWizardAliasPage(Wizard wizard, List certs)
+	public SystemImportCertWizardAliasPage(Wizard wizard, List certs, String systemName)
 	{
 		super(wizard, "SpecifyAlias", 
   		      UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_ALIAS_TITLE, 
 		      UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_ALIAS_DESC);
+		_systemName = systemName;
 	}
 
 	/**
@@ -85,6 +91,7 @@ public class SystemImportCertWizardAliasPage
 					}
 				}
 			);		
+		initializeInput();
 		return _alias;
 	}
 	
@@ -116,6 +123,7 @@ public class SystemImportCertWizardAliasPage
 	 */
 	protected void initializeInput()
 	{
+		_alias.setText(getAlias());
 	}
 	
   	/**
@@ -159,7 +167,30 @@ public class SystemImportCertWizardAliasPage
 	 */
 	public String getAlias()
 	{
-		return _alias.getText();
+		String alias = _alias.getText().trim();
+		if (alias.equals(""))
+		{
+			try
+			{
+				int count = 0;
+				String storePath = UniversalSecurityPlugin.getKeyStoreLocation();
+				String passw = UniversalSecurityPlugin.getKeyStorePassword();
+				KeyStore keyStore = DStoreKeyStore.getKeyStore(storePath, passw);
+				Enumeration aliases = keyStore.aliases();
+				while (aliases.hasMoreElements())
+				{
+					String existingalias = (String) (aliases.nextElement());
+					if (existingalias.toLowerCase().startsWith(_systemName.toLowerCase())) count++;
+				}
+				count++;
+				alias = _systemName + count;
+			}
+			catch (Exception e)
+			{
+				alias = _systemName;
+			}
+		}
+		return alias;
 	}    
 
 	/**
@@ -168,7 +199,7 @@ public class SystemImportCertWizardAliasPage
 	 */
 	public boolean isPageComplete()
 	{
-		return (errorMessage==null) && (_alias.getText().trim().length()>0);
+		return (errorMessage==null);
 	}
 	
 

rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystem.java

@@ -20,11 +20,11 @@ import java.net.URI;
 
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.filesystem.provider.FileSystem;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
+import org.eclipse.rse.ui.RSEUIPlugin;
 
 public class RSEFileSystem extends FileSystem 
 {
@@ -41,7 +41,7 @@ public class RSEFileSystem extends FileSystem
 
 	private IHost getConnectionFor(String hostName)
 	{
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		IHost[] connections = sr.getHosts();
 		for (int i = 0; i < connections.length; i++)
 		{

rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF

@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.ui
+ org.eclipse.rse.ui,
+ org.eclipse.rse.core
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.files.ui.actions,

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java

@@ -19,7 +19,6 @@ package org.eclipse.rse.files.ui;
 import java.util.Vector;
 
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.files.ui.actions.SystemSelectFileTypesAction;
@@ -36,6 +35,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConf
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration;
 import org.eclipse.rse.subsystems.files.core.util.ValidatorFileFilterString;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
 import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
@@ -183,7 +183,7 @@ public class SystemFileFilterStringEditPane
         boolean readonly = false;
         folderCombo = SystemFileWidgetHelpers.createFolderCombo(composite_prompts, null, gridColumns, historyKey, readonly);        
         folderCombo.setShowNewConnectionPrompt(false);
-        SystemWidgetHelpers.setHelp(folderCombo, SystemPlugin.HELPPREFIX+"ffsd0001");
+        SystemWidgetHelpers.setHelp(folderCombo, RSEUIPlugin.HELPPREFIX+"ffsd0001");
         SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
                 			
 		// parent folder prompt    
@@ -191,8 +191,8 @@ public class SystemFileFilterStringEditPane
 
         // "Subset by file name filter" radiobutton
         subsetByFileNameRadioButton = SystemWidgetHelpers.createRadioButton(composite_prompts, null, SystemFileResources.RESID_FILEFILTERSTRING_BYFILENAME_LABEL, SystemFileResources.RESID_FILEFILTERSTRING_BYFILENAME_TOOLTIP);
-        //SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, SystemPlugin.HELPPREFIX+"ffsd0002", SystemPlugin.HELPPREFIX+"ffsd0003");
+        //SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0002", RSEUIPlugin.HELPPREFIX+"ffsd0003");
-        SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, SystemPlugin.HELPPREFIX+"ffsd0002");
+        SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0002");
         updateGridData(subsetByFileNameRadioButton, gridColumns);
                 
 		// File name prompt    
@@ -203,22 +203,22 @@ public class SystemFileFilterStringEditPane
 		labelFile.setToolTipText(SystemFileResources.RESID_FILEFILTERSTRING_FILE_TOOLTIP);
 		textFile = SystemWidgetHelpers.createTextField(composite_prompts, null);
 		textFile.setToolTipText(SystemFileResources.RESID_FILEFILTERSTRING_FILE_TOOLTIP);
-        //SystemWidgetHelpers.setHelp(textFile, SystemPlugin.HELPPREFIX+"ffsd0003",SystemPlugin.HELPPREFIX+"ffsd0002");
+        //SystemWidgetHelpers.setHelp(textFile, RSEUIPlugin.HELPPREFIX+"ffsd0003",RSEUIPlugin.HELPPREFIX+"ffsd0002");
-        SystemWidgetHelpers.setHelp(textFile, SystemPlugin.HELPPREFIX+"ffsd0003");
+        SystemWidgetHelpers.setHelp(textFile, RSEUIPlugin.HELPPREFIX+"ffsd0003");
         updateGridData(textFile, gridColumns-1);
 		textFile.setText("*");
 
 
         // "Subset by file types filter" radiobutton
         subsetByFileTypesRadioButton = SystemWidgetHelpers.createRadioButton(composite_prompts, null, SystemFileResources.RESID_FILEFILTERSTRING_BYFILETYPES_LABEL,  SystemFileResources.RESID_FILEFILTERSTRING_BYFILETYPES_TOOLTIP);
-        //SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, SystemPlugin.HELPPREFIX+"ffsd0004", SystemPlugin.HELPPREFIX+"ffsd0005");
+        //SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0004", RSEUIPlugin.HELPPREFIX+"ffsd0005");
-        SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, SystemPlugin.HELPPREFIX+"ffsd0004");
+        SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0004");
         updateGridData(subsetByFileTypesRadioButton, gridColumns);
 
 		// File types prompt 
 		Composite typesGroup = SystemWidgetHelpers.createComposite(composite_prompts, 3);   
-        //SystemWidgetHelpers.setHelp(typesGroup, SystemPlugin.HELPPREFIX+"ffsd0005",SystemPlugin.HELPPREFIX+"ffsd0004");
+        //SystemWidgetHelpers.setHelp(typesGroup, RSEUIPlugin.HELPPREFIX+"ffsd0005",RSEUIPlugin.HELPPREFIX+"ffsd0004");
-        SystemWidgetHelpers.setHelp(typesGroup, SystemPlugin.HELPPREFIX+"ffsd0005");
+        SystemWidgetHelpers.setHelp(typesGroup, RSEUIPlugin.HELPPREFIX+"ffsd0005");
 		GridLayout layout = (GridLayout)typesGroup.getLayout();
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;		
@@ -251,7 +251,7 @@ public class SystemFileFilterStringEditPane
         SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
 		filesOnlyCheckBox = SystemWidgetHelpers.createCheckBox(composite_prompts, gridColumns, null,
 		                                                  SystemFileResources.RESID_FILEFILTERSTRING_INCFILESONLY_LABEL,  SystemFileResources.RESID_FILEFILTERSTRING_INCFILESONLY_TOOLTIP);
-        SystemWidgetHelpers.setHelp(filesOnlyCheckBox, SystemPlugin.HELPPREFIX+"ffsd0006");
+        SystemWidgetHelpers.setHelp(filesOnlyCheckBox, RSEUIPlugin.HELPPREFIX+"ffsd0006");
 
         // Test button
         /*
@@ -260,7 +260,7 @@ public class SystemFileFilterStringEditPane
           SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
           SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
           createTestButton(composite_prompts, RESID_FILEFILTERSTRING_TEST_ROOT);
-          SystemWidgetHelpers.setHelp(testButton, SystemPlugin.HELPPREFIX+"ffsd0007");
+          SystemWidgetHelpers.setHelp(testButton, RSEUIPlugin.HELPPREFIX+"ffsd0007");
           updateGridData(testButton, gridColumns);
         }
         */
@@ -331,7 +331,7 @@ public class SystemFileFilterStringEditPane
 		if (folderCombo == null)
 		  return;
 		//if (refProvider == null)
-		  //SystemPlugin.logError("Programming Error: input subsystem is not set for SystemFileFilterStringEditPane",null);
+		  //RSEUIPlugin.logError("Programming Error: input subsystem is not set for SystemFileFilterStringEditPane",null);
 			
 		if (inputFilterString != null)
 		{
@@ -482,7 +482,7 @@ public class SystemFileFilterStringEditPane
 			{
 				if (textTypes.getText().trim().length() == 0)
 				{
-				  errorMessage = SystemPlugin.getPluginMessage(FILEMSG_ERROR_NOFILETYPES);
+				  errorMessage = RSEUIPlugin.getPluginMessage(FILEMSG_ERROR_NOFILETYPES);
 				}
 			}
 			controlInError = textFile;
@@ -495,7 +495,7 @@ public class SystemFileFilterStringEditPane
 			  notUnique = true;
 			if (notUnique)
 			{
-			  errorMessage = SystemPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE).makeSubstitution(currFilterString);
+			  errorMessage = RSEUIPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE).makeSubstitution(currFilterString);
 			}
 			controlInError = textFile;
 		}		  
@@ -611,7 +611,7 @@ public class SystemFileFilterStringEditPane
 					}
 					// no path validator, so just use default path empty message
 					else {
-						errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_EMPTY);
+						errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_EMPTY);
 					}
 				}
 				// KM: defect 53210
@@ -627,7 +627,7 @@ public class SystemFileFilterStringEditPane
 						}
 						// no path validator, so just use default path empty message
 						else {
-							errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_EMPTY);
+							errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_EMPTY);
 						}						
 					}
 				}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java

@@ -27,7 +27,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.AddToArchiveDialog;
 import org.eclipse.rse.model.IHost;
@@ -42,6 +41,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.ISystemDragDropAdapter;
@@ -67,7 +67,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0122");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
 	}
 
 	public SystemAddToArchiveAction(Shell parent, String label, String tooltip)
@@ -76,7 +76,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0122");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
 	}
 
 	public void run() 
@@ -135,7 +135,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 			
 			if (ArchiveHandlerManager.isVirtual(destinationArchive.getAbsolutePath()))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ADDTO_VIRTUAL_DEST);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ADDTO_VIRTUAL_DEST);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				continue;
@@ -143,7 +143,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 			
 			if (destinationInSource(destinationArchive))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				continue;
@@ -164,7 +164,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 				IRemoteFile selection = (IRemoteFile) _selected.get(i);
 				addToArchive(selection, destinationArchive, saveFullPathInfo, relativeTo);
 			}
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destinationArchive, destinationArchive.getParentPath(), destSS, null, null);
 			registry.fireEvent(new SystemResourceChangeEvent(destinationArchive, ISystemResourceChangeEvents.EVENT_REFRESH, destinationArchive.getParentPath()));
 			repeat = false;
@@ -320,7 +320,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 	
 	protected IRunnableContext getRunnableContext(Shell shell)
 	{
-		IRunnableContext irc = SystemPlugin.getTheSystemRegistry().getRunnableContext();
+		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext();
 		if (irc != null)
 		{
 			return irc;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java

@@ -16,7 +16,6 @@
 
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.CombineDialog;
 import org.eclipse.rse.model.ISystemRegistry;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Shell;
 
@@ -45,8 +45,8 @@ public class SystemCombineAction extends SystemExtractToAction {
 	public SystemCombineAction(Shell parent)
 	{
 		super(parent, FileResources.ACTION_COMBINE_LABEL, FileResources.ACTION_COMBINE_TOOLTIP);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0120");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0120");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_COMBINE_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_COMBINE_ID));
 
 	}
 
@@ -95,7 +95,7 @@ public class SystemCombineAction extends SystemExtractToAction {
 			
 			if (ArchiveHandlerManager.isVirtual(destination.getAbsolutePath()))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COMBINETO_VIRTUAL_DEST);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMBINETO_VIRTUAL_DEST);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				continue;
@@ -103,7 +103,7 @@ public class SystemCombineAction extends SystemExtractToAction {
 			
 			if (destinationInSource(destination))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				continue;
@@ -162,7 +162,7 @@ public class SystemCombineAction extends SystemExtractToAction {
 				{
 				}
 			}
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null);
 			registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
 			repeat = false;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java

@@ -16,7 +16,6 @@
 
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.CombineDialog;
 import org.eclipse.rse.model.ISystemRegistry;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Shell;
 
@@ -46,8 +46,8 @@ public class SystemConvertAction extends SystemExtractToAction {
 	public SystemConvertAction(Shell parent)
 	{
 		super(parent, FileResources.ACTION_CONVERT_LABEL, FileResources.ACTION_CONVERT_TOOLTIP);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0121");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0121");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CONVERT_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CONVERT_ID));
 
 	}
 
@@ -70,7 +70,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			dialog.setPreSelection(selection);
 	
 			dialog.setBlockOnOpen(true);
-			dialog.setHelp(SystemPlugin.HELPPREFIX + "cnvd0000");
+			dialog.setHelp(RSEUIPlugin.HELPPREFIX + "cnvd0000");
 			dialog.setShowLocationPrompt(true);
 			dialog.setLocationPrompt(FileResources.RESID_CONVERT_LOCATION);
 	  		dialog.setNameAndTypePrompt(FileResources.RESID_CONVERT_NAMEANDTYPE);
@@ -100,7 +100,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			
 			if (ArchiveHandlerManager.isVirtual(destination.getAbsolutePath()))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CONVERTTO_VIRTUAL_DEST);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONVERTTO_VIRTUAL_DEST);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				i--;
@@ -108,7 +108,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			}
 			if (!destination.canWrite())
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_TARGET_READONLY);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_TARGET_READONLY);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				i--;
@@ -116,7 +116,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			}
 			if (selection.isAncestorOf(destination))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				i--;
@@ -127,7 +127,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			{
 				if (destination.exists()) 
 				{
-					SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
+					SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
 					msg.makeSubstitution(destination.getName());
 					SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 					boolean ok = dlg.openQuestionNoException();
@@ -171,7 +171,7 @@ public class SystemConvertAction extends SystemExtractToAction {
 			catch (java.lang.InterruptedException e)
 			{
 			}
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null);
 			registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
 		}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java

@@ -24,7 +24,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
 import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
@@ -36,6 +35,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
@@ -74,8 +74,8 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 	SystemCopyRemoteFileAction(Shell shell, int mode) 
 	{
 		super(shell, mode);
-  	    setHelp(SystemPlugin.HELPPREFIX+"actn0110"); 
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0110"); 
-  	    setDialogHelp(SystemPlugin.HELPPREFIX+"dcrf0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcrf0000"); 
 	}
 	
 	/**
@@ -138,9 +138,9 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 			targetFileOrFolder = ss.getRemoteFileObject(targetFolder, oldName);
 	
 	
-			//SystemPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
+			//RSEUIPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
-			//SystemPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
+			//RSEUIPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
-			//SystemPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
+			//RSEUIPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
 			if (targetFileOrFolder.exists())
 			{
 			  //monitor.setVisible(false); wish we could!
@@ -189,7 +189,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 			ok = ss.copy(srcFileOrFolder, targetFolder, newName, null);
 			if (!ok)
 			{
-			  SystemMessage msg = SystemPlugin.getPluginMessage(FILEMSG_COPY_FILE_FAILED);
+			  SystemMessage msg = RSEUIPlugin.getPluginMessage(FILEMSG_COPY_FILE_FAILED);
 			  msg.makeSubstitution(srcFileOrFolder.getName());
 			  throw new SystemMessageException(msg); 
 			}
@@ -330,13 +330,13 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 		dlg.setSystemConnection(sourceConnection);
 		if (mode==MODE_MOVE)
 		  dlg.setSelectionValidator(this);
-		//SystemPlugin.logInfo("Calling getParentRemoteFile for '"+firstSelection.getAbsolutePath()+"'");
+		//RSEUIPlugin.logInfo("Calling getParentRemoteFile for '"+firstSelection.getAbsolutePath()+"'");
 		firstSelectionParent = firstSelection.getParentRemoteFile();
 		/*
 		if (firstSelectionParent != null)
-		  SystemPlugin.logInfo("Result of getParentRemoteFile: '"+firstSelectionParent.getAbsolutePath()+"'");
+		  RSEUIPlugin.logInfo("Result of getParentRemoteFile: '"+firstSelectionParent.getAbsolutePath()+"'");
 		else
-		  SystemPlugin.logInfo("Result of getParentRemoteFile: null");
+		  RSEUIPlugin.logInfo("Result of getParentRemoteFile: null");
 		*/
 		dlg.setPreSelection(firstSelectionParent);
 		
@@ -398,7 +398,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
           	  }
           }
 		}
-		SystemPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
+		RSEUIPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
 		   ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, copiedFiles, targetFolder.getAbsolutePath(), fileSS, null, originatingViewer);
 		
 		/* Old release 1.0 way...
@@ -408,7 +408,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 		  Viewer v = getViewer();
 		  if (v instanceof ISystemTree)
 		  {
-		    SystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		    SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		  	ISystemTree tree = (ISystemTree)v;
 		  	Object parent = tree.getSelectedParent();
 		  	if (parent == null)

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCreateEditActions.java

@@ -26,11 +26,11 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.SystemMenuManager;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemSeparatorAction;
 import org.eclipse.swt.widgets.Shell;
@@ -109,7 +109,7 @@ public class SystemCreateEditActions
 	
 	protected IEditorRegistry getEditorRegistry()
 	{
-		return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+		return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 	}
 	
 	protected IEditorDescriptor getDefaultTextEditor()

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemDoubleClickEditAction.java

@@ -17,8 +17,8 @@
 package org.eclipse.rse.files.ui.actions;
 
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorRegistry;
@@ -42,7 +42,7 @@ public class SystemDoubleClickEditAction extends SystemBaseAction
 	
 	protected IEditorRegistry getEditorRegistry()
 	{
-		return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+		return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 	}
 	
 	protected IEditorDescriptor getDefaultTextEditor()

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemDownloadConflictAction.java

@@ -19,10 +19,10 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.window.Window;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.swt.SWT;
@@ -252,7 +252,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
 
 		dlg.setReplaceText(FileResources.RESID_CONFLICT_DOWNLOAD_REPLACELOCAL);
 		dlg.setOpenLocalText(FileResources.RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL);
-		dlg.setHelpId(SystemPlugin.HELPPREFIX + "lcdl0000");
+		dlg.setHelpId(RSEUIPlugin.HELPPREFIX + "lcdl0000");
 		return dlg;
 	}
 
@@ -261,7 +261,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
 	 */
 	public void run()
 	{
-		setShell(SystemPlugin.getTheSystemRegistry().getShell());
+		setShell(RSEUIPlugin.getTheSystemRegistry().getShell());
 		SystemIFileProperties properties = new SystemIFileProperties(_tempFile);
 
 		DownloadConflictDialog cnfDialog = getConflictDialog();

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileInPlaceAction.java

@@ -19,10 +19,10 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.resources.ISystemRemoteEditConstants;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.swt.widgets.Shell;
 
@@ -31,7 +31,7 @@ public class SystemEditFileInPlaceAction extends SystemBaseAction implements ISy
 
 
 
-	private SystemPlugin plugin;
+	private RSEUIPlugin plugin;
 	
 	
 	/**
@@ -53,7 +53,7 @@ public class SystemEditFileInPlaceAction extends SystemBaseAction implements ISy
 		// had to add it in the group in the adapter
 		// setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPENWITH);
 		
-		plugin = SystemPlugin.getDefault();
+		plugin = RSEUIPlugin.getDefault();
 	}
 
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFilePlatformAction.java

@@ -19,10 +19,10 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.resources.ISystemRemoteEditConstants;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.swt.widgets.Shell;
 
@@ -31,7 +31,7 @@ public class SystemEditFilePlatformAction extends SystemBaseAction implements IS
 
 
 
-	private SystemPlugin plugin;
+	private RSEUIPlugin plugin;
 	
 	
 	/**
@@ -53,7 +53,7 @@ public class SystemEditFilePlatformAction extends SystemBaseAction implements IS
 		// had to add it in the group in the adapter
 		// setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPENWITH);
 		
-		plugin = SystemPlugin.getDefault();
+		plugin = RSEUIPlugin.getDefault();
 	}
 
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditProjectFileLineAction.java

@@ -24,12 +24,12 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.resources.RemoteSourceLookupDirector;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorPart;
@@ -78,7 +78,7 @@ public class SystemEditProjectFileLineAction extends SystemEditFileAction {
 	
 	protected IEditorRegistry getEditorRegistry()
 	{
-		return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+		return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 	}
 	
 	protected IEditorDescriptor getDefaultTextEditor()

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java

@@ -26,7 +26,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
@@ -38,6 +37,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.ISystemDragDropAdapter;
@@ -64,8 +64,8 @@ public class SystemExtractAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0118");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0118");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
 	}
 
 	public SystemExtractAction(Shell parent, String label, String tooltip)
@@ -76,8 +76,8 @@ public class SystemExtractAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0118");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0118");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
 
 	}
 
@@ -118,7 +118,7 @@ public class SystemExtractAction extends SystemBaseAction
 			{
 			}
 			//	always refresh
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destinationParent, ss, null, null);
 			registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destinationParent));
 		}
@@ -161,7 +161,7 @@ public class SystemExtractAction extends SystemBaseAction
 				}
 				catch (Exception e)
 				{
-					SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
+					SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
 					SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 					dlg.open();
 					System.out.println(e.getMessage());
@@ -247,7 +247,7 @@ public class SystemExtractAction extends SystemBaseAction
 	
 	protected IRunnableContext getRunnableContext(Shell shell)
 	{
-		IRunnableContext irc = SystemPlugin.getTheSystemRegistry().getRunnableContext();
+		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext();
 		if (irc != null)
 		{
 			return irc;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java

@@ -16,8 +16,7 @@
 
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.rse.core.ISystemTypes;
+import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.ExtractToDialog;
 import org.eclipse.rse.model.IHost;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -44,13 +44,13 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class SystemExtractToAction extends SystemExtractAction implements IValidatorRemoteSelection, ISystemMessages
 {	
-	protected static final String[] systemTypes = { ISystemTypes.SYSTEMTYPE_LOCAL,
+	protected static final String[] systemTypes = { IRSESystemType.SYSTEMTYPE_LOCAL,
-													ISystemTypes.SYSTEMTYPE_WINDOWS,
+													IRSESystemType.SYSTEMTYPE_WINDOWS,
-													ISystemTypes.SYSTEMTYPE_LINUX,
+													IRSESystemType.SYSTEMTYPE_LINUX,
-													ISystemTypes.SYSTEMTYPE_POWER_LINUX,
+													IRSESystemType.SYSTEMTYPE_POWER_LINUX,
-													ISystemTypes.SYSTEMTYPE_UNIX,
+													IRSESystemType.SYSTEMTYPE_UNIX,
-													ISystemTypes.SYSTEMTYPE_AIX,
+													IRSESystemType.SYSTEMTYPE_AIX,
-													ISystemTypes.SYSTEMTYPE_ISERIES
+													IRSESystemType.SYSTEMTYPE_ISERIES
 												  };
 	protected SystemMessage targetDescendsFromSrcMsg = null;
 	protected int currentlyProcessingSelection = 0;
@@ -58,16 +58,16 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 	public SystemExtractToAction(Shell parent)
 	{
 		super(parent,FileResources.ACTION_EXTRACT_TO_LABEL, FileResources.ACTION_EXTRACT_TO_TOOLTIP);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0119");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
 
 	}
 
 	public SystemExtractToAction(Shell parent, String label, String tooltip)
 	{
 		super(parent, label, tooltip);
-		setHelp(SystemPlugin.HELPPREFIX + "actn0119");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
-		setImageDescriptor(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
+		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
 	}
 
 	public void run()
@@ -122,7 +122,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 			}
 			if (selection.isAncestorOf(destination))
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				i--;
@@ -130,7 +130,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 			}
 			if (!destination.canWrite())
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DEST_TARGET_READONLY);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_TARGET_READONLY);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.open();
 				i--;
@@ -153,7 +153,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 			{
 			}
 			//	always refresh
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CREATED, destination, destination.getParentPath(), destSS, null, null);
 			registry.fireEvent(new SystemResourceChangeEvent(destination, ISystemResourceChangeEvents.EVENT_REFRESH, destination.getParentPath()));
 		}
@@ -189,7 +189,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 	   if (selectedFolder.isDescendantOf(currentSelection))
 	   {
 		   if (targetDescendsFromSrcMsg == null)
-			targetDescendsFromSrcMsg = SystemPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOUCE);
+			targetDescendsFromSrcMsg = RSEUIPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOUCE);
 		   return targetDescendsFromSrcMsg;
 	   }
 	   else

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java

@@ -18,7 +18,6 @@ package org.eclipse.rse.files.ui.actions;
 import java.util.Vector;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
@@ -27,6 +26,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -49,8 +49,8 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
 	public SystemMoveRemoteFileAction(Shell shell) 
 	{
 		super(shell, MODE_MOVE);
-  	    setHelp(SystemPlugin.HELPPREFIX+"actn0111");
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0111");
-  	    setDialogHelp(SystemPlugin.HELPPREFIX+"dmrf0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmrf0000"); 
 	}
  
     // --------------------------
@@ -87,7 +87,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
 		ok = ss.move(srcFileOrFolder, targetFolder, newName, monitor);
 		if (!ok)
 		{
-		  SystemMessage msg = SystemPlugin.getPluginMessage(FILEMSG_MOVE_FILE_FAILED);
+		  SystemMessage msg = RSEUIPlugin.getPluginMessage(FILEMSG_MOVE_FILE_FAILED);
 		  msg.makeSubstitution(srcFileOrFolder.getName());
 		  throw new SystemMessageException(msg); 
 		}
@@ -120,19 +120,19 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
         if (selectedFolder.getAbsolutePath().equals(firstSelectionParent.getAbsolutePath()))
         {
         	if (targetEqualsSrcMsg == null)
-              targetEqualsSrcMsg = SystemPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_EQUALS_SOURCE);
+              targetEqualsSrcMsg = RSEUIPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_EQUALS_SOURCE);
             return targetEqualsSrcMsg;
         }
         else if (selectedFolder.getAbsolutePath().equals(firstSelection.getAbsolutePath()))
         {
         	if (targetEqualsSrcMsg == null)
-              targetEqualsSrcMsg = SystemPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_EQUALS_SOURCE); // todo: different msg
+              targetEqualsSrcMsg = RSEUIPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_EQUALS_SOURCE); // todo: different msg
             return targetEqualsSrcMsg;
         }
         else if (selectedFolder.isDescendantOf(firstSelection))
         {
         	if (targetDescendsFromSrcMsg == null)
-        	 targetDescendsFromSrcMsg = SystemPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOUCE);
+        	 targetDescendsFromSrcMsg = RSEUIPlugin.getPluginMessage(FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOUCE);
         	return targetDescendsFromSrcMsg;
         }
         else
@@ -150,16 +150,16 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
 
 		// refresh all instances of the source parent, and all affected filters...
 		ISubSystem fileSS = targetFolder.getParentRemoteFileSubSystem();
-		//SystemPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
+		//RSEUIPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
 		  // ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, copiedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null);
-    	SystemPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
+    	RSEUIPlugin.getTheSystemRegistry().fireRemoteResourceChangeEvent(
 		   ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, movedFiles, firstSelectionParent.getAbsolutePath(), fileSS, null, null);
 		           
     	/* old release 1.0 way of doing it...
 		Viewer v = getViewer();
 		if (v instanceof ISystemTree)
 		{
-		    SystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		    SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		  	ISystemTree tree = (ISystemTree)v;
 		  	Object parent = tree.getSelectedParent();
 		  	if (parent != null)
@@ -185,7 +185,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
 		  	   }
 		  	}
 		  	else
-		  	  SystemPlugin.logWarning("Hmm, selected parent is null on a move operation!");
+		  	  RSEUIPlugin.logWarning("Hmm, selected parent is null on a move operation!");
 		}*/
     	super.copyComplete();    	
     }

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileAction.java

@@ -17,10 +17,10 @@
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.wizards.SystemNewFileWizard;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemBaseWizardAction;
 import org.eclipse.swt.widgets.Shell;
@@ -41,7 +41,7 @@ public class SystemNewFileAction extends SystemBaseWizardAction
 		this(SystemResources.ACTION_NEWFILE_LABEL, 
 		     SystemResources.ACTION_NEWFILE_TOOLTIP,
 			 //PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FILE), 
-		     SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILE_ID), 
+		     RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILE_ID), 
 		     parent);
 	}
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java

@@ -15,12 +15,12 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.actions;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.SystemFileFilterStringEditPane;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.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;
 import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction;
 import org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard;
 import org.eclipse.swt.widgets.Shell;
@@ -43,12 +43,12 @@ public class SystemNewFileFilterAction
 
 	{
 		super(shell, parentPool, SystemFileResources.ACTION_NEWFILTER_LABEL, SystemFileResources.ACTION_NEWFILTER_TOOLTIP,
-		      SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTER_ID));
+		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTER_ID));
 
-        //setHelp(SystemPlugin.HELPPREFIX+"anff0000");
+        //setHelp(RSEUIPlugin.HELPPREFIX+"anff0000");
-        //setDialogHelp(SystemPlugin.HELPPREFIX+"wnff0000");
+        //setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnff0000");
-		setHelp(SystemPlugin.HELPPREFIX+"actn0042");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0042");
-		setDialogHelp(SystemPlugin.HELPPREFIX+"wnfr0000");       
+		setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnfr0000");       
 	}		
 
 	/**
@@ -74,7 +74,7 @@ public class SystemNewFileFilterAction
 	{		
 		// configuration that used to only be possible via subclasses...
 		wizard.setWizardPageTitle(SystemFileResources.RESID_NEWFILEFILTER_PAGE1_TITLE);
-	  	wizard.setWizardImage(SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERWIZARD_ID));
+	  	wizard.setWizardImage(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERWIZARD_ID));
 		wizard.setPage1Description(SystemFileResources.RESID_NEWFILEFILTER_PAGE1_DESCRIPTION);
 		wizard.setFilterStringEditPane(new SystemFileFilterStringEditPane(wizard.getShell()));		
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterFromFolderAction.java

@@ -19,13 +19,13 @@ package org.eclipse.rse.files.ui.actions;
 import java.util.Iterator;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.swt.widgets.Shell;
@@ -46,7 +46,7 @@ public class SystemNewFileFilterFromFolderAction extends SystemNewFileFilterActi
 	{
 		// initially use null, but update based on selection
 		super(null, null, parent);
-		setHelp(SystemPlugin.HELPPREFIX+"actn0112");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0112");
 	}
 	
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFolderAction.java

@@ -18,11 +18,11 @@ package org.eclipse.rse.files.ui.actions;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.wizards.SystemNewFolderWizard;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseWizardAction;
 import org.eclipse.swt.widgets.Shell;
 
@@ -41,7 +41,7 @@ public class SystemNewFolderAction extends SystemBaseWizardAction
 	{
 		this(FileResources.ACTION_NEWFOLDER_LABEL, 
 				FileResources.ACTION_NEWFOLDER_TOOLTIP,
-		     SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFOLDER_ID), 
+		     RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFOLDER_ID), 
 		     parent);
 	}
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java

@@ -23,7 +23,6 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.IRemoteLineReference;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.ISystemTextEditor;
@@ -37,6 +36,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
 import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Event;
@@ -104,7 +104,7 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe
 	
 	protected IEditorRegistry getEditorRegistry()
 	{
-		return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+		return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 	}
 	
 	protected IEditorDescriptor getDefaultTextEditor()

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileOpenWithMenu.java

@@ -27,11 +27,11 @@ import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Event;
@@ -244,7 +244,7 @@ protected void setDefaultEditor(IRemoteFile remoteFile, String editorId)
 
 protected IEditorRegistry getEditorRegistry()
 {
-	return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+	return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 }
 
 protected IEditorDescriptor getDefaultTextEditor()

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java

@@ -147,7 +147,7 @@ public class SystemRemoteFileSelectAction extends SystemBaseDialogAction
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -159,7 +159,7 @@ public class SystemRemoteFileSelectAction extends SystemBaseDialogAction
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSearchAction.java

@@ -17,9 +17,9 @@
 package org.eclipse.rse.files.ui.actions;
 
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.search.SystemSearchPage;
 import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.search.ui.NewSearchUI;
@@ -31,9 +31,9 @@ public class SystemSearchAction extends SystemBaseAction {
 
     public SystemSearchAction(Shell parent) {
         super(SystemResources.ACTION_SEARCH_LABEL, 
-        SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_ID), parent);
+        RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_ID), parent);
         setToolTipText(SystemResources.ACTION_SEARCH_TOOLTIP);
-		setHelp(SystemPlugin.HELPPREFIX + "rsdi0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "rsdi0000");
 		
 		allowOnMultipleSelection(false);
     }

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java

@@ -134,7 +134,7 @@ public class SystemSelectRemoteFileAction extends SystemBaseDialogAction
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -146,7 +146,7 @@ public class SystemSelectRemoteFileAction extends SystemBaseDialogAction
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java

@@ -149,7 +149,7 @@ public class SystemSelectRemoteFolderAction extends SystemBaseDialogAction
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -161,7 +161,7 @@ public class SystemSelectRemoteFolderAction extends SystemBaseDialogAction
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java

@@ -19,7 +19,6 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.window.Window;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.ISaveAsDialog;
 import org.eclipse.rse.files.ui.resources.SaveAsDialog;
@@ -34,6 +33,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSecurityException;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
@@ -237,7 +237,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
                 else
                 {
                     enableOkButton(false);
-                    _errorMessage = SystemPlugin.getPluginMessage(MSG_VALIDATE_PATH_EMPTY);
+                    _errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PATH_EMPTY);
                     setErrorMessage(_errorMessage);
                 }
             }
@@ -303,7 +303,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
 
         private void setHelp()
         {
-            setHelp(SystemPlugin.HELPPREFIX + "scdl0000");
+            setHelp(RSEUIPlugin.HELPPREFIX + "scdl0000");
         }
     }
 
@@ -370,7 +370,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
             try
             {
                 _saveasFile = _saveasFile.getParentRemoteFileSubSystem().getRemoteFileObject(_saveasFile.getAbsolutePath());
-                SystemPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_saveasFile.getParentRemoteFile(), ISystemResourceChangeEvents.EVENT_REFRESH, null));
+                RSEUIPlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(_saveasFile.getParentRemoteFile(), ISystemResourceChangeEvents.EVENT_REFRESH, null));
                         
             }
             catch (SystemMessageException e)
@@ -502,7 +502,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
                     catch (SystemMessageException e)
                     {
                         SystemBasePlugin.logError("Error in performSaveAs", e);
-                        SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
+                        SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
                         SystemMessageDialog dialog = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), message);
                         dialog.open();
                         return;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java

@@ -15,12 +15,12 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.widgets.SystemRemoteFolderCombo;
 import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.subsystems.files.core.SystemFileResources;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.swt.SWT;
@@ -84,7 +84,7 @@ public class SystemPromptForHomeFolderDialog
         boolean readOnly = false;
         folderCombo = new SystemRemoteFolderCombo(composite_prompts, SWT.BORDER, null, readOnly);        
         folderCombo.setSystemConnection(connection);
-        folderCombo.setText("/home/"+SystemPlugin.getLocalMachineName());
+        folderCombo.setText("/home/"+RSEUIPlugin.getLocalMachineName());
 
         // listen for selections
         //folderCombo.addSelectionListener(this);

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java

@@ -135,7 +135,7 @@ public class SystemSelectRemoteFileOrFolderDialog
      * Restrict to certain system types
      * @param systemTypes the system types to restrict what connections are shown and what types of connections
      *  the user can create
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java

@@ -19,13 +19,13 @@ package org.eclipse.rse.files.ui.propertypages;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystemConfiguration;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.propertypages.ServicesPropertyPage;
 import org.eclipse.rse.ui.widgets.services.FactoryServiceElement;
 import org.eclipse.rse.ui.widgets.services.ServiceElement;
@@ -68,7 +68,7 @@ public class FileServicesPropertyPage extends ServicesPropertyPage
 	protected IFileServiceSubSystemConfiguration[] getFileServiceSubSystemFactories(String systemType)
 	{
 		List results = new ArrayList();
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType);
 		
 		for (int i = 0; i < factories.length; i++)

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java

@@ -34,7 +34,6 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
@@ -45,6 +44,7 @@ import org.eclipse.rse.ui.GenericMessages;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
 import org.eclipse.rse.ui.Mnemonics;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
@@ -95,7 +95,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 	public SystemCachePreferencePage()
 	{
 		super();
-		setPreferenceStore(SystemPlugin.getDefault().getPreferenceStore());
+		setPreferenceStore(RSEUIPlugin.getDefault().getPreferenceStore());
 		setDescription(FileResources.RESID_PREF_CACHE_DESCRIPTION);
 	}
 
@@ -186,7 +186,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 			FileResources.RESID_PREF_CACHE_CLEAR_WARNING_DESCRIPTION);
 
 		(new Mnemonics()).setOnPreferencePage(true).setMnemonics(parent);
-		SystemWidgetHelpers.setCompositeHelp(parent, SystemPlugin.HELPPREFIX + "fchp0000");
+		SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "fchp0000");
 
 		initControls();
 		return parent;
@@ -194,7 +194,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 
 	private void initControls()
 	{
-		IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 		boolean enableMaxSize = store.getBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
 		_maxCacheSize.setEnabled(enableMaxSize);
 		
@@ -223,7 +223,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 	{
 		super.performDefaults();
 
-		IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 
 		boolean enableMaxSize = store.getDefaultBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
 		_maxCacheCheckbox.setSelection(enableMaxSize);
@@ -248,7 +248,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 	 */
 	public boolean performOk()
 	{
-		IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 		String size = _maxCacheSize.getText();
 		
 		if (size == null || size.trim().equals("")) {
@@ -341,7 +341,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 
 	protected IRunnableContext getRunnableContext(Shell shell)
 	{
-		IRunnableContext irc = SystemPlugin.getTheSystemRegistry().getRunnableContext();
+		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext();
 		if (irc != null)
 		{
 			return irc;
@@ -420,7 +420,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 						else if (properties.getDownloadFileTimeStamp() != child.getLocalTimeStamp())
 						{
 							String ssString = properties.getRemoteFileSubSystem();
-							ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+							ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 							ISubSystem subsystem = registry.getSubSystem(ssString);
 							if (subsystem != null)
 							{
@@ -532,7 +532,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 								else
 								{
 									String ssString = properties.getRemoteFileSubSystem();
-									ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+									ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 									ISubSystem subsystem = registry.getSubSystem(ssString);
 									if (subsystem != null)
 									{
@@ -599,7 +599,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 		List dirtyEditors = new ArrayList();
 		if (!getDirtyReplicas(dirtyEditors))
 		{
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CACHE_UNABLE_TO_SYNCH);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CACHE_UNABLE_TO_SYNCH);
 			SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 			dlg.open();
 
@@ -617,7 +617,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 			WorkbenchContentProvider cprovider = new WorkbenchContentProvider();
 			SystemTableViewProvider lprovider = new SystemTableViewProvider();
 
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_CACHE_UPLOAD_BEFORE_DELETE);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CACHE_UPLOAD_BEFORE_DELETE);
 
 			ListSelectionDialog dlg =
 				new ListSelectionDialog(getShell(), input, cprovider, lprovider, msg.getLevelOneText());

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemFilePropertyPage.java

@@ -19,7 +19,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -27,6 +26,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSecurityException;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage;
 import org.eclipse.swt.events.SelectionEvent;
@@ -61,7 +61,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
 	public SystemFilePropertyPage()
 	{
 		super();
-		SystemPlugin sp = SystemPlugin.getDefault();
+		RSEUIPlugin sp = RSEUIPlugin.getDefault();
 	}
 	/**
 	 * Create the page's GUI contents.
@@ -258,16 +258,16 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
    		  try
     	  {
     	     getRemoteFile().getParentRemoteFileSubSystem().setReadOnly(getRemoteFile());
-		     SystemPlugin.getTheSystemRegistry().fireEvent(
+		     RSEUIPlugin.getTheSystemRegistry().fireEvent(
                    new org.eclipse.rse.model.SystemResourceChangeEvent(
                    getRemoteFile(),ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE,null)); 
     	     
     	  } catch (RemoteFileIOException exc) 
     	  {
-             setMessage(SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_IO_ERROR));
+             setMessage(RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IO_ERROR));
     	  } catch (RemoteFileSecurityException exc)
     	  {
-             setMessage(SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR));
+             setMessage(RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR));
     	  }
     	  //catch (RemoteFileException e)
     	  //{ 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java

@@ -29,7 +29,6 @@ import org.eclipse.jface.viewers.ColumnPixelData;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.window.Window;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -39,6 +38,7 @@ import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistr
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
 import org.eclipse.rse.ui.Mnemonics;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.SWT;
@@ -113,7 +113,7 @@ public class UniversalPreferencePage
 	 */
 	public UniversalPreferencePage() {
 		super(GRID);
-		setPreferenceStore(SystemPlugin.getDefault().getPreferenceStore());
+		setPreferenceStore(RSEUIPlugin.getDefault().getPreferenceStore());
 		setDescription(FileResources.RESID_PREF_UNIVERSAL_FILES_TITLE);
 	}
 
@@ -130,7 +130,7 @@ public class UniversalPreferencePage
 	protected void createFieldEditors() {
 		
 		modeRegistry = (SystemFileTransferModeRegistry)(SystemFileTransferModeRegistry.getDefault());
-		editorRegistry = (IEditorRegistry)(SystemPlugin.getDefault().getWorkbench().getEditorRegistry());
+		editorRegistry = (IEditorRegistry)(RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry());
 		
 		modeMappings = new ArrayList();
 		editorMappings = new ArrayList();
@@ -270,7 +270,7 @@ public class UniversalPreferencePage
 			
 		addField(showHiddenEditor);
 		
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		
 		// download and upload buffer size
 	
@@ -381,7 +381,7 @@ public class UniversalPreferencePage
 		updateEnabledState();
 		
         (new Mnemonics()).setOnPreferencePage(true).setMnemonics(parent);	
-		SystemWidgetHelpers.setCompositeHelp(parent, SystemPlugin.HELPPREFIX+"ufpf0000");
+		SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX+"ufpf0000");
 		
 	}
 
@@ -627,7 +627,7 @@ public class UniversalPreferencePage
 		// no extension is provided
 		if (newExtension == null || newExtension.length() < 1) {
 // Note by DWD - this path is never taken because the dialog that gathers resource types checks for this condition
-			SystemMessageFile mf = SystemPlugin.getPluginMessageFile();
+			SystemMessageFile mf = RSEUIPlugin.getPluginMessageFile();
 			Shell shell = getControl().getShell();
 			SystemMessage message = mf.getMessage(ISystemMessages.MSG_ERROR_EXTENSION_EMPTY);
 			SystemMessageDialog.displayErrorMessage(shell, message);
@@ -649,7 +649,7 @@ public class UniversalPreferencePage
 				// if the name is more than one character, and it has a '*' in it
 				if (!(index == 0 && newName.length() == 1)) {
 // Note by DWD - this path is never taken because the dialog that gathers resource types checks for this condition.
-					SystemMessageFile mf = SystemPlugin.getPluginMessageFile();
+					SystemMessageFile mf = RSEUIPlugin.getPluginMessageFile();
 					Shell shell = getControl().getShell();
 					SystemMessage message = mf.getMessage(ISystemMessages.MSG_ERROR_FILENAME_INVALID);
 					SystemMessageDialog.displayErrorMessage(shell, message);
@@ -824,7 +824,7 @@ public class UniversalPreferencePage
 	 */
 	public static int getFileTransferModeDefaultPreference() 
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		return store.getInt(ISystemPreferencesConstants.FILETRANSFERMODEDEFAULT);
 	}
 	/**
@@ -832,7 +832,7 @@ public class UniversalPreferencePage
 	 */
 	public static void setFileTransferModeDefaultPreference(int defaultMode) 
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		store.setValue(ISystemPreferencesConstants.FILETRANSFERMODEDEFAULT,defaultMode);
 		savePreferenceStore();
 	}	
@@ -842,7 +842,7 @@ public class UniversalPreferencePage
 	 */
 	public static String getSuperTransferTypePreference() 
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		return store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
 	}
 	/**
@@ -850,20 +850,20 @@ public class UniversalPreferencePage
 	 */
 	public static void setSuperTransferTypePreference(String type) 
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		store.setValue(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE,type);
 		savePreferenceStore();
 	}	
 	
 	public static boolean getDoSuperTransfer() 
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		return store.getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 	}
 	
 	public static int getDownloadBufferSize()
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		int result = store.getInt(ISystemPreferencesConstants.DOWNLOAD_BUFFER_SIZE);
 		if (result == 0)
 		{
@@ -874,7 +874,7 @@ public class UniversalPreferencePage
 	
 	public static int getUploadBufferSize()
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		int result = store.getInt(ISystemPreferencesConstants.UPLOAD_BUFFER_SIZE);
 		if (result == 0)
 		{
@@ -885,7 +885,7 @@ public class UniversalPreferencePage
 	
 	public static void setDoSuperTransfer(boolean flag)
 	{
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		store.setValue(ISystemPreferencesConstants.DOSUPERTRANSFER,flag);
 		savePreferenceStore();
 	}
@@ -904,7 +904,7 @@ public class UniversalPreferencePage
 	{
 	    if (size > 0)
 	    {
-	        IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+	        IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 	    	store.setValue(ISystemPreferencesConstants.DOWNLOAD_BUFFER_SIZE, size);
 	    	savePreferenceStore();
 	    }
@@ -914,7 +914,7 @@ public class UniversalPreferencePage
 	{
 	    if (size > 0)
 	    {
-	        IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+	        IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 	    	store.setValue(ISystemPreferencesConstants.UPLOAD_BUFFER_SIZE, size);
 	    	savePreferenceStore();
 	    }
@@ -927,7 +927,7 @@ public class UniversalPreferencePage
 	{	 
 		/* DY:  This was causing ClassCastException in 2.0
 		 *      getPreferenceStore retutrns CompatibilityPreferenceStore now
-		PreferenceStore store = (PreferenceStore)SystemPlugin.getDefault().getPreferenceStore();				
+		PreferenceStore store = (PreferenceStore)RSEUIPlugin.getDefault().getPreferenceStore();				
 		try {
 			store.save();
 		} catch (Exception exc)
@@ -937,7 +937,7 @@ public class UniversalPreferencePage
 		*/
 		// ok, a couple hours of research leads me to believe this is now the new
 		// thing to do... phil
-		SystemPlugin.getDefault().savePluginPreferences();
+		RSEUIPlugin.getDefault().savePluginPreferences();
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveDialog.java

@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -33,18 +33,18 @@ public class AddToArchiveDialog extends CombineDialog {
 	public AddToArchiveDialog(Shell shell) 
 	{
 		super(shell);
-		setHelp(SystemPlugin.HELPPREFIX + "atad0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
 	}
 
 	public AddToArchiveDialog(Shell shell, String title) {
 		super(shell, title);
-		setHelp(SystemPlugin.HELPPREFIX + "atad0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
 	}
 	
 	public AddToArchiveDialog(Shell shell, String title, String[] relativePaths) 
 	{
 		super(shell, title);
-		setHelp(SystemPlugin.HELPPREFIX + "atad0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
 		_relativePaths = relativePaths;
 		((AddToArchiveForm)form).setRelativePathList(_relativePaths);
 	}
@@ -55,7 +55,7 @@ public class AddToArchiveDialog extends CombineDialog {
 		boolean prePopSelection) 
 	{
 		super(shell, title, prePopSelection);
-		setHelp(SystemPlugin.HELPPREFIX + "atad0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
 	}
 	
 	public AddToArchiveDialog(
@@ -65,7 +65,7 @@ public class AddToArchiveDialog extends CombineDialog {
 		String[] relativePaths) 
 	{
 		super(shell, title, prePopSelection);
-		setHelp(SystemPlugin.HELPPREFIX + "atad0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
 		_relativePaths = relativePaths;
 		((AddToArchiveForm)form).setRelativePathList(_relativePaths);
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineDialog.java

@@ -15,10 +15,10 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -37,7 +37,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
 	public CombineDialog(Shell shell)
 	{
 		super(shell, false);
-		setHelp(SystemPlugin.HELPPREFIX + "cmbd0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
 	}	
 	
 	/**
@@ -48,7 +48,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
 	public CombineDialog(Shell shell, String title)
 	{
 		super(shell, title, false);
-		setHelp(SystemPlugin.HELPPREFIX + "cmbd0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
 	}
 	
 	/**
@@ -65,7 +65,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
 		super(shell, title, false);
 		prePop = prePopSelection;
 		if (form != null) form.setPrePopSelection(prePop);
-		setHelp(SystemPlugin.HELPPREFIX + "cmbd0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
 	}
 
 	/**
@@ -84,7 +84,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
 		super(shell, title, false);
 		prePop = prePopSelection;
 		if (form != null) form.setPrePopSelection(prePop);
-		setHelp(SystemPlugin.HELPPREFIX + "cmbd0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
 	}
 
 		

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.filters.ISystemFilter;
@@ -35,6 +34,7 @@ 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;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ValidatorArchiveName;
@@ -372,7 +372,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		setDefaultConnection(connection);
 		setShowNewConnectionPrompt(true);
 		setAutoExpandDepth(0);        
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
 		IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory();
 		RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);
@@ -417,7 +417,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		  {
 			preSelectFilter = filter;
 			preSelectFilterChild = folderAbsolutePath;
-			//SystemPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
+			//RSEUIPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
 		  }
 		}
         
@@ -433,7 +433,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		  filters[idx] = filter;
         
 		  preSelectFilter = filter;
-		  //SystemPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
+		  //RSEUIPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
 		}
 		inputProvider.setFilterString(null); // undo what ctor did
 		inputProvider.setQuickFilters(filters);

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToDialog.java

@@ -15,10 +15,10 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -38,7 +38,7 @@ public class ExtractToDialog extends SystemSelectRemoteFileOrFolderDialog {
 	public ExtractToDialog(Shell shell)
 	{
 		super(shell, false);
-		setHelp(SystemPlugin.HELPPREFIX + "exdi0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "exdi0000");
 	}	
 	/**
 	 * Constructor when you want to supply your own title.
@@ -50,7 +50,7 @@ public class ExtractToDialog extends SystemSelectRemoteFileOrFolderDialog {
 	public ExtractToDialog(Shell shell, String title)
 	{
 		super(shell, title, false);
-		setHelp(SystemPlugin.HELPPREFIX + "exdi0000");
+		setHelp(RSEUIPlugin.HELPPREFIX + "exdi0000");
 	}
 		
 	protected SystemSelectRemoteFileOrFolderForm getForm(boolean fileMode)

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java

@@ -18,7 +18,6 @@ package org.eclipse.rse.files.ui.resources;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.filters.SystemFilterSimple;
@@ -31,6 +30,7 @@ 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;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ValidatorFolderName;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -76,7 +76,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 //	   fileNameText = SystemWidgetHelpers.createTextField(composite, null);
 
 //	   fileNameText = SystemWidgetHelpers.createLabeledTextField(
-//		   composite, null, SystemPlugin.getResourceBundle(), ISystemConstants.RESID_EXTRACTTO_NAME_ROOT);
+//		   composite, null, RSEUIPlugin.getResourceBundle(), ISystemConstants.RESID_EXTRACTTO_NAME_ROOT);
 			
 			
 //	   fileNameText.addModifyListener(new ModifyListener() {
@@ -120,7 +120,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 		   //System.out.println("...saveasMbr null? "+ (saveasMbr==null));
 		   if (saveasFile != null && saveasFile.exists())
 		   {
-			   SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
+			   SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
 			   msg.makeSubstitution(fileName);
 			   SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 			   ok = dlg.openQuestionNoException();
@@ -258,7 +258,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 		setDefaultConnection(connection);
 		setShowNewConnectionPrompt(true);
 		setAutoExpandDepth(0);        
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
 		IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory();
 		RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);
@@ -303,7 +303,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 		  {
 			preSelectFilter = filter;
 			preSelectFilterChild = folderAbsolutePath;
-			//SystemPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
+			//RSEUIPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
 		  }
 		}
         
@@ -319,7 +319,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 		  filters[idx] = filter;
         
 		  preSelectFilter = filter;
-		  //SystemPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
+		  //RSEUIPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
 		}
 		inputProvider.setFilterString(null); // undo what ctor did
 		inputProvider.setQuickFilters(filters);

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java

@@ -18,12 +18,12 @@ package org.eclipse.rse.files.ui.resources;
 
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
@@ -117,7 +117,7 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
 		    //System.out.println("...saveasMbr null? "+ (saveasMbr==null));
 			if (saveasFile != null && saveasFile.exists())
 			{
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
 				msg.makeSubstitution(fileName);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				ok = dlg.openQuestionNoException();

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java

@@ -37,7 +37,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.actions.SystemDownloadConflictAction;
 import org.eclipse.rse.model.IHost;
@@ -50,6 +49,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
 import org.eclipse.swt.program.Program;
@@ -214,7 +214,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 	
 	protected IEditorRegistry getEditorRegistry()
 	{
-		return SystemPlugin.getDefault().getWorkbench().getEditorRegistry();
+		return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry();
 	}
 	
 	protected IEditorDescriptor getDefaultTextEditor()
@@ -247,7 +247,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 		// to handle migration of this smoothly, we can use another method to determine the subsystem                         
 		if (subsystemId != null)
 		{
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			fs = registry.getSubSystem(subsystemId);
 		}
 
@@ -544,7 +544,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 	private boolean doDownload(SystemIFileProperties properties, IProgressMonitor monitor) throws Exception
 	{
 		// file hasn't been downloaded before, so do the download now
-		/*		SystemMessage copyMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS);
+		/*		SystemMessage copyMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS);
 				copyMessage.makeSubstitution(remoteFile.getName());
 				monitor.beginTask(copyMessage.getLevelOneText(), (int)remoteFile.getLength());
 		*/
@@ -642,7 +642,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 		try
 		{
 			String path = file.getCanonicalPath();
-			return SystemPlugin.getWorkspaceRoot().getFileForLocation(new Path(path));
+			return RSEUIPlugin.getWorkspaceRoot().getFileForLocation(new Path(path));
 		}
 		catch (IOException e)
 		{
@@ -924,7 +924,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 			}
 		}
 
-		IWorkbenchWindow[] windows = SystemPlugin.getDefault().getWorkbench().getWorkbenchWindows();
+		IWorkbenchWindow[] windows = RSEUIPlugin.getDefault().getWorkbench().getWorkbenchWindows();
 
 		for (int i = 0; i < windows.length; i++)
 		{
@@ -997,7 +997,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 			
 			if (!remoteFile.exists())
 			{
-				SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
+				SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
 				message.makeSubstitution(remotePath, subsystem.getHost().getHostName());
 				SystemMessageDialog dialog = new SystemMessageDialog(shell, message);
 				dialog.open();
@@ -1033,7 +1033,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 						download(shell);
 					}
 
-					SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOAD_NO_WRITE);
+					SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOAD_NO_WRITE);
 					message.makeSubstitution(remotePath, subsystem.getHost().getHostName());
 					SystemMessageDialog dialog = new SystemMessageDialog(shell, message);
 
@@ -1057,7 +1057,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 			}
 			else if (result == OPEN_IN_DIFFERENT_PERSPECTIVE)
 			{
-				SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR);
+				SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR);
 				message.makeSubstitution(remotePath, subsystem.getHost().getHostName());
 				SystemMessageDialog dialog = new SystemMessageDialog(shell, message);
 
@@ -1194,7 +1194,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 		properties.setRemoteFileObject(this);
 
 		// set remote properties
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		String subSystemId = registry.getAbsoluteNameForSubSystem(subsystem);
 		properties.setRemoteFileSubSystem(subSystemId);
 		properties.setRemoteFilePath(remoteFile.getAbsolutePath());
@@ -1218,7 +1218,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 				encoding = util.getXMLFileEncoding(tempPath);
 			}
 			catch (IOException e) {
-				IStatus s = new Status(IStatus.ERROR, SystemPlugin.PLUGIN_ID, IStatus.ERROR, e.getLocalizedMessage(), e);
+				IStatus s = new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.ERROR, e.getLocalizedMessage(), e);
 				throw new CoreException(s);
 			}
 		}
@@ -1416,9 +1416,9 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 				delta.accept(this);
 			}
 			catch (CoreException e) {
-				SystemPlugin.logError("Error accepting delta", e);
+				RSEUIPlugin.logError("Error accepting delta", e);
 				RemoteFileIOException exc = new RemoteFileIOException(e);
-				SystemMessageDialog dialog = new SystemMessageDialog(SystemPlugin.getActiveWorkbenchShell(), exc.getSystemMessage());
+				SystemMessageDialog dialog = new SystemMessageDialog(RSEUIPlugin.getActiveWorkbenchShell(), exc.getSystemMessage());
 				dialog.open();
 			}
 		}
@@ -1537,7 +1537,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 			catch (InvocationTargetException e)
 			{
 				SystemBasePlugin.logError("Error in performSaveAs", e);
-				SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
+				SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
 				SystemMessageDialog dialog = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), message);
 				dialog.open();
 				return true;
@@ -1564,7 +1564,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 					catch (Exception e)
 					{
 						SystemBasePlugin.logError("Error in performSaveAs", e);
-						SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
+						SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
 						SystemMessageDialog dialog = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), message);
 						dialog.open();
 						return true;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemIFileProperties.java

@@ -19,7 +19,7 @@ package org.eclipse.rse.files.ui.resources;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.rse.core.SystemPlugin;
+import org.eclipse.rse.ui.RSEUIPlugin;
 
 
 
@@ -55,7 +55,7 @@ public class SystemIFileProperties implements ISystemTextEditorConstants, ISyste
 	
 	// local encoding qualified name
 	// NOTE: DO NOT CHANGE THIS!! This exact qualified name is used by the IBM debugger.
-	private static QualifiedName _nameLocalEncoding		  = new QualifiedName(SystemPlugin.getDefault().getSymbolicName(), LOCAL_ENCODING_KEY);
+	private static QualifiedName _nameLocalEncoding		  = new QualifiedName(RSEUIPlugin.getDefault().getSymbolicName(), LOCAL_ENCODING_KEY);
 		
 	protected IResource _resource = null;
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java

@@ -35,9 +35,9 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.swt.widgets.Display;
@@ -62,7 +62,7 @@ public class SystemRemoteEditManager
 	public static final String REMOTE_EDIT_PROJECT_BUILDER_ID = "org.eclipse.rse.ui.remoteSystemsTempBuilder";
 
 	private static SystemRemoteEditManager inst;
-	private SystemPlugin plugin;
+	private RSEUIPlugin plugin;
 	private List _mountPathMappers;
 
 	/**
@@ -71,7 +71,7 @@ public class SystemRemoteEditManager
 	private SystemRemoteEditManager()
 	{
 		super();
-		plugin = SystemPlugin.getDefault();
+		plugin = RSEUIPlugin.getDefault();
 		registerMountPathMappers();
 	}
 
@@ -539,7 +539,7 @@ public class SystemRemoteEditManager
 			String pathStr = properties.getRemoteFilePath();
 			if (subsystemStr != null && pathStr != null)
 			{
-				ISubSystem subsystem = SystemPlugin.getTheSystemRegistry().getSubSystem(subsystemStr);
+				ISubSystem subsystem = RSEUIPlugin.getTheSystemRegistry().getSubSystem(subsystemStr);
 				if (subsystem != null)
 				{
 					Object rmtObject = null;
@@ -659,7 +659,7 @@ public class SystemRemoteEditManager
 	protected void cleanupCache()
 	{
 
-		IPreferenceStore store = SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 		boolean enableMaxSize = store.getBoolean(ISystemPreferencesConstants.LIMIT_CACHE);
 		if (enableMaxSize)
 		{	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java

@@ -26,7 +26,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.SystemPlugin;
+import org.eclipse.rse.ui.RSEUIPlugin;
 
 
 /**
@@ -66,7 +66,7 @@ public class SystemRemoteMarkerTypeDefinitionCache {
 	 * Load marker type definitions.
 	 */
 	private void loadDefinitions() {
-		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(SystemPlugin.PLUGIN_ID, ISystemRemoteMarker.EXTENSION_POINT_ID);
+		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(RSEUIPlugin.PLUGIN_ID, ISystemRemoteMarker.EXTENSION_POINT_ID);
 		IExtension[] types = point.getExtensions();
 		definitions = new HashMap(types.length);
 		

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java

@@ -32,7 +32,6 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.filters.ISystemFilterReference;
@@ -46,6 +45,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.progress.WorkbenchJob;
@@ -133,7 +133,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 				}
 				else
 				{
-					if (!SystemPlugin.getThePersistenceManager().isExporting())
+					if (!RSEUIPlugin.getThePersistenceManager().isExporting())
 					{
 						List changes = new ArrayList();
 						checkLocalChanges(delta, changes);
@@ -155,7 +155,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 		
 		public IStatus run(IProgressMonitor monitor)
 		{
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_SYNCHRONIZE_PROGRESS);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_SYNCHRONIZE_PROGRESS);
 			monitor.beginTask(msg.getLevelOneText(), _resources.size());
 			for (int i = 0; i < _resources.size(); i++)
 			{
@@ -180,7 +180,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 			_isSynching = true;
 			synchronized (_changedResources)
 			{				
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_SYNCHRONIZE_PROGRESS);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_SYNCHRONIZE_PROGRESS);
 				monitor.beginTask(msg.getLevelOneText(), IProgressMonitor.UNKNOWN);
 				setName(msg.getLevelOneText());
 				for (int i = 0; i < _changedResources.size(); i++)
@@ -300,7 +300,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 	
 	protected IRunnableContext getRunnableContext(Shell shell)
 	{
-		IRunnableContext irc = SystemPlugin.getTheSystemRegistry().getRunnableContext();
+		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext();
 		if (irc != null)
 		{
 			return irc;
@@ -365,7 +365,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 						    String ssStr = properties.getRemoteFileSubSystem();
 						    if (ssStr != null)
 						    {
-						        ISubSystem ss = SystemPlugin.getTheSystemRegistry().getSubSystem(ssStr);
+						        ISubSystem ss = RSEUIPlugin.getTheSystemRegistry().getSubSystem(ssStr);
 						        if (doesHandle(ss))
 						        {
 						            _changedResources.add(resource);
@@ -385,7 +385,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 					 */
 					///*
 					// check if this file is being edited
-					/*IWorkbenchWindow window = SystemPlugin.getActiveWorkbenchWindow();
+					/*IWorkbenchWindow window = RSEUIPlugin.getActiveWorkbenchWindow();
 					if (window == null)
 					{
 						// DKM:
@@ -499,7 +499,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 		// to handle migration of this smoothly, we can use another method to determine the subsystem                         
 		if (subsystemId != null)
 		{
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			fs = registry.getSubSystem(subsystemId);
 		}
 
@@ -581,7 +581,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 
 	protected void refreshRemoteResource(Object parent)
 	{
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		// refresh
 		if (parent != null)
 		{							
@@ -619,7 +619,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 
 	private IRemoteFileSubSystem getLocalFileSubSystem()
 	{
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		IHost con = registry.getLocalHost();
 		if (con != null)
 		{

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.actions.SystemUploadConflictAction;
 import org.eclipse.rse.model.ISystemRegistry;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSecurityException;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.DisplaySystemMessageAction;
 import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
 import org.eclipse.swt.widgets.Display;
@@ -115,7 +115,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
 	{
 		if (subsystem instanceof IRemoteFileSubSystem)
 		{
-			Shell shell = SystemPlugin.getTheSystemRegistry().getShell();
+			Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
 			IRemoteFileSubSystem fs = (IRemoteFileSubSystem) subsystem;
 			
 			// first we need to get the stored timestamp property and the actual remote timestamp
@@ -254,7 +254,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
 				
 				IRemoteFile parent = remoteFile.getParentRemoteFile();
 	
-				ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+				ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 				// refresh
 				if (parent != null)
 				{
@@ -300,7 +300,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
 				//			2) Overwrite remote
 				//			3) Save as...
 				//			4) Cancel
-				Shell shell = SystemPlugin.getTheSystemRegistry().getShell();
+				Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
 
 				SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tempFile, remoteFile, remoteNewer);
 				conflictAction.run();

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java

@@ -30,7 +30,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.model.IHost;
@@ -55,6 +54,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFolderNotEmptyExce
 import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Display;
@@ -124,7 +124,7 @@ public class UniversalFileTransferUtility
 		/*
 		if (monitor != null)
 		{
-			SystemMessage copyMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS);
+			SystemMessage copyMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS);
 			copyMessage.makeSubstitution(srcFileOrFolder.getName());
 
 			monitor.beginTask(copyMessage.getLevelOneText(), IProgressMonitor.UNKNOWN);
@@ -188,7 +188,7 @@ public class UniversalFileTransferUtility
 
 		String remotePath = remoteFile.getAbsolutePath();
 
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem);
 		properties.setRemoteFileSubSystem(subSystemId);
 		properties.setRemoteFilePath(remotePath);
@@ -226,7 +226,7 @@ public class UniversalFileTransferUtility
 			return null;
 		}
 	
-		boolean doSuperTransferProperty = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
+		boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 
 
 		List set = remoteSet.getResourceSet();
@@ -241,7 +241,7 @@ public class UniversalFileTransferUtility
 			IRemoteFile srcFileOrFolder = (IRemoteFile)set.get(i);
 			if (!srcFileOrFolder.exists())
 			{
-				SystemMessage errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
+				SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
 				errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), srcFS.getHostAliasName());
 				resultSet.setMessage(errorMessage);
 			}
@@ -355,7 +355,7 @@ public class UniversalFileTransferUtility
 		}
 		if (!srcFileOrFolder.exists())
 		{
-			SystemMessage errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
+			SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
 			errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), srcFS.getHostAliasName());
 			return errorMessage;
 		}
@@ -389,7 +389,7 @@ public class UniversalFileTransferUtility
 		{
 			IResource tempFolder = null;
 			
-			boolean doSuperTransferProperty = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
+			boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 			
 			if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot() 
 					&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local")))
@@ -480,7 +480,7 @@ public class UniversalFileTransferUtility
 	 */
 	private static IRemoteFileSubSystem getLocalFileSubSystem()
 	{
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		IHost[] connections = registry.getHosts();
 		for (int i = 0; i < connections.length; i++)
 		{
@@ -522,7 +522,7 @@ public class UniversalFileTransferUtility
 	 */
 	public static SystemRemoteResourceSet copyWorkspaceResourcesToRemote(SystemWorkspaceResourceSet workspaceSet, IRemoteFile targetFolder, IProgressMonitor monitor, Shell shell, boolean checkForCollisions)
 	{	
-		boolean doSuperTransferPreference = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER)
+		boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER)
 											&& targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement();
 
 		IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem();
@@ -541,7 +541,7 @@ public class UniversalFileTransferUtility
 
 		if (!targetFolder.canWrite())
 		{
-			SystemMessage errorMsg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
+			SystemMessage errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
 			errorMsg.makeSubstitution(targetFS.getHostAliasName());
 			resultSet.setMessage(errorMsg);
 			return resultSet;
@@ -759,7 +759,7 @@ public class UniversalFileTransferUtility
 
 		if (!targetFolder.canWrite())
 		{
-			SystemMessage errorMsg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
+			SystemMessage errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
 			errorMsg.makeSubstitution(targetFS.getHostAliasName());
 			return errorMsg;
 		}
@@ -770,7 +770,7 @@ public class UniversalFileTransferUtility
 		}
 
 		/*
-		SystemMessage copyMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
+		SystemMessage copyMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
 		copyMessage.makeSubstitution(srcFileOrFolder.getName(), targetFolder.getAbsolutePath());
 		*/
 		
@@ -884,7 +884,7 @@ public class UniversalFileTransferUtility
 				
 				boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local");
 				boolean destInArchive = (newTargetFolder  instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
-				boolean doSuperTransferPreference = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
+				boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 				
 				if (doCompressedTransfer && doSuperTransferPreference && !destInArchive && !isTargetLocal)
 				{
@@ -1045,7 +1045,7 @@ public class UniversalFileTransferUtility
 	protected static String getArchiveExtensionFromProperties()
 	{
 	
-		IPreferenceStore store= SystemPlugin.getDefault().getPreferenceStore();
+		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		String archiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
 		if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType))
 		{
@@ -1186,7 +1186,7 @@ public class UniversalFileTransferUtility
 						
 						if (shouldExtract)
 						{
-							SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_EXTRACT_PROGRESS);
+							SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXTRACT_PROGRESS);
 							msg.makeSubstitution(currentSource.getName());
 							monitor.subTask(msg.getLevelOneText());
 							
@@ -1481,9 +1481,9 @@ public class UniversalFileTransferUtility
 			IRemoteFileSubSystem ss = targetFolder.getParentRemoteFileSubSystem();
 			IRemoteFile targetFileOrFolder = ss.getRemoteFileObject(targetFolder, oldName);
 
-			//SystemPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
+			//RSEUIPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
-			//SystemPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
+			//RSEUIPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
-			//SystemPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
+			//RSEUIPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
 			if (targetFileOrFolder.exists())
 			{
 				//monitor.setVisible(false); wish we could!

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java

@@ -29,7 +29,6 @@ import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
 import org.eclipse.rse.model.IHost;
@@ -48,6 +47,7 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.search.SystemSearchUI;
@@ -604,7 +604,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			if (searchString != null && searchString.length() != 0) {
 				
 				if (!util.isValidRegex(searchString)) {
-					SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_REMOTE_SEARCH_INVALID_REGEX);
+					SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_REMOTE_SEARCH_INVALID_REGEX);
 					message.makeSubstitution(searchString);
 					SystemMessageDialog.displayErrorMessage(getShell(), message);
 					stringCombo.setFocus();
@@ -621,7 +621,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			if (fileNameString != null && fileNameString.length() != 0) {
 				
 				if (!util.isValidRegex(fileNameString)) {
-					SystemMessage message = SystemPlugin.getPluginMessage(ISystemMessages.MSG_REMOTE_SEARCH_INVALID_REGEX);
+					SystemMessage message = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_REMOTE_SEARCH_INVALID_REGEX);
 					message.makeSubstitution(fileNameString);
 					SystemMessageDialog.displayErrorMessage(getShell(), message);
 					fileNameCombo.setFocus();
@@ -975,7 +975,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 		setControl(main);
 		
 		// set help
-		SystemWidgetHelpers.setHelp(main, SystemPlugin.HELPPREFIX + "rsdi0000");
+		SystemWidgetHelpers.setHelp(main, RSEUIPlugin.HELPPREFIX + "rsdi0000");
 	}
 	
 	/**
@@ -1103,7 +1103,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			return null;
 		}
 		else {
-			ISystemRegistry reg = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry reg = RSEUIPlugin.getTheSystemRegistry();
 			ISystemProfile profile = reg.getSystemProfile(profName);
 			
 			if (profile == null) {
@@ -1330,7 +1330,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 	 * @return the dialog settings of the plugin.
 	 */
 	private IDialogSettings getPluginDialogSettings() {
-		return SystemPlugin.getDefault().getDialogSettings();
+		return RSEUIPlugin.getDefault().getDialogSettings();
 	}
 		
 	/**

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemFactoryAdapter.java

@@ -25,7 +25,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.files.ui.actions.SystemFileUpdateFilterAction;
 import org.eclipse.rse.files.ui.actions.SystemNewFileAction;
@@ -38,6 +37,7 @@ import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
 import org.eclipse.rse.ui.view.SubsystemFactoryAdapter;
 import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
@@ -135,7 +135,7 @@ public class RemoteFileSubSystemFactoryAdapter extends SubsystemFactoryAdapter
 			// FIXME - can't do this here anymore
 			//_additionalActions.add(new SystemCommandAction(shell, true));
 			
-			ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+			ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 			Clipboard clipboard = registry.getSystemClipboard();
 			_additionalActions.add(new SystemPasteFromClipboardAction(shell, clipboard));
     	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java

@@ -40,7 +40,6 @@ import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
 import org.eclipse.rse.core.subsystems.SubSystem;
@@ -104,6 +103,7 @@ import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
 import org.eclipse.rse.ui.SystemMenuManager;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
 import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
@@ -194,8 +194,8 @@ public class SystemViewRemoteFileAdapter
 	private static PropertyDescriptor[] archiveDescriptorArray = null;
 	private static PropertyDescriptor[] virtualDescriptorArray = null;
 
-	static final SystemMessage _uploadMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_UPLOADING_PROGRESS);
+	static final SystemMessage _uploadMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_UPLOADING_PROGRESS);
-	static final SystemMessage _downloadMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOADING_PROGRESS);
+	static final SystemMessage _downloadMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DOWNLOADING_PROGRESS);
 	
 	/**
 	 * Constructor
@@ -207,7 +207,7 @@ public class SystemViewRemoteFileAdapter
 		xlatedCompressedSize = SystemViewResources.RESID_PROPERTY_VIRTUALFILE_COMPRESSEDSIZE_VALUE;
 		xlatedExpandedSize = SystemViewResources.RESID_PROPERTY_ARCHIVE_EXPANDEDSIZE_VALUE;
 		
-		IWorkbench workbench = SystemPlugin.getDefault().getWorkbench();
+		IWorkbench workbench = RSEUIPlugin.getDefault().getWorkbench();
 		if (workbench != null)
 			registry = workbench.getEditorRegistry();
 	}
@@ -403,7 +403,7 @@ public class SystemViewRemoteFileAdapter
 		ISubSystem subsys = firstFile.getParentRemoteFileSubSystem();
 
 		// DKM - clipboard based copy actions
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		Clipboard clipboard = registry.getSystemClipboard();
 
 		if (pasteClipboardAction == null)
@@ -515,11 +515,11 @@ public class SystemViewRemoteFileAdapter
 				isOpen = atv.getExpandedState(element);
 			}
 			if (file.isRoot())
-				return SystemPlugin.getDefault().getImageDescriptor(isOpen ? ISystemIconConstants.ICON_SYSTEM_ROOTDRIVEOPEN_ID : ISystemIconConstants.ICON_SYSTEM_ROOTDRIVE_ID);
+				return RSEUIPlugin.getDefault().getImageDescriptor(isOpen ? ISystemIconConstants.ICON_SYSTEM_ROOTDRIVEOPEN_ID : ISystemIconConstants.ICON_SYSTEM_ROOTDRIVE_ID);
 			else if (isOpen)
 			    return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
 			else
-				return SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_FOLDER_ID);
+				return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_FOLDER_ID);
 		}
 	}
 
@@ -716,7 +716,7 @@ public class SystemViewRemoteFileAdapter
 				if ((children == null) || (children.length == 0))
 				{
 					//children = new SystemMessageObject[1];
-					//children[0] = new SystemMessageObject(SystemPlugin.getPluginMessage(MSG_EXPAND_EMPTY),
+					//children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),
 					//                                      ISystemMessageObject.MSGTYPE_EMPTY, element);
 					children = EMPTY_LIST;
 				}
@@ -725,13 +725,13 @@ public class SystemViewRemoteFileAdapter
 			catch (InterruptedException exc)
 			{
 				children = new SystemMessageObject[1];
-				children[0] = new SystemMessageObject(SystemPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
+				children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
 				//System.out.println("Canceled.");
 			}
 			catch (Exception exc)
 			{
 				children = new SystemMessageObject[1];
-				children[0] = new SystemMessageObject(SystemPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
+				children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
 				SystemBasePlugin.logError("Exception resolving file filter strings", exc);
 			} // message already issued        
 		}
@@ -814,7 +814,7 @@ public class SystemViewRemoteFileAdapter
 				int i = -1;
 	
 				// add our unique property descriptors...
-				SystemPlugin plugin = SystemPlugin.getDefault();
+				RSEUIPlugin plugin = RSEUIPlugin.getDefault();
 	
 				// classification
 				if (isRegular) uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(P_FILE_CLASSIFICATION, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_LABEL, SystemViewResources.RESID_PROPERTY_FILE_CLASSIFICATION_TOOLTIP);
@@ -1370,7 +1370,7 @@ public class SystemViewRemoteFileAdapter
 	{
 	
 		boolean supportsSearch = ((IRemoteFileSubSystemConfiguration)set.getSubSystem().getSubSystemConfiguration()).supportsSearch();
-		boolean doSuperTransferProperty = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
+		boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 		if (!doSuperTransferProperty && supportsSearch)
 		{
 			SystemRemoteResourceSet flatSet = new SystemRemoteResourceSet(set.getSubSystem(), set.getAdapter());
@@ -1419,7 +1419,7 @@ public class SystemViewRemoteFileAdapter
 	 */
 	private IRemoteFileSubSystem getLocalFileSubSystem()
 	{
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		IHost[] connections = registry.getHosts();
 		for (int i = 0; i < connections.length; i++)
 		{
@@ -1632,7 +1632,7 @@ public class SystemViewRemoteFileAdapter
 
 			if (!targetFolder.canWrite())
 			{
-				SystemMessage errorMsg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
+				SystemMessage errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
 				errorMsg.makeSubstitution(targetFS.getHostAliasName());
 				resultSet.setMessage(errorMsg);
 				return resultSet;
@@ -1649,7 +1649,7 @@ public class SystemViewRemoteFileAdapter
 				if (fromSet instanceof SystemWorkspaceResourceSet)
 				{		
 
-					boolean doSuperTransferProperty = SystemPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
+					boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 					if (!doSuperTransferProperty)
 					{
 						SystemWorkspaceResourceSet flatFromSet = new SystemWorkspaceResourceSet();
@@ -1734,14 +1734,14 @@ public class SystemViewRemoteFileAdapter
 							IRemoteFile srcFileOrFolder = (IRemoteFile)set.get(i);																									
 							if (!srcFileOrFolder.exists())
 							{
-								SystemMessage errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
+								SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
 								errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getSystemConnection().getAliasName());
 								resultSet.setMessage(errorMessage);
 								return resultSet;
 							}
 							if (!srcFileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement())
 							{
-								SystemMessage errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED);
+								SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED);
 								resultSet.setMessage(errorMessage);
 								return resultSet;
 							}
@@ -1798,7 +1798,7 @@ public class SystemViewRemoteFileAdapter
 							String name = (String)toCopyNames.get(x);
 						
 							/*
-							SystemMessage copyMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
+							SystemMessage copyMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
 							copyMessage.makeSubstitution(srcFileOrFolder.getName(), targetFolder.getName());
 							if (monitor != null)
 							{
@@ -1888,7 +1888,7 @@ public class SystemViewRemoteFileAdapter
 
 			if (!targetFolder.canWrite())
 			{
-				SystemMessage errorMsg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
+				SystemMessage errorMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR);
 				errorMsg.makeSubstitution(targetFS.getHostAliasName());
 				return errorMsg;
 			}
@@ -1988,12 +1988,12 @@ public class SystemViewRemoteFileAdapter
 						IRemoteFile srcFileOrFolder = (IRemoteFile) src;
 						if (!srcFileOrFolder.exists())
 						{
-							SystemMessage errorMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
+							SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
 							errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getSystemConnection().getAliasName());
 							return errorMessage;
 						}
 
-						SystemMessage copyMessage = SystemPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
+						SystemMessage copyMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
 						copyMessage.makeSubstitution(srcFileOrFolder.getName(), targetFolder.getAbsolutePath());
 
 						IRemoteFileSubSystem localFS = srcFileOrFolder.getParentRemoteFileSubSystem();
@@ -2151,9 +2151,9 @@ public class SystemViewRemoteFileAdapter
 			IRemoteFileSubSystem ss = targetFolder.getParentRemoteFileSubSystem();
 			IRemoteFile targetFileOrFolder = ss.getRemoteFileObject(targetFolder, oldName);
 
-			//SystemPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
+			//RSEUIPlugin.logInfo("CHECKING FOR COLLISION ON '"+srcFileOrFolder.getAbsolutePath() + "' IN '" +targetFolder.getAbsolutePath()+"'");
-			//SystemPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
+			//RSEUIPlugin.logInfo("...TARGET FILE: '"+tgtFileOrFolder.getAbsolutePath()+"'");  		
-			//SystemPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
+			//RSEUIPlugin.logInfo("...target.exists()? "+tgtFileOrFolder.exists());
 			if (targetFileOrFolder.exists())
 			{
 				//monitor.setVisible(false); wish we could!
@@ -2258,7 +2258,7 @@ public class SystemViewRemoteFileAdapter
 		catch (Exception exc)
 		{
 			ok = false;
-			SystemMessageDialog.displayErrorMessage(shell, SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_FILE_FAILED).makeSubstitution(file.toString()));
+			SystemMessageDialog.displayErrorMessage(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_FILE_FAILED).makeSubstitution(file.toString()));
 		}
 		return ok;
 	}
@@ -2297,7 +2297,7 @@ public class SystemViewRemoteFileAdapter
 			catch (Exception exc)
 			{
 				ok = false;
-				SystemMessageDialog.displayErrorMessage(shell, SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_FILE_FAILED).makeSubstitution(file.toString()));
+				SystemMessageDialog.displayErrorMessage(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_FILE_FAILED).makeSubstitution(file.toString()));
 			}
 		}
 		ok = ss.deleteBatch(files, monitor);
@@ -2382,7 +2382,7 @@ public class SystemViewRemoteFileAdapter
 		boolean ok = true;
 		IRemoteFile file = (IRemoteFile) element;
 		IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem();
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		try
 		{
 			
@@ -2415,7 +2415,7 @@ public class SystemViewRemoteFileAdapter
 		catch (Exception exc)
 		{
 			ok = false;
-			SystemMessageDialog.displayErrorMessage(shell, SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_RENAME_FILE_FAILED).makeSubstitution(file.toString()));
+			SystemMessageDialog.displayErrorMessage(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_RENAME_FILE_FAILED).makeSubstitution(file.toString()));
 		}
 		return ok;
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java

@@ -25,7 +25,6 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.actions.SystemRemoteFileSearchOpenWithMenu;
@@ -37,6 +36,7 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.SystemMenuManager;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemDragDropAdapter;
@@ -107,7 +107,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
 		{
 			if (_copyOutputAction == null)
 			{
-				_copyOutputAction = new SystemCopyToClipboardAction(shell, SystemPlugin.getTheSystemRegistry().getSystemClipboard());
+				_copyOutputAction = new SystemCopyToClipboardAction(shell, RSEUIPlugin.getTheSystemRegistry().getSystemClipboard());
 			}
 			menu.add(menuGroup, _copyOutputAction);
 
@@ -460,13 +460,13 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
 		if (element instanceof IHostSearchResult)
 		{
 			ImageDescriptor imageDescriptor = null;
-			imageDescriptor = SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_RESULT_ID);
+			imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_RESULT_ID);
 
 			return imageDescriptor;
 		}
 		else
 		{ // return some default	 
-			ImageDescriptor imageDescriptor = SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_BLANK_ID);
+			ImageDescriptor imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_BLANK_ID);
 			return imageDescriptor;
 		}
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java

@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.search.IHostSearchResultSet;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResultsConte
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.SystemMenuManager;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -77,7 +77,7 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd
 	 */
 	public ImageDescriptor getImageDescriptor(Object element)
 	{ 
-		ImageDescriptor imageDescriptor= SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_RESULT_ID);
+		ImageDescriptor imageDescriptor= RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_RESULT_ID);
 		return imageDescriptor;
 	}
 
@@ -102,16 +102,16 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd
 			SystemMessage msg = null;
 				
 			if (set.isRunning()) {
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_RUNNING);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_RUNNING);
 			}
 			else if (set.isFinished()) {
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FINISHED);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FINISHED);
 			}
 			else if (set.isCancelled()) {
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERTION_STOPPED);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERTION_STOPPED);
 			}
 			else if (set.isDisconnected()) {
-				msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_DISCONNECTED);
+				msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_DISCONNECTED);
 			}
 			
 			msg.makeSubstitution(name);

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java

@@ -18,11 +18,11 @@ package org.eclipse.rse.files.ui.widgets;
 
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
@@ -109,7 +109,7 @@ public class SystemEnterOrSelectRemoteFileForm extends SystemSelectRemoteFileOrF
 			
 			if (saveasFile != null && saveasFile.exists()) {
 				
-				SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
+				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_UPLOAD_FILE_EXISTS);
 				msg.makeSubstitution(fileName);
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				ok = dlg.openQuestionNoException();

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java

@@ -18,7 +18,6 @@ package org.eclipse.rse.files.ui.widgets;
 import java.util.Hashtable;
 import java.util.ResourceBundle;
 
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.SystemPreferencesManager;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
@@ -32,6 +31,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.widgets.ISystemCombo;
 import org.eclipse.rse.ui.widgets.SystemHistoryCombo;
@@ -133,7 +133,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -145,7 +145,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {
@@ -412,11 +412,11 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
     	String connName = extractConnectionName(fileString);
     	if ((profileName == null) || (connName == null))
     	  return null;
-    	ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+    	ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
     	ISystemProfile profile = sr.getSystemProfile(profileName);
     	if (profile == null)
           return null;
-    	IHost conn = SystemPlugin.getTheSystemRegistry().getHost(profile,connName);
+    	IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName);
     	return conn;
 	}
 	
@@ -564,22 +564,22 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
     	if ((profileName == null) || (connName == null) || (dirName == null))
     	  return null;
     	  
-    	ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+    	ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
     	
     	// turn profile name into profile object...
     	ISystemProfile profile = sr.getSystemProfile(profileName);
     	if (profile == null)
     	{
-    	  msg = SystemPlugin.getPluginMessage(MSG_ERROR_PROFILE_NOTFOUND);
+    	  msg = RSEUIPlugin.getPluginMessage(MSG_ERROR_PROFILE_NOTFOUND);
     	  msg.makeSubstitution(profileName);
     	  throw new Exception(msg.getLevelOneText());
     	}
     	
 		// turn connection name into connection object...
-    	IHost conn = SystemPlugin.getTheSystemRegistry().getHost(profile,connName);
+    	IHost conn = RSEUIPlugin.getTheSystemRegistry().getHost(profile,connName);
     	if (conn == null)
     	{
-    	  msg = SystemPlugin.getPluginMessage(MSG_ERROR_CONNECTION_NOTFOUND);
+    	  msg = RSEUIPlugin.getPluginMessage(MSG_ERROR_CONNECTION_NOTFOUND);
     	  msg.makeSubstitution(connName);
     	  throw new Exception(msg.getLevelOneText());
     	}
@@ -594,7 +594,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
     	
     	if (filesubsystems.length == 0)
     	{
-    	  msg = SystemPlugin.getPluginMessage(MSG_ERROR_CONNECTION_NOTFOUND);// hmm, what else to say?
+    	  msg = RSEUIPlugin.getPluginMessage(MSG_ERROR_CONNECTION_NOTFOUND);// hmm, what else to say?
     	  msg.makeSubstitution(connName);
     	  throw new Exception(msg.getLevelOneText());
     	}
@@ -606,12 +606,12 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
     	     ss.connect(getShell()); // will throw exception if fails.
     	   } catch (InterruptedException exc)
     	   {
-    	     msg = SystemPlugin.getPluginMessage(MSG_CONNECT_CANCELLED);
+    	     msg = RSEUIPlugin.getPluginMessage(MSG_CONNECT_CANCELLED);
     	     msg.makeSubstitution(conn.getHostName());
     	     throw new Exception(msg.getLevelOneText());    	   	 
     	   } catch (Exception exc)
     	   {
-    	     msg = SystemPlugin.getPluginMessage(MSG_CONNECT_FAILED);
+    	     msg = RSEUIPlugin.getPluginMessage(MSG_CONNECT_FAILED);
     	     msg.makeSubstitution(conn.getHostName());
     	     throw new Exception(msg.getLevelOneText());    	   	 
     	   }     	   

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.widgets;
-import org.eclipse.rse.core.ISystemTypes;
+import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.ui.widgets.SystemHostCombo;
 import org.eclipse.swt.SWT;
@@ -28,10 +28,10 @@ import org.eclipse.swt.widgets.Composite;
  */
 public class SystemRemoteConnectionCombo extends SystemHostCombo {
 	
-	private static final String[] SYSTEM_TYPES = {	ISystemTypes.SYSTEMTYPE_LINUX,
+	private static final String[] SYSTEM_TYPES = {	IRSESystemType.SYSTEMTYPE_LINUX,
-													ISystemTypes.SYSTEMTYPE_LOCAL,
+													IRSESystemType.SYSTEMTYPE_LOCAL,
-													ISystemTypes.SYSTEMTYPE_UNIX,
+													IRSESystemType.SYSTEMTYPE_UNIX,
-													ISystemTypes.SYSTEMTYPE_WINDOWS };
+													IRSESystemType.SYSTEMTYPE_WINDOWS };
 
 	/**
 	 * Constructor when you want to set the style.

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java

@@ -122,7 +122,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -134,7 +134,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java

@@ -28,7 +28,6 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.SystemAdapterHelpers;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.SystemRemoteObjectMatcher;
 import org.eclipse.rse.files.ui.ISystemAddFileListener;
 import org.eclipse.rse.filters.ISystemFilter;
@@ -46,6 +45,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConf
 import org.eclipse.rse.subsystems.files.core.util.SystemRemoteFileMatcher;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
@@ -168,8 +168,8 @@ public class SystemSelectRemoteFileOrFolderForm
 		this.fileMode = fileMode;
 		callerInstanceOfWizardPage = (caller instanceof WizardPage);
 		callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog);				
-		//rb = SystemPlugin.getResourceBundle();
+		//rb = RSEUIPlugin.getResourceBundle();
-		sr = SystemPlugin.getTheSystemRegistry();
+		sr = RSEUIPlugin.getTheSystemRegistry();
 
 		// set default GUI
 		verbage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBAGE;
@@ -246,7 +246,7 @@ public class SystemSelectRemoteFileOrFolderForm
      * Restrict to certain system types
      * @param systemTypes the system types to restrict what connections are shown and what types of connections
      *  the user can create
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -286,7 +286,7 @@ public class SystemSelectRemoteFileOrFolderForm
         setSystemConnection(connection);
         setShowNewConnectionPrompt(false);
         setAutoExpandDepth(1);        
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
 		IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory();
 		RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);
@@ -331,7 +331,7 @@ public class SystemSelectRemoteFileOrFolderForm
     	  {
     	    preSelectFilter = filter;
     	    preSelectFilterChild = folderAbsolutePath;
-		    //SystemPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
+		    //RSEUIPlugin.logInfo("in setRootFolder. Given: " + folderAbsolutePath);
     	  }
         }
         
@@ -347,7 +347,7 @@ public class SystemSelectRemoteFileOrFolderForm
           filters[idx] = filter;
         
           preSelectFilter = filter;
-          //SystemPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
+          //RSEUIPlugin.logInfo("FILTER 2: " + filter.getFilterString());        
         }
         inputProvider.setFilterString(null); // undo what ctor did
         inputProvider.setQuickFilters(filters);
@@ -403,7 +403,7 @@ public class SystemSelectRemoteFileOrFolderForm
 		     setRestrictFolders(parentFolder.isRoot());
 		   setRootFolder(parentFolder);
 		   preSelectFilterChild = selection.getName();
-		   //SystemPlugin.logInfo("Setting preSelectFilterChild to '"+preSelectFilterChild+"'");
+		   //RSEUIPlugin.logInfo("Setting preSelectFilterChild to '"+preSelectFilterChild+"'");
 		}
 		else
 		{

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java

@@ -21,13 +21,13 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.SystemFileTreeAndListGroup;
 import org.eclipse.rse.files.ui.actions.SystemSelectFileTypesAction;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileRoot;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
@@ -163,7 +163,7 @@ public class SystemSelectRemoteFilesForm extends Composite
      * connections they can create.
      * @param systemTypes An array of system type names
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemTypes(String[] systemTypes)
     {
@@ -175,7 +175,7 @@ public class SystemSelectRemoteFilesForm extends Composite
      *
      * @param systemType The name of the system type to restrict to
      * 
-     * @see org.eclipse.rse.core.ISystemTypes
+     * @see org.eclipse.rse.core.IRSESystemType
      */
     public void setSystemType(String systemType)
     {
@@ -601,7 +601,7 @@ public class SystemSelectRemoteFilesForm extends Composite
 	{				
 		if (msgLine != null)
 		{
-    	  SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_OCCURRED);
+    	  SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_OCCURRED);
     	  msg.makeSubstitution(exc);
 		  msgLine.setErrorMessage(msg);
 		}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java

@@ -21,7 +21,6 @@ import java.util.Vector;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.filters.ISystemFilter;
@@ -43,6 +42,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSecurityException;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.view.ISystemTree;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
@@ -65,10 +65,10 @@ public class SystemNewFileWizard
 	public SystemNewFileWizard()
 	{
 	   	super(FileResources.RESID_NEWFILE_TITLE,
-//		      SystemPlugin.getDefault().getImageDescriptorFromIDE("wizban/newfile_wiz.gif")
+//		      RSEUIPlugin.getDefault().getImageDescriptorFromIDE("wizban/newfile_wiz.gif")
-		    //  SystemPlugin.getDefault().getImageDescriptor("wizban/newfile_wiz.gif")
+		    //  RSEUIPlugin.getDefault().getImageDescriptor("wizban/newfile_wiz.gif")
 
-			  SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILEWIZARD_ID));		      
+			  RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILEWIZARD_ID));		      
 	}
 	
 	/**
@@ -129,7 +129,7 @@ public class SystemNewFileWizard
             if (!parentFolder.exists())
             {
             	/* Be nice to do this someday...
-			    msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE);
+			    msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE);
 			    msg.makeSubstitution(parentFolder.getAbsolutePath());            	
 			    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), msg);
 			    if (msgDlg.openQuestionNoException())
@@ -139,15 +139,15 @@ public class SystemNewFileWizard
 			  	   } 
 			  	   catch (RemoteFileIOException exc)
 			  	   {
-                     SystemPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " );  	
+                     RSEUIPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " );  	
-                     msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(parentFolder.getAbsolutePath());
+                     msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(parentFolder.getAbsolutePath());
 	                 mainPage.setMessage(msg);	
 	                 return false;		  	   	 
 			  	   }
 			  	   catch (RemoteFileSecurityException exc)
 			  	   {
-                     SystemPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException " );  	
+                     RSEUIPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException " );  	
-                     msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(parentFolder.getAbsolutePath());
+                     msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(parentFolder.getAbsolutePath());
 	                 mainPage.setMessage(msg);	
 	                 return false;		  	   	 
 			  	   }
@@ -155,7 +155,7 @@ public class SystemNewFileWizard
 			    else
 			    */
 			    {
-			  	   msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
+			  	   msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
 			       msg.makeSubstitution(parentFolder.getAbsolutePath());            	
 			       mainPage.setMessage(msg);
 			       return false;
@@ -175,12 +175,12 @@ public class SystemNewFileWizard
                 newFile = rfss.createFile(newFilePath);
             } catch (RemoteFileIOException exc ) {
                SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileIOException " );  	
-               msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FILE_FAILED_EXIST)).makeSubstitution(absName);
+               msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FILE_FAILED_EXIST)).makeSubstitution(absName);
 	           mainPage.setMessage(msg);
 	           ok = false;
 //DY        } catch (Exception RemoteFileSecurityException)  {
             } catch (RemoteFileSecurityException e)  {
-               msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FILE_FAILED)).makeSubstitution(absName);
+               msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FILE_FAILED)).makeSubstitution(absName);
 	           SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileSecurityException ");  	
                //SystemMessage.displayErrorMessage(SystemMessage.getDefaultShell(), msg); 
 	           mainPage.setMessage(msg);	                                                
@@ -243,7 +243,7 @@ public class SystemNewFileWizard
 		meets = parentSubSystem.doesFilterMatch(selectedFilterRef.getReferencedFilter(),newAbsName);
 		if (!meets)
 		{
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_RESOURCE_NOTVISIBLE);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_RESOURCE_NOTVISIBLE);
 			SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), msg);
 			if (msgDlg.openQuestionNoException()) // ask user if they want to proceed
 			  meets = true; // they do, so pretend it meets the criteria
@@ -262,7 +262,7 @@ public class SystemNewFileWizard
 	protected static void updateGUI(IRemoteFile parentFolder, IRemoteFile newFileOrFolder, Viewer viewer,  
 	                                  boolean isInputAFilter, ISystemFilterReference selectedFilterRef)
 	{
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		if (selectedFilterRef != null)
 		{
 			selectedFilterRef.markStale(true);
@@ -366,7 +366,7 @@ public class SystemNewFileWizard
 			          v.add(folder);
 			        //else
 			        //{
-			        //	SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
+			        //	SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
 			        //	msg.makeSubstitution(pathName);
 			        //	lastExc = new SystemMessageException(msg);
 			        //}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizardMainPage.java

@@ -17,12 +17,12 @@
 package org.eclipse.rse.files.ui.wizards;
 
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -103,7 +103,7 @@ public class SystemNewFileWizardMainPage
 			}
 		);			
     		
-		SystemWidgetHelpers.setCompositeHelp(composite_prompts, SystemPlugin.HELPPREFIX+NEW_FILE_WIZARD);	
+		SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+NEW_FILE_WIZARD);	
 		
 		return composite_prompts;		
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFolderWizard.java

@@ -18,7 +18,6 @@ package org.eclipse.rse.files.ui.wizards;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.filters.ISystemFilterReference;
@@ -30,6 +29,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileIOException;
 import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSecurityException;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
 
@@ -51,8 +51,8 @@ public class SystemNewFolderWizard
 	public SystemNewFolderWizard()
 	{
 	   	super(FileResources.RESID_NEWFOLDER_TITLE,
-			//  SystemPlugin.getDefault().getImageDescriptorFromIDE("wizban/newfolder_wiz.gif")
+			//  RSEUIPlugin.getDefault().getImageDescriptorFromIDE("wizban/newfolder_wiz.gif")
-	 	      SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFOLDERWIZARD_ID)
+	 	      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFOLDERWIZARD_ID)
 	 	      );		      
 	}
 	
@@ -114,7 +114,7 @@ public class SystemNewFolderWizard
             if (!parentFolder.exists())
             {
             	/* Be nice to do this someday...
-			    msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE);
+			    msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE);
 			    msg.makeSubstitution(parentFolder.getAbsolutePath());            	
 			    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), msg);
 			    if (msgDlg.openQuestionNoException())
@@ -124,15 +124,15 @@ public class SystemNewFolderWizard
 			  	   } 
 			  	   catch (RemoteFileIOException exc)
 			  	   {
-                     SystemPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " );  	
+                     RSEUIPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " );  	
-                     msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(parentFolder.getAbsolutePath());
+                     msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(parentFolder.getAbsolutePath());
 	                 mainPage.setMessage(msg);	
 	                 return false;		  	   	 
 			  	   }
 			  	   catch (RemoteFileSecurityException exc)
 			  	   {
-                     SystemPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException " );  	
+                     RSEUIPlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException " );  	
-                     msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(parentFolder.getAbsolutePath());
+                     msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(parentFolder.getAbsolutePath());
 	                 mainPage.setMessage(msg);	
 	                 return false;		  	   	 
 			  	   }
@@ -140,7 +140,7 @@ public class SystemNewFolderWizard
 			    else
 			    */
 			    {
-			  	   msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
+			  	   msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTFOUND);
 			       msg.makeSubstitution(parentFolder.getAbsolutePath());            	
 			       mainPage.setMessage(msg);
 			       return false;
@@ -166,14 +166,14 @@ public class SystemNewFolderWizard
                }
                else
                {
-               	msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(absName);
+               	msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED_EXIST)).makeSubstitution(absName);
                }
 	           mainPage.setMessage(msg);
 	           ok = false;
 // DY       } catch (Exception RemoteFileSecurityException)  {
             } catch (RemoteFileSecurityException e)  {
 	           SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException ");  	
-               msg = (SystemPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(absName);
+               msg = (RSEUIPlugin.getPluginMessage(FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(absName);
                //SystemMessage.displayErrorMessage(SystemMessage.getDefaultShell(), msg); 
 	           mainPage.setMessage(msg);	                                                
 	           ok = false;
@@ -228,7 +228,7 @@ public class SystemNewFolderWizard
     	}
 		if (!meets)
 		{
-			SystemMessage msg = SystemPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_RESOURCE_NOTVISIBLE);
+			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_RESOURCE_NOTVISIBLE);
 			SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), msg);
 			if (msgDlg.openQuestionNoException()) // ask user if they want to proceed
 			  meets = true; // they do, so pretend it meets the criteria

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFolderWizardMainPage.java

@@ -17,12 +17,12 @@
 package org.eclipse.rse.files.ui.wizards;
 
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -67,7 +67,7 @@ public class SystemNewFolderWizardMainPage
 		super(wizard, "NewFolder", 
 				FileResources.RESID_NEWFOLDER_PAGE1_TITLE, 
 				FileResources.RESID_NEWFOLDER_PAGE1_DESCRIPTION);
-	//	nameValidator = new ValidatorProfileName(SystemPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector());
+	//	nameValidator = new ValidatorProfileName(RSEUIPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector());
 	    nameValidator = new ValidatorUniqueString(allnames, true);
 	    this.parentFolders = parentFolders; 
 	}
@@ -107,7 +107,7 @@ public class SystemNewFolderWizardMainPage
 			}
 		);			
     		
-		SystemWidgetHelpers.setCompositeHelp(composite_prompts, SystemPlugin.HELPPREFIX+NEW_FOLDER_WIZARD);	
+		SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+NEW_FOLDER_WIZARD);	
 		
 		return composite_prompts;		
 

rse/plugins/org.eclipse.rse.processes.ui/plugin.xml

@@ -18,11 +18,11 @@ Contributors:
 <plugin>
 
 <!-- ============================================== -->
-<!-- Define subsystem factories for processes...     -->
+<!-- Define subsystem configurations for processes...     -->
 <!-- ============================================== -->
 <!-- let's wait until this is supported on windows
       <extension
-         point="org.eclipse.rse.ui.subsystemconfiguration">
+         point="org.eclipse.rse.ui.subsystemConfiguration">
       <factory
             systemtypes="Local"
             name="%Factory.LocalProcesses"

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java

@@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.processes.ui.view.SystemProcessStatesContentProvider;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -28,6 +27,7 @@ import org.eclipse.rse.services.clientserver.processes.HostProcessFilterImpl;
 import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants;
 import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
@@ -475,7 +475,7 @@ public class SystemProcessFilterStringEditPane extends
 			  notUnique = true;
 			if (notUnique)
 			{
-			  errorMessage = SystemPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE).makeSubstitution(currFilterString);
+			  errorMessage = RSEUIPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE).makeSubstitution(currFilterString);
 			}
 			controlInError = txtExeName;
 		}

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/actions/SystemKillProcessAction.java

@@ -27,7 +27,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.model.ISystemRegistry;
@@ -43,6 +42,7 @@ import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess;
 import org.eclipse.rse.subsystems.processes.core.subsystem.RemoteProcessSubSystem;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemMessages;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
@@ -146,7 +146,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
 	 */
 	protected IRunnableContext getRunnableContext()
 	{
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		IRunnableContext irc = sr.getRunnableContext();
 		if (irc == null)
 		  irc = new ProgressMonitorDialog(getShell());
@@ -240,7 +240,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
 		
 		
 		// update the ui
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		for (int i = 0; i < results.size(); i++)
 		{
 			ISystemFilterReference ref = (ISystemFilterReference)results.get(i);
@@ -259,7 +259,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
 	 */
 	protected List getAffectedFilters(Object[] processesDeathRow, ISubSystem subSystem)
 	{
-		ISystemRegistry registry = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 		List result = new ArrayList();
 		for (int i = 0; i < processesDeathRow.length; i++)
 		{
@@ -328,7 +328,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
     	    msg = exc.getClass().getName();
     	  SystemMessageDialog msgDlg = 
     	    new SystemMessageDialog(shell, 
-    	      SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(msg));
+    	      RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(msg));
     	  msgDlg.setException(exc);
     	  msgDlg.open();
         }
@@ -353,7 +353,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
      */
     protected void showOperationCancelledMessage(Shell shell)
     {
-    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, SystemPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED));
+    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED));
     	msgDlg.open();
     }	
 

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/actions/SystemNewProcessFilterAction.java

@@ -16,11 +16,11 @@
 
 package org.eclipse.rse.processes.ui.actions;
 
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.processes.ui.SystemProcessFilterStringEditPane;
 import org.eclipse.rse.processes.ui.SystemProcessesResources;
 import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction;
 import org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard;
 import org.eclipse.swt.widgets.Shell;
@@ -36,9 +36,9 @@ public class SystemNewProcessFilterAction extends SystemNewFilterAction implemen
 
 	{
 		super(shell, parentPool, SystemProcessesResources.ACTION_NEWPROCESSFILTER_LABEL, 
-		      SystemProcessesResources.ACTION_NEWPROCESSFILTER_TOOLTIP, SystemPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTER_ID));
+		      SystemProcessesResources.ACTION_NEWPROCESSFILTER_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTER_ID));
-		setHelp(SystemPlugin.HELPPREFIX+"actn0042");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0042");
-		setDialogHelp(SystemPlugin.HELPPREFIX+"wnfr0000"); 
+		setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnfr0000"); 
 	}		
 
 	/**
@@ -64,7 +64,7 @@ public class SystemNewProcessFilterAction extends SystemNewFilterAction implemen
 	{		
 		// configuration that used to only be possible via subclasses...
 		wizard.setWizardPageTitle(SystemProcessesResources.RESID_NEWPROCESSFILTER_PAGE1_TITLE);
-	  	wizard.setWizardImage(SystemPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTERWIZARD_ID));
+	  	wizard.setWizardImage(RSEUIPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTERWIZARD_ID));
 		wizard.setPage1Description(SystemProcessesResources.RESID_NEWPROCESSFILTER_PAGE1_DESCRIPTION);
 		wizard.setFilterStringEditPane(new SystemProcessFilterStringEditPane(wizard.getShell()));
 	}

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/RemoteProcessesDialog.java

@@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.processes.ui.SystemProcessesResources;
 import org.eclipse.rse.services.clientserver.processes.IHostProcess;
 import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess;
 import org.eclipse.rse.subsystems.processes.core.subsystem.RemoteProcessSubSystem;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.view.SystemTableView;
@@ -86,7 +86,7 @@ public class RemoteProcessesDialog extends SystemPromptDialog implements KeyList
 		});
 
 		
-		SystemWidgetHelpers.setHelp(_viewer.getControl(), SystemPlugin.HELPPREFIX + "ucmd0000");
+		SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "ucmd0000");
 
 		TableLayout layout = new TableLayout();
 		_table.setLayout(layout);

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java

@@ -18,9 +18,9 @@ package org.eclipse.rse.processes.ui.dialogs;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess;
 import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.dialogs.SystemDeleteTableRow;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -58,7 +58,7 @@ public class SystemKillTableRow extends SystemDeleteTableRow
     		this.pid = "" + ((IRemoteProcess)element).getPid();
     	if (adapter != null)
     	  this.imageDescriptor = adapter.getImageDescriptor(element);
-    	else this.imageDescriptor = SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
+    	else this.imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
     }
     
     /**

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java

@@ -19,13 +19,13 @@ package org.eclipse.rse.processes.ui.propertypages;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration;
 import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.propertypages.ServicesPropertyPage;
 import org.eclipse.rse.ui.widgets.services.FactoryServiceElement;
 import org.eclipse.rse.ui.widgets.services.ServiceElement;
@@ -66,7 +66,7 @@ public class ProcessServicesPropertyPage extends ServicesPropertyPage
 	protected IProcessServiceSubSystemConfiguration[] getProcessServiceSubSystemFactories(String systemType)
 	{
 		List results = new ArrayList();
-		ISystemRegistry sr = SystemPlugin.getTheSystemRegistry();
+		ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
 		ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType);
 		
 		for (int i = 0; i < factories.length; i++)

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java

@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.core.SystemPlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.model.ISystemMessageObject;
 import org.eclipse.rse.model.ISystemResourceSet;
@@ -37,6 +36,7 @@ import org.eclipse.rse.subsystems.processes.core.subsystem.RemoteProcessSubSyste
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.SystemMenuManager;
+import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -88,7 +88,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
         
         if (copyClipboardAction == null)
 		{
-        	Clipboard clipboard = SystemPlugin.getTheSystemRegistry().getSystemClipboard();
+        	Clipboard clipboard = RSEUIPlugin.getTheSystemRegistry().getSystemClipboard();
 			copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard);
 		}
         menu.add(menuGroup, copyClipboardAction);
@@ -106,7 +106,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 	
 	public ImageDescriptor getImageDescriptor(Object element)
 	{
-		//return SystemPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
+		//return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
 		return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif");
 	}
 
@@ -175,12 +175,12 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		/*catch (InterruptedException exc)
 		{
 			children = new SystemMessageObject[1];
-			children[0] = new SystemMessageObject(SystemPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
+			children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
 		}*/
 		catch (Exception exc)
 		{
 			children = new SystemMessageObject[1];
-			children[0] = new SystemMessageObject(SystemPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
+			children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
 			SystemBasePlugin.logError("Exception resolving file filter strings", exc);
 		}
 		return children;

rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java

@@ -33,7 +33,16 @@ public class UniversalServerUtilities {
 		if (_userPreferencesDirectory == null) {
 			
 			_userPreferencesDirectory = System.getProperty("user.home");
-			String userID = System.getProperty("user.name");
+			
+			String clientUserID = System.getProperty("client.username");
+			if (clientUserID == null || clientUserID.equals(""))
+			{
+				clientUserID = "";
+			}
+			else
+			{
+				clientUserID += File.separator;
+			}
 			
  			// append a '/' if not there
   			if ( _userPreferencesDirectory.length() == 0 || 
@@ -43,13 +52,12 @@ public class UniversalServerUtilities {
 		    }
   		
   			_userPreferencesDirectory = _userPreferencesDirectory + ".eclipse" + File.separator + 
-  			         												"RSE" + File.separator + userID + File.separator;
+  			         												"RSE" + File.separator + clientUserID;
 	  		File dirFile = new File(_userPreferencesDirectory);
 	  		if (!dirFile.exists()) {
 	 	 		dirFile.mkdirs();
 	  		}
 		}
-	  	
 	  return _userPreferencesDirectory;
 	}
 

rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux

@@ -3,6 +3,7 @@
 $port = $ARGV[0];
 $timeout = $ARGV[1];
 $packaged_as = $ARGV[2];
+$clientUserID = $ARGV[3];
 
 
 $dir= $ENV{PWD};
@@ -35,7 +36,14 @@ if (!defined($timeout))
 }
 else
 {
-	system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
+	if (!defined($clientUserID))
+	{
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
+	}
+	else
+	{
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
+	}
 }
 
 $ENV{CLASSPATH}=$oldClasspath;

rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix

@@ -2,4 +2,7 @@
 # This script will start the datastore listening on an available socket
 export serverpath=.;
 export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH;
-java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
+if [ $1 ]                     
+then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
+else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
+fi

rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.zseries

@@ -8,4 +8,7 @@ export serverpath=.;
  
 export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH;
 
-java -DA_PLUGIN_PATH=$serverpath com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
+if [ $1 ]                     
+   then java -DA_PLUGIN_PATH=$serverpath -Dclient.username=$1 org.eclipse.dstore.core.server.Server 0 60000 &
+   else java -DA_PLUGIN_PATH=$serverpath org.eclipse.dstore.core.server.Server 0 60000 &
+fi 

rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemEncodingUtil.java

@@ -120,6 +120,16 @@ public class SystemEncodingUtil {
 			
 			stream.read(temp);
 			
+			stream.close();
+			
+			// UTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other 7-bit,
+			// 8-bit, or mixed-width encoding which ensures that the characters of ASCII have their
+			// normal positions, width, and values; the actual encoding declaration must be read to
+			// detect which of these applies, but since all of these encodings use the same bit patterns
+			// for the relevant ASCII characters, the encoding declaration itself may be read reliably
+			if (temp[0] == 0x3C && temp[1] == 0x3F && temp[2] == 0x78 && temp[3] == 0x6D) {
+				encodingGuess = SystemEncodingUtil.ENCODING_UTF_8;
+			}
 			
 			// UCS-4 or other encoding with a 32-bit code unit and ASCII characters encoded as
 			// ASCII values, in respectively big-endian (1234), little-endian (4321) and two
@@ -127,7 +137,7 @@ public class SystemEncodingUtil {
 			// determine which of UCS-4 or other supported 32-bit encodings applies. 
 
 			// UCS-4, big-endian order (1234 order)
-			if (temp[0] == 0x00 && temp[1] == 0x00 && temp[2] == 0x00 && temp[3] == 0x3C) {
+			else if (temp[0] == 0x00 && temp[1] == 0x00 && temp[2] == 0x00 && temp[3] == 0x3C) {
 				encodingGuess = null;
 			}
 			// UCS-4, little-endian order (4321 order)
@@ -160,16 +170,6 @@ public class SystemEncodingUtil {
 			}
 			
 			
-			// UTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other 7-bit,
-			// 8-bit, or mixed-width encoding which ensures that the characters of ASCII have their
-			// normal positions, width, and values; the actual encoding declaration must be read to
-			// detect which of these applies, but since all of these encodings use the same bit patterns
-			// for the relevant ASCII characters, the encoding declaration itself may be read reliably
-			else if (temp[0] == 0x3C && temp[1] == 0x3F && temp[2] == 0x78 && temp[3] == 0x6D) {
-				encodingGuess = SystemEncodingUtil.ENCODING_UTF_8;
-			}
-			
-			
 			// EBCDIC (in some flavor; the full encoding declaration must be read to tell which
 			// code page is in use)
 			else if (temp[0] == 0x4C && temp[1] == 0x6F && temp[2] == 0xA7 && temp[3] == 0x94) {
@@ -199,17 +199,20 @@ public class SystemEncodingUtil {
 				// with a text declaration (see 4.3.1 The Text Declaration) containing an encoding declaration. 
 				encodingGuess = SystemEncodingUtil.ENCODING_UTF_8;
 			}
-			
-			stream.close();
 		}
 		
-		// if we have a guess, we need to read in the encoding declaration to get the actula encoding
+		// if we have a guess, we need to read in the encoding declaration to get the actual encoding
 		// the guess tells us the encoding of the family
 		if (encodingGuess != null) {
 			
-			stream = new FileInputStream(filePath);
+			boolean encodingFound = false;
-			InputStreamReader reader = new InputStreamReader(stream, encodingGuess);
+			
-			BufferedReader bufReader = new BufferedReader(reader);
+			FileInputStream inputStream = new FileInputStream(filePath);
+			InputStreamReader reader = new InputStreamReader(inputStream, encodingGuess);
+			
+			// note that buffer capacity must be 1, otherwise we run into a problem
+			// if the XML file has a non UTF-8 encoding and accented characters in the file
+			BufferedReader bufReader = new BufferedReader(reader, 1);
 			
 			String line = bufReader.readLine();
 			
@@ -287,22 +290,31 @@ public class SystemEncodingUtil {
 							// if end quote found, encoding is in between begin quote and end quote
 							if (endQuote != -1) {
 								encoding = line.substring(beginQuote+1, endQuote);
+								encodingFound = true;
 							}
 							
 							break;
 						}
 						
-						line = bufReader.readLine();
-						
 						if (sameLine) {
 							sameLine = false;
 						}
+						
+						line = bufReader.readLine();
 					}
 				}
 				
+				if (encodingFound) {
+					break;
+				}
+				
 				line = bufReader.readLine();
 			}
 			
+			if (bufReader != null) {
+				bufReader.close();
+			}
+			
 			// if the encoding declaration was not found
 			if (encoding == null) {