From 6be24f4c20e96aecd2144d625d831a40075b1cc8 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 15 Nov 2006 17:08:56 +0000
Subject: [PATCH] Rename the "--saslOptions" argument in many of the LDAP tools to be "--saslOption", since each occurrence only specifies a single option.

---
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java  |    2 +-
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java  |    2 +-
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java |    2 +-
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
index 35bf220..8558177 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
@@ -410,7 +410,7 @@
                                          MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
       argParser.addArgument(saslExternal);
 
-      saslOptions = new StringArgument("saslOptions", 'o', "saslOptions", false,
+      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                        true, true, "{name=value}", null, null,
                                        MSGID_DESCRIPTION_SASL_PROPERTIES);
       argParser.addArgument(saslOptions);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
index acfede2..0a8830e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -386,7 +386,7 @@
                                          MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
       argParser.addArgument(saslExternal);
 
-      saslOptions = new StringArgument("saslOptions", 'o', "saslOptions",
+      saslOptions = new StringArgument("saslOption", 'o', "saslOption",
                                        false, true, true, "{name=value}", null,
                                        null, MSGID_DESCRIPTION_SASL_PROPERTIES);
       argParser.addArgument(saslOptions);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
index d578a2d..eea5826 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -648,7 +648,7 @@
                                          MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
       argParser.addArgument(saslExternal);
 
-      saslOptions = new StringArgument("saslOptions", 'o', "saslOptions", false,
+      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                        true, true, "{name=value}", null, null,
                                        MSGID_DESCRIPTION_SASL_PROPERTIES);
       argParser.addArgument(saslOptions);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
index ae28234..a283b60 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -622,7 +622,7 @@
                                          MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
       argParser.addArgument(saslExternal);
 
-      saslOptions = new StringArgument("saslOptions", 'o', "saslOptions", false,
+      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                        true, true, "{name=value}", null, null,
                                        MSGID_DESCRIPTION_SASL_PROPERTIES);
       argParser.addArgument(saslOptions);

--
Gitblit v1.10.0