From 1baf0e0046496da641ae7cd8e9a645dd4a81f767 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 13:33:46 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - added javadoc for arguments which share the same short ID. (TBC...) - removed from ArgumentConstants 'description' / 'memberName' (unused). - Added to ArgumentConstants the OPTION_SHORT_CONTROL && OPTION_LONG_CONTROL.

---
 opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
index cfc81ad..f1523b5 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
@@ -379,16 +379,6 @@
     public static final String OPTION_LONG_PRODUCT_VERSION = "version";
 
     /**
-     * The value for the short option description attributes.
-     */
-    public static final char OPTION_SHORT_DESCRIPTION = 'd';
-
-    /**
-     * The value for the long option description attribute.
-     */
-    public static final String OPTION_LONG_DESCRIPTION = "description";
-
-    /**
      * The value for the short option groupName attributes.
      */
     public static final char OPTION_SHORT_GROUPNAME = 'g';
@@ -409,16 +399,6 @@
     public static final String OPTION_LONG_NEWGROUPNAME = "newGroupName";
 
     /**
-     * The value for the short option member-name attributes.
-     */
-    public static final char OPTION_SHORT_MEMBERNAME = 'm';
-
-    /**
-     * The value for the long member-name version attribute.
-     */
-    public static final String OPTION_LONG_MEMBERNAME = "memberName";
-
-    /**
      * The value for the short option serverID attributes.
      */
     public static final String OPTION_SHORT_SERVERID = null;
@@ -660,6 +640,16 @@
      */
     public static final String OPTION_LONG_SERVER_ROOT = "serverRoot";
 
+    /**
+     * Value for the control option short form.
+     */
+    public static final Character OPTION_SHORT_CONTROL = 'J';
+
+    /**
+     * Value for the control option long form.
+     */
+    public static final String OPTION_LONG_CONTROL = "control";
+
     // Prevent instantiation.
     private ArgumentConstants() {
 

--
Gitblit v1.10.0