diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java index 31f589c8597..0120c1d29c6 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java +++ b/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.core.util.Sender; -import org.eclipse.dstore.core.util.ssl.DStoreSSLContext; -import org.eclipse.dstore.core.util.ssl.DataStoreTrustManager; +import org.eclipse.dstore.internal.core.client.ClientAttributes; +import org.eclipse.dstore.internal.core.client.ClientCommandHandler; +import org.eclipse.dstore.internal.core.client.ClientReceiver; +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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java index d9020a8f224..83b94593036 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/miner/Miner.java +++ b/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). diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java index 77ecd562019..493f3875c8b 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java +++ b/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; /** *

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java index e302aba1cef..7cb5099ef50 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java index f7e89899e30..d880c09b675 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java +++ b/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.core.util.XMLparser; +import org.eclipse.dstore.internal.core.model.DefaultByteConverter; +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; } diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java index c20f9717d00..8187f489b1b 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java deleted file mode 100644 index 47ca0e001f0..00000000000 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaProvider.java +++ /dev/null @@ -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(); -} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java index 27188290f7f..9aa8897cea9 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java index 72a5cf9c6a9..04595e246b0 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java +++ b/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; /** *

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java index a522f62face..3d658bb304d 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java index 0011900c781..4af27d95e1d 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java +++ b/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, diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java similarity index 97% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientAttributes.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java index 41992fd6b3e..5a22eb5cbfe 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientAttributes.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java index 9b0a627d255..31279e50a18 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientCommandHandler.java +++ b/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; /** diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java similarity index 95% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java index e1b86b9bbcd..198b7cc80a2 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientReceiver.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java index 193a563fa09..9a864eb3425 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientSSLProperties.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java index 42d6343365f..f470b396cc3 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientUpdateHandler.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java similarity index 94% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultByteConverter.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java index c2e41b3fa87..366883add71 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultByteConverter.java +++ b/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 * diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java similarity index 89% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java index 3ec32b76aec..700f295f7fe 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/SchemaRegistry.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ConnectionEstablisher.java similarity index 97% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ConnectionEstablisher.java index 1d2e3d4aa2f..4c2d1996ec7 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java +++ b/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.core.util.Sender; -import org.eclipse.dstore.core.util.ssl.DStoreSSLContext; +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; /** * ConnectionEstablisher is responsible for managing the server DataStore and diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java index 92650b3bcd6..81691532e7c 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/MinerLoader.java +++ b/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 ISchemaRegistry used for diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java similarity index 97% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java index 301aa9f273c..c4ddd96a293 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerAttributes.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java index bfa5d10cbe5..51550a3ffdb 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReceiver.java similarity index 95% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReceiver.java index 9cd802c1a3d..58cb3195848 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java similarity index 97% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java index 7469358360f..8523ab9d515 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReturnCodes.java +++ b/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 diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java index 29bf607b1f6..6740461c86e 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java index 9d563ce77f1..70443ce98ee 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerUpdateHandler.java +++ b/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.core.util.Sender; +import org.eclipse.dstore.internal.core.util.CommandGenerator; +import org.eclipse.dstore.internal.core.util.Sender; /** * The ServerUpdateHandler is contains a queue of data update requests diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/CommandGenerator.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/CommandGenerator.java index 9d29f351194..f911f09da67 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java index 23d0e65678b..d265217ca1b 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/DataElementRemover.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java similarity index 96% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java index dbeeaafb143..c0d308e8e64 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ExternalLoader.java +++ b/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; /** diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java similarity index 95% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java index e5c4c4bfb2b..ce0ae5cf111 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ISender.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java index d963f0e351f..c927e747374 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Pattern.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java similarity index 98% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java index 0acf47b5a27..f2992bc231d 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java index 3229c9114c0..0d52af94aed 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sender.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java similarity index 97% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java index d8bc24338c7..1856e896562 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Sorter.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLgenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLgenerator.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java index 6e240c99063..aaf5fcfe6d3 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLgenerator.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java similarity index 99% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java index 72cfb7d7ee5..607b5699188 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/XMLparser.java +++ b/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; diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreSSLContext.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java similarity index 95% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreSSLContext.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java index f4f39ca732c..eec5bebe549 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreSSLContext.java +++ b/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 { diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java similarity index 96% rename from rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java rename to rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java index 7d15105a7d5..36561db635c 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DataStoreTrustManager.java +++ b/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 { diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index d2817ec5b08..b0b2f8b2c77 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -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;