From 5816e0a75fa8d2de1978dc63fc324633ef273ec4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 18 Jan 2010 22:27:40 +0000
Subject: [PATCH] Fix for issue 3901 (Setup fails when inserting a server in a replication topology with large umount of data) - Add a 'Runtime Options' step in the wizard.  By default this will contain just two labels and two buttons: Server Runtime Options: Use Default <button to change> Import Options: Use Default <button to change>

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
index efa8c20..0e48c73 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -968,8 +968,7 @@
   // should use xcalcs but it does not come in the windows default install...
   // :-(
   // This method is not called for the moment, but the code works, so that is
-  // why
-  // is kept.
+  // why is kept.
   private static int changePermissionsWindows(String path, String unixPerm)
       throws IOException, InterruptedException
   {
@@ -1315,7 +1314,7 @@
    * @param installPath The installation path
    * @return the path of the installation of the directory server.
    */
-  public static String getInstancePathFromClasspath(String installPath)
+  public static String getInstancePathFromInstallPath(String installPath)
   {
     String instancePathFileName = Installation.INSTANCE_LOCATION_PATH;
     File configureScriptPath = new File(installPath + File.separator +
@@ -2230,7 +2229,7 @@
       {
         builder.append(formatter.getSpace());
         builder.append(formatter.getFormattedProgress(Message.raw(
-            escapeValue(s))));
+            escapeCommandLineValue(s))));
       }
     }
     return builder.toString();
@@ -2247,7 +2246,7 @@
    * @param value the String to be treated.
    * @return the transformed value.
    */
-  private static String escapeValue(String value)
+  public static String escapeCommandLineValue(String value)
   {
     StringBuilder b = new StringBuilder();
     if (Utils.isUnix())

--
Gitblit v1.10.0