From fe962db1ca6c350a03cdff4ac6e0450909e0b56f Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 10 Nov 2006 06:07:28 +0000
Subject: [PATCH] Update many of the command-line utilities so that the --configClass and --configFile arguments are marked hidden since those options will be provided by the shell script or batch file used to launch the tool.
---
opends/src/server/org/opends/server/tools/InstallDS.java | 2 ++
opends/src/server/org/opends/server/tools/LDIFDiff.java | 2 ++
opends/src/server/org/opends/server/tools/LDIFSearch.java | 2 ++
opends/src/server/org/opends/server/tools/RestoreDB.java | 2 ++
opends/src/server/org/opends/server/tools/BackUpDB.java | 2 ++
opends/src/server/org/opends/server/tools/ImportLDIF.java | 2 ++
opends/src/server/org/opends/server/core/DirectoryServer.java | 5 +++--
opends/src/server/org/opends/server/tools/LDIFModify.java | 2 ++
opends/src/server/org/opends/server/tools/VerifyIndex.java | 2 ++
opends/src/server/org/opends/server/tools/ExportLDIF.java | 2 ++
opends/src/server/org/opends/server/tools/EncodePassword.java | 2 ++
opends/src/server/org/opends/server/tools/ConfigureDS.java | 2 ++
opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java | 2 ++
13 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index caf5bb0..9ea387d 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -7478,6 +7478,7 @@
true, false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_DSCORE_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -7485,6 +7486,7 @@
true, false, true, "{configFile}", null,
null,
MSGID_DSCORE_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
@@ -7511,9 +7513,8 @@
argParser.addArgument(dumpMessages);
- noDetach = new BooleanArgument("nodetach", 'N', "noDetach",
+ noDetach = new BooleanArgument("nodetach", 'N', "nodetach",
MSGID_DSCORE_DESCRIPTION_NODETACH);
- noDetach.setHidden(true);
argParser.addArgument(noDetach);
diff --git a/opends/src/server/org/opends/server/tools/BackUpDB.java b/opends/src/server/org/opends/server/tools/BackUpDB.java
index 8304ed0..6120189 100644
--- a/opends/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opends/src/server/org/opends/server/tools/BackUpDB.java
@@ -134,6 +134,7 @@
true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_BACKUPDB_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -141,6 +142,7 @@
new StringArgument("configfile", 'f', "configFile", true, false,
true, "{configFile}", null, null,
MSGID_BACKUPDB_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/ConfigureDS.java b/opends/src/server/org/opends/server/tools/ConfigureDS.java
index 8ec5e5d..d646e70 100644
--- a/opends/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opends/src/server/org/opends/server/tools/ConfigureDS.java
@@ -153,12 +153,14 @@
configFile = new StringArgument("configfile", 'c', "configFile", true,
false, true, "{configFile}", null, null,
MSGID_CONFIGDS_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
configClass = new StringArgument("configclass", 'C', "configClass", false,
false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_CONFIGDS_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
ldapPort = new IntegerArgument("ldapport", 'p', "ldapPort", false, false,
diff --git a/opends/src/server/org/opends/server/tools/EncodePassword.java b/opends/src/server/org/opends/server/tools/EncodePassword.java
index 7a864c6..35bd9ec 100644
--- a/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -131,6 +131,7 @@
true, false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_ENCPW_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -138,6 +139,7 @@
true, false, true, "{configFile}", null,
null,
MSGID_ENCPW_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/ExportLDIF.java b/opends/src/server/org/opends/server/tools/ExportLDIF.java
index 2dbc3fc..10e83d6 100644
--- a/opends/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ExportLDIF.java
@@ -133,6 +133,7 @@
true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_LDIFEXPORT_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -140,6 +141,7 @@
new StringArgument("configfile", 'f', "configFile", true, false,
true, "{configFile}", null, null,
MSGID_LDIFEXPORT_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opends/src/server/org/opends/server/tools/ImportLDIF.java
index a40cfb1..9782fa3 100644
--- a/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -149,6 +149,7 @@
true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_LDIFIMPORT_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -156,6 +157,7 @@
new StringArgument("configfile", 'f', "configFile", true, false,
true, "{configFile}", null, null,
MSGID_LDIFIMPORT_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 742179c..5a86eab 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -186,12 +186,14 @@
configFile = new StringArgument("configfile", 'c', "configFile", false,
false, true, "{configFile}", null, null,
MSGID_INSTALLDS_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
configClass = new StringArgument("configclass", 'C', "configClass", false,
false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_INSTALLDS_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
silentInstall = new BooleanArgument("silent", 's', "silentInstall",
diff --git a/opends/src/server/org/opends/server/tools/LDIFDiff.java b/opends/src/server/org/opends/server/tools/LDIFDiff.java
index 4739c33..838b048 100644
--- a/opends/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opends/src/server/org/opends/server/tools/LDIFDiff.java
@@ -160,12 +160,14 @@
configFile = new StringArgument("configfile", 'c', "configFile", false,
false, true, "{configFile}", null, null,
MSGID_LDIFDIFF_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
configClass = new StringArgument("configclass", 'C', "configClass", false,
false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_LDIFDIFF_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
showUsage = new BooleanArgument("showusage", 'H', "help",
diff --git a/opends/src/server/org/opends/server/tools/LDIFModify.java b/opends/src/server/org/opends/server/tools/LDIFModify.java
index 8f51f98..1539f0c 100644
--- a/opends/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opends/src/server/org/opends/server/tools/LDIFModify.java
@@ -429,6 +429,7 @@
configFile = new StringArgument("configfile", 'c', "configFile", true,
false, true, "{configFile}", null, null,
MSGID_LDIFMODIFY_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
@@ -436,6 +437,7 @@
false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_LDIFMODIFY_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
diff --git a/opends/src/server/org/opends/server/tools/LDIFSearch.java b/opends/src/server/org/opends/server/tools/LDIFSearch.java
index ff60b5e..f5efca8 100644
--- a/opends/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDIFSearch.java
@@ -181,12 +181,14 @@
configFile = new StringArgument("configfile", 'c', "configFile", false,
false, true, "{configFile}", null, null,
MSGID_LDIFSEARCH_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
configClass = new StringArgument("configclass", 'C', "configClass", false,
false, true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_LDIFSEARCH_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
filterFile = new FileBasedArgument("filterfile", 'f', "filterFile", false,
diff --git a/opends/src/server/org/opends/server/tools/RestoreDB.java b/opends/src/server/org/opends/server/tools/RestoreDB.java
index bd55839..fa56369 100644
--- a/opends/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opends/src/server/org/opends/server/tools/RestoreDB.java
@@ -125,6 +125,7 @@
true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_RESTOREDB_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -132,6 +133,7 @@
new StringArgument("configfile", 'f', "configFile", true, false,
true, "{configFile}", null, null,
MSGID_RESTOREDB_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/VerifyIndex.java b/opends/src/server/org/opends/server/tools/VerifyIndex.java
index 1302c2a..1a07704 100644
--- a/opends/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opends/src/server/org/opends/server/tools/VerifyIndex.java
@@ -100,6 +100,7 @@
true, "{configClass}",
ConfigFileHandler.class.getName(), null,
MSGID_VERIFYINDEX_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
@@ -107,6 +108,7 @@
new StringArgument("configfile", 'f', "configFile", true, false,
true, "{configFile}", null, null,
MSGID_VERIFYINDEX_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
diff --git a/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java b/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
index e31cc08..3d57c01 100644
--- a/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
+++ b/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
@@ -136,12 +136,14 @@
configFile = new StringArgument("configfile", 'c', "configFile", true,
false, true, "{configFile}", null, null,
MSGID_MAKELDIF_DESCRIPTION_CONFIG_FILE);
+ configFile.setHidden(true);
argParser.addArgument(configFile);
configClass = new StringArgument("configclass", 'C', "configClass", false,
false, true, "{configClass}", null, null,
MSGID_MAKELDIF_DESCRIPTION_CONFIG_CLASS);
+ configClass.setHidden(true);
argParser.addArgument(configClass);
--
Gitblit v1.10.0