[178599] core.internal -> internal.core

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

@@ -40,12 +40,16 @@ 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;
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.client.ClientAttributes;
-import org.eclipse.dstore.core.util.Sender;
+import org.eclipse.dstore.internal.core.client.ClientCommandHandler;
-import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
+import org.eclipse.dstore.internal.core.client.ClientReceiver;
-import org.eclipse.dstore.core.util.ssl.DataStoreTrustManager;
+import org.eclipse.dstore.internal.core.client.ClientUpdateHandler;
+import org.eclipse.dstore.internal.core.server.ServerCommandHandler;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.Sender;
+import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
+import org.eclipse.dstore.internal.core.util.ssl.DataStoreTrustManager;
 import org.eclipse.dstore.internal.extra.DomainNotifier;
 
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java

@@ -27,7 +27,7 @@ import org.eclipse.dstore.core.model.DataStoreResources;
 import org.eclipse.dstore.core.model.DataStoreSchema;
 import org.eclipse.dstore.core.model.Handler;
 import org.eclipse.dstore.core.model.ISchemaExtender;
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
 
 /**
  * Miner is the abstact base class of all DataStore extensions).  

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

@@ -19,7 +19,7 @@ package org.eclipse.dstore.core.model;
 import java.util.ArrayList;
 
 import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.util.CommandGenerator;
+import org.eclipse.dstore.internal.core.util.CommandGenerator;
 
 /**
  * <p>

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

@@ -19,9 +19,9 @@ package org.eclipse.dstore.core.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.dstore.core.util.DataElementRemover;
 import org.eclipse.dstore.core.util.StringCompare;
 import org.eclipse.dstore.extra.IDataElement;
+import org.eclipse.dstore.internal.core.util.DataElementRemover;
 import org.eclipse.dstore.internal.extra.DataElementActionFilter;
 import org.eclipse.dstore.internal.extra.DesktopElement;
 import org.eclipse.dstore.internal.extra.PropertySource;

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

@@ -43,11 +43,12 @@ import org.eclipse.dstore.core.java.ClassByteStreamHandlerRegistry;
 import org.eclipse.dstore.core.java.IClassByteStreamHandler;
 import org.eclipse.dstore.core.java.IRemoteClassInstance;
 import org.eclipse.dstore.core.java.RemoteClassLoader;
-import org.eclipse.dstore.core.util.DataElementRemover;
-import org.eclipse.dstore.core.util.ExternalLoader;
 import org.eclipse.dstore.core.util.StringCompare;
-import org.eclipse.dstore.core.util.XMLgenerator;
+import org.eclipse.dstore.internal.core.model.DefaultByteConverter;
-import org.eclipse.dstore.core.util.XMLparser;
+import org.eclipse.dstore.internal.core.util.DataElementRemover;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.XMLgenerator;
+import org.eclipse.dstore.internal.core.util.XMLparser;
 import org.eclipse.dstore.internal.extra.DomainNotifier;
 
 /**
@@ -498,7 +499,7 @@ public final class DataStore
 		{
 			return true;
 		}
-		else if (_commandHandler instanceof org.eclipse.dstore.core.client.ClientCommandHandler)
+		else if (_commandHandler instanceof org.eclipse.dstore.internal.core.client.ClientCommandHandler)
 		{
 			return true;
 		}

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

@@ -17,7 +17,7 @@
 package org.eclipse.dstore.core.model;
 
 
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
 
 /**
  * ISchemaExtender describes the interfaces that tool extensions

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

@@ -1,25 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines 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 ISchemaProvider
-{
-
-
-    public ISchemaRegistry getSchemaRegistry();
-    public ISchemaExtender getSchemaExtender();    
-}

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

@@ -16,7 +16,7 @@
 
 package org.eclipse.dstore.core.model;
 
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
 
 /**
  * ISchemaRegistry describes the interface that needs to be 

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

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.util.DataElementRemover;
+import org.eclipse.dstore.internal.core.util.DataElementRemover;
 
 /**
  * <p>

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

@@ -18,6 +18,9 @@ package org.eclipse.dstore.core.server;
 
 import java.util.StringTokenizer;
 
+import org.eclipse.dstore.internal.core.server.ConnectionEstablisher;
+import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
+
 /**
  * Server is the standard way of instantiating and controlling a remote DataStore.
  * The server runs a ConnectionEstablisher which manages client connections to

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

@@ -39,7 +39,9 @@ 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;
+import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
+import org.eclipse.dstore.internal.core.server.ServerSSLProperties;
+import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
 
 /**
  * This class is the DataStore daemon. It is used for authenticating users,

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.client;
+package org.eclipse.dstore.internal.core.client;
 
 import java.io.File;
 import java.net.InetAddress;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.client;
+package org.eclipse.dstore.internal.core.client;
 
 import org.eclipse.dstore.core.java.IRemoteClassInstance;
 import org.eclipse.dstore.core.model.CommandHandler;
@@ -22,7 +22,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.DataStoreResources;
-import org.eclipse.dstore.core.util.Sender;
+import org.eclipse.dstore.internal.core.util.Sender;
 
 
 /**

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java

@@ -14,14 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.client;
+package org.eclipse.dstore.internal.core.client;
 
 import java.net.Socket;
 
 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.util.Receiver;
+import org.eclipse.dstore.internal.core.util.Receiver;
 
 /*
  * The ClientReciever is responsible for recieving data from

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.client;
+package org.eclipse.dstore.internal.core.client;
 
 import org.eclipse.dstore.core.model.ISSLProperties;
 public class ClientSSLProperties implements ISSLProperties

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.client;
+package org.eclipse.dstore.internal.core.client;
 
 import java.io.File;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java

@@ -14,11 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.model;
+package org.eclipse.dstore.internal.core.model;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 
+import org.eclipse.dstore.core.model.DE;
+import org.eclipse.dstore.core.model.IByteConverter;
+
 /**
  * @author dmcknigh
  *

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java

@@ -14,11 +14,15 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.model;
+package org.eclipse.dstore.internal.core.model;
 
 import java.util.ArrayList;
 
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.core.model.DataElement;
+import org.eclipse.dstore.core.model.DataStore;
+import org.eclipse.dstore.core.model.ISchemaExtender;
+import org.eclipse.dstore.core.model.ISchemaRegistry;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
 
 /**
  * SchemaRegistry implements the interface for external tools to contribute their

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ConnectionEstablisher.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -36,9 +36,9 @@ 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.ISSLProperties;
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
-import org.eclipse.dstore.core.util.Sender;
+import org.eclipse.dstore.internal.core.util.Sender;
-import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
+import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
 
 /**
  * ConnectionEstablisher is responsible for managing the server DataStore and 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -30,7 +30,7 @@ import org.eclipse.dstore.core.model.DataStore;
 import org.eclipse.dstore.core.model.DataStoreAttributes;
 import org.eclipse.dstore.core.model.ISchemaExtender;
 import org.eclipse.dstore.core.model.ISchemaRegistry;
-import org.eclipse.dstore.core.util.ExternalLoader;
+import org.eclipse.dstore.internal.core.util.ExternalLoader;
 
 /**
  * MinerLoader is an implementation of <code>ISchemaRegistry</code> used for

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.io.File;
 import java.net.InetAddress;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.io.File;
 import java.util.ArrayList;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReceiver.java

@@ -14,12 +14,12 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.net.Socket;
 
 import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.util.Receiver;
+import org.eclipse.dstore.internal.core.util.Receiver;
 
 /**
  * The ServerReciever is responsible for recieving data from

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 /**
  * This class contains a list of server return codes that are used

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.util.ResourceBundle;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.server;
+package org.eclipse.dstore.internal.core.server;
 
 import java.net.Socket;
 import java.util.ArrayList;
@@ -25,8 +25,8 @@ import org.eclipse.dstore.core.model.DataElement;
 import org.eclipse.dstore.core.model.DataStore;
 import org.eclipse.dstore.core.model.DataStoreResources;
 import org.eclipse.dstore.core.model.UpdateHandler;
-import org.eclipse.dstore.core.util.CommandGenerator;
+import org.eclipse.dstore.internal.core.util.CommandGenerator;
-import org.eclipse.dstore.core.util.Sender;
+import org.eclipse.dstore.internal.core.util.Sender;
 
 /**
  * The ServerUpdateHandler is contains a queue of data update requests

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/CommandGenerator.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.util.ArrayList;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.util.LinkedList;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java

@@ -14,11 +14,12 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.util.ArrayList;
 
 import org.eclipse.dstore.core.java.RemoteClassLoader;
+import org.eclipse.dstore.core.util.StringCompare;
 
 
 /**

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import org.eclipse.dstore.core.model.DataElement;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.util.ArrayList;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.util.ArrayList;
 

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.io.BufferedWriter;
 import java.io.IOException;

rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util;
+package org.eclipse.dstore.internal.core.util;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

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

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util.ssl;
+package org.eclipse.dstore.internal.core.util.ssl;
 
 import java.security.KeyStore;
 
@@ -22,6 +22,8 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
+import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
+
 
 public class DStoreSSLContext
 {

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

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.core.util.ssl;
+package org.eclipse.dstore.internal.core.util.ssl;
 
 import java.security.KeyStore;
 import java.security.cert.CertificateException;
@@ -25,6 +25,8 @@ import java.util.List;
 
 import javax.net.ssl.X509TrustManager;
 
+import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
+
 
 public class DataStoreTrustManager implements X509TrustManager
 {

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

@@ -28,7 +28,6 @@ import javax.net.ssl.SSLHandshakeException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.dstore.core.client.ClientConnection;
-import org.eclipse.dstore.core.client.ClientSSLProperties;
 import org.eclipse.dstore.core.client.ConnectionStatus;
 import org.eclipse.dstore.core.java.IRemoteClassInstance;
 import org.eclipse.dstore.core.java.RemoteClassLoader;
@@ -38,6 +37,7 @@ 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.internal.core.client.ClientSSLProperties;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.connectorservice.dstore.util.ConnectionStatusListener;