From 929b2d34bd47d5320a5bc2ffeb5a66fb06ecc35f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 26 Mar 2007 18:22:27 +0000
Subject: [PATCH] Fix for issue 1432 (Uninstall fails on windows due to lock on activation.jar).
---
opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java | 109 ++----------------------------------------------------
1 files changed, 4 insertions(+), 105 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
index ccf858b..1bb7875 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
@@ -27,9 +27,9 @@
package org.opends.quicksetup.uninstaller;
-import java.io.BufferedReader;
+
import java.io.ByteArrayOutputStream;
-import java.io.FileReader;
+
import java.util.ArrayList;
import java.util.Set;
@@ -288,34 +288,7 @@
return response;
}
- /**
- * Interactively prompts (on standard output) the user to provide a string
- * value. Any non-empty string will be allowed (the empty string will
- * indicate that the default should be used).
- *
- * @param prompt The prompt to present to the user.
- * @param defaultValue The default value returned if the user clicks enter.
- *
- * @return The string value read from the user.
- */
- private String promptForString(String prompt, String defaultValue)
- {
- System.out.println();
- String response = null;
- String msg = getMsg("cli-uninstall-string-prompt",
- new String[] {prompt, defaultValue});
-
- System.out.print(msg);
- System.out.flush();
-
- response = readLine();
- if (response.equals(""))
- {
- response = defaultValue;
- }
- return response;
- }
/**
* Reads a line of text from standard input.
@@ -577,7 +550,7 @@
{
boolean cancelled = false;
- if (installStatus.isServerRunning())
+ if (CurrentInstallStatus.isServerRunning())
{
if (!silentUninstall)
{
@@ -588,7 +561,7 @@
if (!cancelled)
{
/* During all the confirmations, the server might be stopped. */
- userData.setStopServer(installStatus.isServerRunning());
+ userData.setStopServer(CurrentInstallStatus.isServerRunning());
}
}
else
@@ -636,9 +609,6 @@
private void validateArguments(UserUninstallData userData,
String[] args) throws UserUninstallDataException
{
- String directoryManagerPwd = null;
- String directoryManagerPwdFile = null;
-
ArrayList<String> errors = new ArrayList<String>();
for (int i=0; i<args.length; i++)
@@ -667,77 +637,6 @@
}
/**
- * Interactively prompts (on standard output) the user to provide a string
- * value.
- *
- * @param prompt The prompt to present to the user.
- *
- * @return The string value read from the user.
- */
- private String promptForPassword(String prompt)
- {
- char[] password = null;
- while ((password == null) || (password.length == 0))
- {
- System.out.println();
- System.out.print(prompt);
- System.out.flush();
-
- password = org.opends.server.util.PasswordReader.readPassword();
- }
-
- return new String(password);
- }
-
- /**
- * Returns the password stored in a file. Returns <CODE>null</CODE> if no
- * password is found.
- * @param path the path of the file containing the password.
- * @return the password stored in a file. Returns <CODE>null</CODE> if no
- * password is found.
- */
- private String readPwdFromFile(String path)
- {
- String pwd = null;
- BufferedReader reader = null;
- try
- {
- reader = new BufferedReader(new FileReader(path));
- pwd = reader.readLine();
- }
- catch (Exception e)
- {
- }
- finally
- {
- try
- {
- if (reader != null)
- {
- reader.close();
- }
- } catch (Exception e) {}
- }
- return pwd;
- }
-
- /**
- * Method used to know if we can connect as administrator in a server with a
- * given password and dn.
- * @param ldapUrl the ldap URL of the server.
- * @param dn the dn to be used.
- * @param pwd the password to be used.
- * @return <CODE>true</CODE> if we can connect and read the configuration and
- * <CODE>false</CODE> otherwise.
- */
- private boolean canConnectAsAdministrativeUser(String ldapUrl, String dn,
- String pwd)
- {
- return Utils.canConnectAsAdministrativeUser(ldapUrl, dn, pwd);
- }
-
-
- /**
* Ask for confirmation to stop server.
* @return <CODE>true</CODE> if the user wants to continue and stop the
* server. <CODE>false</CODE> otherwise.
--
Gitblit v1.10.0