From 882a2fdd7a2eec0d9175069fb0dec13e13db4d05 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 20 Nov 2009 18:49:24 +0000
Subject: [PATCH] Fix for issue 3442 (Add options -w password and -D rootDN to control-panel) Know the user can specify the password, bind DN, host name, port and to accept all the certificates automatically from the command-line when launching the control-panel.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 39 +++++----------------------------------
1 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 1c741b1..75d81b3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -29,7 +29,6 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import java.io.File;
import java.io.PrintStream;
@@ -42,14 +41,10 @@
import org.opends.guitools.controlpanel.util.ControlPanelLog;
import org.opends.messages.AdminToolMessages;
import org.opends.messages.Message;
-import org.opends.quicksetup.Installation;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.DynamicConstants;
-import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.ArgumentParser;
-import org.opends.server.util.args.BooleanArgument;
/**
* The class that is invoked directly by the control-panel command-line. This
@@ -60,7 +55,7 @@
*/
public class ControlPanelLauncher
{
- static private ArgumentParser argParser;
+ static private ControlPanelArgumentParser argParser;
/** Prefix for log files. */
static public final String LOG_FILE_PREFIX = "opends-control-panel-";
@@ -85,36 +80,12 @@
t.printStackTrace();
}
- argParser = new ArgumentParser(ControlPanelLauncher.class.getName(),
- INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION.get(), false);
- BooleanArgument showUsage;
- String scriptName;
- if (Utils.isWindows()) {
- scriptName = Installation.WINDOWS_CONTROLPANEL_FILE_NAME;
- } else {
- scriptName = Installation.UNIX_CONTROLPANEL_FILE_NAME;
- }
- if (System.getProperty(ServerConstants.PROPERTY_SCRIPT_NAME) == null)
- {
- System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
- }
+ argParser = new ControlPanelArgumentParser(
+ ControlPanelLauncher.class.getName());
+ // Validate user provided data
try
{
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
- argParser.addArgument(showUsage);
- argParser.setUsageArgument(showUsage);
- }
- catch (Throwable t)
- {
- System.err.println("ERROR: "+t);
- t.printStackTrace();
- }
-
-// Validate user provided data
- try
- {
+ argParser.initializeArguments();
argParser.parseArguments(args);
}
catch (ArgumentException ae)
--
Gitblit v1.10.0