From 59b4905a66a5db370e6d0de5f7cb6dcd314ef443 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 26 Aug 2007 03:16:07 +0000
Subject: [PATCH] This commit includes all the code for the first version of the replication tools. As they require further testing the command line associated with them has not been committed.
---
opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index 7e6b4cb..d2acf17 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -157,20 +157,20 @@
protected BooleanArgument useSSLArg = null;
/**
- * The 'startTLSArg' global argument.
+ * The 'useStartTLSArg' global argument.
*/
- protected BooleanArgument startTLSArg = null;
+ protected BooleanArgument useStartTLSArg = null;
/** Short form of the option for specifying a noninteractive session. */
static public final Character INTERACTIVE_OPTION_SHORT = 'i';
- /** Long form of the option for specifying a noninteractive session. */
+ /** Long form of the option for specifying a quiet session. */
static public final String QUIET_OPTION_LONG = "quiet";
/** Long form of the option for specifying a noninteractive session. */
static public final String INTERACTIVE_OPTION_LONG = "interactive";
- /** Short form of the option for specifying a noninteractive session. */
+ /** Short form of the option for specifying a quiet session. */
static public final Character QUIET_OPTION_SHORT = 'Q';
/**
@@ -181,7 +181,7 @@
/**
* End Of Line.
*/
- protected static String EOL = System.getProperty("line.separator");
+ public static String EOL = System.getProperty("line.separator");
/**
* The Logger.
@@ -400,10 +400,10 @@
OPTION_LONG_USE_SSL, INFO_DESCRIPTION_USE_SSL.get());
set.add(useSSLArg);
- startTLSArg = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
+ useStartTLSArg = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_DESCRIPTION_START_TLS.get());
- set.add(startTLSArg);
+ set.add(useStartTLSArg);
hostNameArg = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true, OPTION_VALUE_HOST, "localhost",
@@ -584,10 +584,10 @@
// Couldn't have at the same time startTLSArg and
// useSSLArg
- if (startTLSArg.isPresent()
+ if (useStartTLSArg.isPresent()
&& useSSLArg.isPresent()) {
Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- startTLSArg
+ useStartTLSArg
.getLongIdentifier(), useSSLArg.getLongIdentifier());
errors.add(message);
}
@@ -666,7 +666,7 @@
*/
public boolean startTLS()
{
- if (startTLSArg.isPresent())
+ if (useStartTLSArg.isPresent())
{
return true;
}
--
Gitblit v1.10.0