From 2406449c5f0309525bfd5d86de417b32bcc7c1b3 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 03 Sep 2007 14:35:07 +0000
Subject: [PATCH] Fix a bug with certificates in the uninstaller and replication command lines. Improve the error messages to be displayed to the user when the uninstall fails.Fix a infinite loop that occurred when the user provided a protocol not configured in the server to access the registration information. Fix a bug that prevented the uninstall to proceed when the user specified forceOnError and an error accessing the remote servers configuration occurred. Fix a bug that occurred when the user specified to use start TLS and it was not configured in the server (this bug applies to both the uninstaller and status command-lines).

---
 opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
index f1ffbe8..99c4353 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
@@ -52,10 +52,12 @@
     new ApplicationTrustManager(null);
   private String adminUID;
   private String adminPwd;
-  private String referencedHostName;
   private String localServerUrl;
   private HashSet<ServerDescriptor> remoteServers =
     new HashSet<ServerDescriptor>();
+  private boolean useSSL;
+  private boolean useStartTLS;
+  private String replicationServer;
 
   /**
    * Sets the database directories located outside the installation which must
@@ -289,19 +291,20 @@
   }
 
   /**
-   * Returns the referenced host name provided by the user.
-   * @return the referenced host name provided by the user.
+   * Returns the replication server as referenced in other servers.
+   * @return the replication server as referenced in other servers.
    */
-  public String getReferencedHostName() {
-    return referencedHostName;
+  public String getReplicationServer() {
+    return replicationServer;
   }
 
   /**
-   * Sets the referenced host name provided by the user.
-   * @param referencedHostName the referenced host name provided by the user.
+   * Sets the replication server as referenced in other servers.
+   * @param replicationServer the replication server as referenced in other
+   * servers.
    */
-  public void setReferencedHostName(String referencedHostName) {
-    this.referencedHostName = referencedHostName;
+  public void setReplicationServer(String replicationServer) {
+    this.replicationServer = replicationServer;
   }
 
   /**
@@ -342,4 +345,44 @@
     this.remoteServers.clear();
     this.remoteServers.addAll(remoteServers);
   }
+
+  /**
+   * Whether we must use SSL to connect to the local server or not.
+   * @return <CODE>true</CODE> if we must use SSL to connect to the local server
+   * and <CODE>false</CODE> otherwise.
+   */
+  public boolean useSSL()
+  {
+    return useSSL;
+  }
+
+  /**
+   * Sets whether we must use SSL to connect to the local server or not.
+   * @param useSSL whether we must use SSL to connect to the local server or
+   * not.
+   */
+  public void setUseSSL(boolean useSSL)
+  {
+    this.useSSL = useSSL;
+  }
+
+  /**
+   * Whether we must use Start TLS to connect to the local server or not.
+   * @return <CODE>true</CODE> if we must use Start TLS to connect to the local
+   * server and <CODE>false</CODE> otherwise.
+   */
+  public boolean useStartTLS()
+  {
+    return useStartTLS;
+  }
+
+  /**
+   * Sets whether we must use Start TLS to connect to the local server or not.
+   * @param useStartTLS whether we must use Start TLS to connect to the local
+   * server or not.
+   */
+  public void setUseStartTLS(boolean useStartTLS)
+  {
+    this.useStartTLS = useStartTLS;
+  }
 }

--
Gitblit v1.10.0