From 4fab9c68f1e4755b7381ecf9bd86c8b30417bd8f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 06:40:30 +0000
Subject: [PATCH] The following changes are targetted to fix a certain number of issues related to the setup command line:
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 1afa23a..2e9dfed 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -29,6 +29,7 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Map;
import org.opends.admin.ads.ServerDescriptor;
@@ -63,7 +64,7 @@
private String globalAdministratorPassword;
private SecurityOptions securityOptions;
- private int serverJMXPort;
+ private int serverJMXPort = -1;
private boolean startServer;
@@ -87,6 +88,10 @@
private boolean forceOnError;
+ private String configurationFile;
+
+ private String configurationClass;
+
/**
* Creates a user data object with default values.
*/
@@ -96,8 +101,10 @@
enableWindowsService = false;
forceOnError = true;
+ LinkedList<String> baseDn = new LinkedList<String>();
+ baseDn.add("dc=example,dc=com");
NewSuffixOptions defaultNewSuffixOptions = new NewSuffixOptions(
- NewSuffixOptions.Type.CREATE_BASE_ENTRY, "dc=example,dc=com");
+ NewSuffixOptions.Type.CREATE_BASE_ENTRY, baseDn);
setNewSuffixOptions(defaultNewSuffixOptions);
// See what we can propose as port
@@ -655,4 +662,40 @@
this.remoteWithNoReplicationPort.clear();
this.remoteWithNoReplicationPort.putAll(remoteWithNoReplicationPort);
}
+
+ /**
+ * Returns the configuration file to be used.
+ * @return the configuration file to be used.
+ */
+ public String getConfigurationFile()
+ {
+ return configurationFile;
+ }
+
+ /**
+ * Sets the configuration file to be used.
+ * @param configurationFile the configuration file to be used.
+ */
+ public void setConfigurationFile(String configurationFile)
+ {
+ this.configurationFile = configurationFile;
+ }
+
+ /**
+ * Returns the configuration class to be used.
+ * @return the configuration class to be used.
+ */
+ public String getConfigurationClassName()
+ {
+ return configurationClass;
+ }
+
+ /**
+ * Sets the configuration class to be used.
+ * @param configurationClass the configuration class to be used.
+ */
+ public void setConfigurationClassName(String configurationClass)
+ {
+ this.configurationClass = configurationClass;
+ }
}
--
Gitblit v1.10.0