From 86f898b050a24dac35c3a7c0e4276e25e888e09c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 21 Sep 2016 15:15:44 +0000
Subject: [PATCH] OPENDJ-2413 Add a new maven module opendj-embedded-server-examples that contains exemples for an embeddded directory server
---
opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java
index 9071b5e..708295b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/EmbeddedDirectoryServer.java
@@ -15,6 +15,7 @@
*/
package org.opends.server.util.embedded;
+import static org.opends.server.util.ServerConstants.*;
import static org.forgerock.opendj.config.client.ldap.LDAPManagementContext.newManagementContext;
import static org.forgerock.opendj.config.client.ldap.LDAPManagementContext.newLDIFManagementContext;
import static org.opends.messages.UtilityMessages.*;
@@ -36,7 +37,6 @@
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.forgerock.util.Options;
import org.forgerock.util.Pair;
-import org.forgerock.util.Reject;
import org.opends.quicksetup.TempLogFile;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
@@ -48,7 +48,6 @@
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
/**
@@ -357,6 +356,9 @@
/**
* Setups this server from the root directory.
+ * <p>
+ * As a pre-requisite, the OpenDJ archive must have been previously extracted to some
+ * directory. To perform a setup directly from an archive, see {@code setupFromArchive()}.
*
* @param parameters
* The setup parameters.
@@ -366,8 +368,15 @@
public void setup(SetupParameters parameters) throws EmbeddedDirectoryServerException
{
checkConnectionParameters();
+
+ System.setProperty(PROPERTY_SERVER_ROOT, configParams.getServerRootDirectory());
System.setProperty(QUICKSETUP_ROOT_PROPERTY, configParams.getServerRootDirectory());
- System.setProperty(QUICKSETUP_INSTANCE_PROPERTY, configParams.getServerInstanceDirectory());
+ String instanceDir = configParams.getServerInstanceDirectory() != null ?
+ configParams.getServerInstanceDirectory() :
+ configParams.getServerRootDirectory();
+ System.setProperty(QUICKSETUP_INSTANCE_PROPERTY, instanceDir);
+ System.setProperty(PROPERTY_INSTANCE_ROOT, instanceDir);
+
int returnCode = InstallDS.mainCLI(parameters.toCommandLineArguments(connectionParams), outStream, errStream,
TempLogFile.newTempLogFile(EMBEDDED_OPEN_DJ_PREFIX));
@@ -382,7 +391,7 @@
* Setups this server from the provided archive.
* <p>
* As the DJ archive includes the "opendj" directory, it is mandatory to have
- * the root directory named "opendj".
+ * the root directory named "opendj" when using this method.
*
* @param openDJZipFile
* The OpenDJ server archive.
--
Gitblit v1.10.0