From d4a7fd6fa94a8f357092200e9f32926ea7f2126e Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 04 Sep 2007 14:48:13 +0000
Subject: [PATCH] Fix for issue #1830 (dsconfig: add support for secure connections) Standard secure args are now part of dsconfig CLI.

---
 opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
index 662a173..a2d1ce0 100644
--- a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
+++ b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
@@ -353,13 +353,13 @@
       new ArrayList<Argument>(createGlobalArguments(outStream));
 
     Argument[] argsToRemove = {
-      hostNameArg,
-      portArg,
-      bindDnArg,
-      bindPasswordFileArg,
-      bindPasswordArg,
-      useSSLArg,
-      useStartTLSArg
+      secureArgsList.hostNameArg,
+      secureArgsList.portArg,
+      secureArgsList.bindDnArg,
+      secureArgsList.bindPasswordFileArg,
+      secureArgsList.bindPasswordArg,
+      secureArgsList.useSSLArg,
+      secureArgsList.useStartTLSArg
     };
 
     for (int i=0; i<argsToRemove.length; i++)
@@ -518,14 +518,13 @@
     disableReplicationSubCmd = new SubCommand(this,
         DISABLE_REPLICATION_SUBCMD_NAME,
         INFO_DESCRIPTION_SUBCMD_DISABLE_REPLICATION.get());
-    bindDnArg = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
+    secureArgsList.bindDnArg = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
         OPTION_LONG_BINDDN, false, false, true, OPTION_VALUE_BINDDN,
         "cn=Directory Manager", null,
         INFO_DESCRIPTION_DISABLE_REPLICATION_BINDDN.get());
-    Argument[] argsToAdd = {
-        hostNameArg, portArg,
-        useSSLArg, useStartTLSArg, bindDnArg
-    };
+    Argument[] argsToAdd = { secureArgsList.hostNameArg,
+        secureArgsList.portArg, secureArgsList.useSSLArg,
+        secureArgsList.useStartTLSArg, secureArgsList.bindDnArg };
     for (int i=0; i<argsToAdd.length; i++)
     {
       disableReplicationSubCmd.addArgument(argsToAdd[i]);
@@ -825,7 +824,7 @@
    */
   public boolean useSSLToDisable()
   {
-    return useSSLArg.isPresent();
+    return secureArgsList.useSSLArg.isPresent();
   }
 
   /**
@@ -837,7 +836,7 @@
    */
   public boolean useStartTLSToDisable()
   {
-    return useStartTLSArg.isPresent();
+    return secureArgsList.useStartTLSArg.isPresent();
   }
 
   /**
@@ -1054,7 +1053,7 @@
    */
   public String getHostNameToDisable()
   {
-    return getValue(hostNameArg);
+    return getValue(secureArgsList.hostNameArg);
   }
 
   /**
@@ -1065,7 +1064,7 @@
    */
   public String getDefaultHostNameToDisable()
   {
-    return getDefaultValue(hostNameArg);
+    return getDefaultValue(secureArgsList.hostNameArg);
   }
 
   /**
@@ -1076,7 +1075,7 @@
    */
   public String getBindDNToDisable()
   {
-    return getValue(bindDnArg);
+    return getValue(secureArgsList.bindDnArg);
   }
 
   /**
@@ -1087,7 +1086,7 @@
    */
   public String getDefaultBindDnToDisable()
   {
-    return getDefaultValue(bindDnArg);
+    return getDefaultValue(secureArgsList.bindDnArg);
   }
 
   /**
@@ -1186,7 +1185,7 @@
    */
   public int getPortToDisable()
   {
-    return getValue(portArg);
+    return getValue(secureArgsList.portArg);
   }
 
   /**
@@ -1197,7 +1196,7 @@
    */
   public int getDefaultPortToDisable()
   {
-    return getDefaultValue(portArg);
+    return getDefaultValue(secureArgsList.portArg);
   }
 
   /**
@@ -1424,7 +1423,7 @@
     {
         {useStartTLSSourceArg, useSSLSourceArg},
         {useStartTLSDestinationArg, useSSLDestinationArg},
-        {adminUidArg, bindDnArg}
+        {adminUidArg, secureArgsList.bindDnArg}
     };
 
     for (int i=0; i< conflictingPairs.length; i++)

--
Gitblit v1.10.0