OPENDJ-2413 Move org.opends.server.util.embedded package to org.forgerock.s...

Nicolas Capponi

16.45.2016 f9799b79f057ea49ce3e46beefe07f253dae8c79

 opendj-embedded-server-examples/src/main/java/org/forgerock/opendj/examples/ConfigureServer.java

@@ -16,30 +16,20 @@

package org.forgerock.opendj.examples;

import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.ConnectionParameters.connectionParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static java.util.Arrays.asList;
import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.util.embedded.ConnectionParameters.connectionParams;
import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;

import java.io.File;
import java.io.IOException;
import java.util.ConcurrentModificationException;
import java.util.SortedSet;

import org.forgerock.opendj.config.AdminException;
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.config.ManagedObjectAlreadyExistsException;
import org.forgerock.opendj.config.ManagedObjectNotFoundException;
import org.forgerock.opendj.config.client.ManagedObjectDecodingException;
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.config.client.MissingMandatoryPropertiesException;
import org.forgerock.opendj.config.client.OperationRejectedException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.opends.server.util.embedded.EmbeddedDirectoryServerException;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServerException;

/**
 * Provides an example of read and update of the configuration of a server that
@@ -57,15 +47,6 @@
     *
     * @param args
     *            The command line arguments: serverRootDir newBaseDn [ldapPort]
     * @throws EmbeddedDirectoryServerException
     *          If an error occurs
     * @throws org.forgerock.opendj.config.client.ConcurrentModificationException
     * @throws ManagedObjectNotFoundException
     * @throws ManagedObjectDecodingException
     * @throws DefinitionDecodingException
     * @throws OperationRejectedException
     * @throws MissingMandatoryPropertiesException
     * @throws ManagedObjectAlreadyExistsException
     */
    public static void main(final String[] args) {
        if (args.length != 2 && args.length != 3) {

 opendj-embedded-server-examples/src/main/java/org/forgerock/opendj/examples/SetupServer.java

@@ -16,15 +16,15 @@

package org.forgerock.opendj.examples;

import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.util.embedded.ConnectionParameters.connectionParams;
import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.opends.server.util.embedded.SetupParameters.setupParams;
import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.ConnectionParameters.connectionParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.forgerock.opendj.server.embedded.SetupParameters.setupParams;

import java.io.File;

import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.opends.server.util.embedded.EmbeddedDirectoryServerException;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServerException;

/**
 * Setup a server from a OpenDJ archive using the EmbeddedDirectoryServer class.

 opendj-embedded-server-examples/src/main/java/org/forgerock/opendj/examples/StartStopServer.java

@@ -16,14 +16,14 @@

package org.forgerock.opendj.examples;

import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServerForStartStop;
import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServerForStartStop;

import java.nio.file.Paths;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.opends.server.util.embedded.EmbeddedDirectoryServerException;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServerException;

/**
 * Start and stop a server that is already installed.

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConfigParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ConfigParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

/** Parameters to configure a directory server. */
public final class ConfigParameters

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ConnectionParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

/** Parameters to establish connections to a directory server. */
public final class ConnectionParameters

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

import static org.opends.messages.UtilityMessages.ERR_EMBEDDED_SERVER_LDIF_MANAGEMENT_CONTEXT;
import static org.opends.server.util.ServerConstants.*;

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServerException.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServerException.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.OpenDsException;

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ImportParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

/** Parameters to import LDIF data to a directory server. */
public final class ImportParameters

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/RebuildIndexParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/RebuildIndexParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

/** Parameters to rebuild the indexes of a directory server. */
public final class RebuildIndexParameters

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ReplicationParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

/** Parameters for replication operations on a directory server. */
public final class ReplicationParameters

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/SetupParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

import java.util.ArrayList;
import java.util.Arrays;

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/UpgradeParameters.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/UpgradeParameters.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

import java.util.ArrayList;
import java.util.List;

 opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/package-info.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/util/embedded/package-info.java
@@ -14,4 +14,4 @@
 * Copyright 2016 ForgeRock AS.
 */
/** Provides support for an embedded directory server. */
package org.opends.server.util.embedded;
package org.forgerock.opendj.server.embedded;

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java

@@ -16,21 +16,22 @@
 */
package org.opends.server.tools.dsreplication;

import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServerForStartStop;
import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServerForStartStop;

import static org.opends.messages.AdminToolMessages.*;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.TimeThread;
import org.opends.server.util.cli.PointAdder;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;

import com.forgerock.opendj.cli.ConsoleApplication;


 opendj-server-legacy/src/test/java/org/forgerock/server/embedded/EmbeddedDirectoryServerTestCase.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedDirectoryServerTestCase.java
@@ -13,15 +13,15 @@
 *
 * Copyright 2016 ForgeRock AS.
 */
package org.opends.server.util;
package org.forgerock.server.embedded;

import static org.opends.server.util.embedded.SetupParameters.setupParams;
import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.util.embedded.ConnectionParameters.connectionParams;
import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.opends.server.util.embedded.ImportParameters.importParams;
import static org.opends.server.util.embedded.UpgradeParameters.upgradeParams;
import static org.opends.server.util.embedded.RebuildIndexParameters.rebuildIndexParams;
import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.ConnectionParameters.connectionParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.forgerock.opendj.server.embedded.ImportParameters.importParams;
import static org.forgerock.opendj.server.embedded.RebuildIndexParameters.rebuildIndexParams;
import static org.forgerock.opendj.server.embedded.SetupParameters.setupParams;
import static org.forgerock.opendj.server.embedded.UpgradeParameters.upgradeParams;
import static org.assertj.core.api.Assertions.assertThat;
import static org.opends.server.TestCaseUtils.getServer;
import static org.testng.Assert.*;
@@ -33,11 +33,13 @@
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServerException;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.opends.server.util.embedded.EmbeddedDirectoryServerException;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.UtilTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

 opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java

@@ -17,9 +17,10 @@
 */
package org.opends.server;

import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.opends.server.util.embedded.ConnectionParameters.connectionParams;
import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.ConfigParameters.configParams;
import static org.forgerock.opendj.server.embedded.ConnectionParameters.connectionParams;
import static org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;

import static org.opends.server.loggers.TextAccessLogPublisher.getStartupTextAccessPublisher;
import static org.opends.server.loggers.TextErrorLogPublisher.getToolStartupTextErrorPublisher;
import static org.opends.server.loggers.TextHTTPAccessLogPublisher.getStartupTextHTTPAccessPublisher;
@@ -105,10 +106,10 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.LDIFImportConfig;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.server.embedded.EmbeddedDirectoryServer;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.testng.Assert;

import com.forgerock.opendj.util.OperatingSystem;