From 1e67e1af916b56ea9353f68803e53799b8981bb8 Mon Sep 17 00:00:00 2001 From: Nicolas Capponi <nicolas.capponi@forgerock.com> Date: Mon, 04 Apr 2016 13:38:34 +0000 Subject: [PATCH] Move AdministrationConnector class to org.opends.server.config package --- opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java | 4 ---- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java | 2 +- opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java | 3 +-- 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java index d69a3c6..263ba38 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java @@ -27,7 +27,7 @@ import org.opends.quicksetup.Constants; import org.opends.quicksetup.UserData; import org.opends.quicksetup.util.Utils; -import org.opends.server.admin.AdministrationConnector; +import org.opends.server.config.AdministrationConnector; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; import com.forgerock.opendj.cli.ArgumentException; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java index 3b91ce1..517349e 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java @@ -42,12 +42,12 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.config.server.ConfigException; import org.opends.admin.ads.util.ApplicationTrustManager; -import org.opends.server.admin.AdministrationConnector; import org.opends.server.admin.server.ServerManagementContext; import org.opends.server.admin.std.server.AdministrationConnectorCfg; import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg; import org.opends.server.admin.std.server.RootCfg; import org.opends.server.admin.std.server.TrustManagerProviderCfg; +import org.opends.server.config.AdministrationConnector; import org.opends.server.core.DirectoryServer; import com.forgerock.opendj.cli.Argument; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java similarity index 99% rename from opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java rename to opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java index be0f5eb..6db74c7 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java @@ -14,7 +14,7 @@ * Copyright 2006-2010 Sun Microsystems, Inc. * Portions Copyright 2011-2016 ForgeRock AS. */ -package org.opends.server.admin; +package org.opends.server.config; import static org.opends.messages.AdminMessages.*; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java index e022408..4ff7524 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java @@ -35,8 +35,8 @@ import org.forgerock.opendj.server.config.server.AdministrationConnectorCfg; import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg; import org.forgerock.opendj.server.config.server.RootCfg; -import org.opends.server.admin.AdministrationConnector; import org.opends.server.api.ConnectionHandler; +import org.opends.server.config.AdministrationConnector; import org.opends.server.protocols.ldap.LDAPConnectionHandler; import org.forgerock.opendj.config.server.ConfigChangeResult; import org.forgerock.opendj.ldap.DN; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java index 0417485..5e73b67 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java @@ -78,7 +78,6 @@ import org.forgerock.opendj.server.config.server.RootDSEBackendCfg; import org.forgerock.opendj.server.config.server.SynchronizationProviderCfg; import org.forgerock.util.Reject; -import org.opends.server.admin.AdministrationConnector; import org.opends.server.admin.AdministrationDataSync; import org.opends.server.admin.ClassLoaderProvider; import org.opends.server.api.AccessControlHandler; @@ -115,6 +114,7 @@ import org.opends.server.api.plugin.PluginResult; import org.opends.server.api.plugin.PluginType; import org.opends.server.backends.RootDSEBackend; +import org.opends.server.config.AdministrationConnector; import org.opends.server.config.JMXMBean; import org.opends.server.controls.PasswordPolicyErrorType; import org.opends.server.controls.PasswordPolicyResponseControl; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java index fb22d85..d09326f 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java @@ -23,7 +23,6 @@ import static com.forgerock.opendj.cli.CliMessages.INFO_ROOT_USER_PWD_FILE_PLACEHOLDER; import static com.forgerock.opendj.cli.Utils.addErrorMessageIfArgumentsConflict; import static org.opends.messages.ToolMessages.*; - import static com.forgerock.opendj.cli.ArgumentConstants.*; import static com.forgerock.opendj.util.OperatingSystem.*; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -40,7 +39,7 @@ import org.opends.quicksetup.Installation; import org.opends.quicksetup.UserData; import org.opends.quicksetup.util.Utils; -import org.opends.server.admin.AdministrationConnector; +import org.opends.server.config.AdministrationConnector; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; import com.forgerock.opendj.cli.Argument; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java index 00f6015..d37d27b 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java @@ -21,14 +21,12 @@ import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.cli.CommonArguments.*; -import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.ToolMessages.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.util.StaticUtils.*; import java.io.OutputStream; import java.io.PrintStream; -import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -41,8 +39,6 @@ import org.forgerock.opendj.ldap.DN; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.types.Entry; -import org.opends.server.config.DNConfigAttribute; -import org.opends.server.config.StringConfigAttribute; import org.opends.server.core.ConfigurationHandler; import org.opends.server.core.DirectoryServer; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java index 693efa7..53fab8e 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java @@ -45,7 +45,7 @@ import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.ldap.ByteStringBuilder; -import org.opends.server.admin.AdministrationConnector; +import org.opends.server.config.AdministrationConnector; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; import org.opends.server.loggers.JDKLogging; import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java index 939e8b0..2aee66e 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java @@ -47,7 +47,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.DecodeException; -import org.opends.server.admin.AdministrationConnector; +import org.opends.server.config.AdministrationConnector; import org.opends.server.controls.ProxiedAuthV2Control; import org.opends.server.core.DirectoryServer; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java index 5b1eb83..7e9eb30 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java @@ -34,10 +34,10 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; import org.opends.quicksetup.Constants; -import org.opends.server.admin.AdministrationConnector; import org.opends.server.admin.client.cli.SecureConnectionCliArgs; import org.opends.server.admin.client.cli.SecureConnectionCliParser; import org.opends.server.admin.client.cli.TaskScheduleArgs; +import org.opends.server.config.AdministrationConnector; import org.opends.server.core.ConfigurationHandler; import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler; import org.opends.server.tasks.PurgeConflictsHistoricalTask; -- Gitblit v1.10.0