From 14bdfc0b57278f2bc95bea02745f60317411af2b Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 17 May 2007 13:05:54 +0000
Subject: [PATCH] The upgrader determines schema and configuration customization by performing an ldif-diff of the base schema and configuration files with those in the current server.  Previously the invocation of this command just used the internal LDIFDiff class to perform this work.  Given the recent discovery of problems associated with using DirectoryServer in the same process when the filesystem bits and the jars are different version, this commit externalizes the command invocation to an external process using the currently installed jars.

---
 opends/src/quicksetup/org/opends/quicksetup/Installation.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/Installation.java b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
index 914e996..26a4ffd 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -202,6 +202,16 @@
   public static final String HISTORY_LOG_FILE_NAME = "log";
 
   /**
+   * Generic name for the backup tool.
+   */
+  public static final String BACKUP = "backup";
+
+  /**
+   * Generic name for the ldif-diff tool.
+   */
+  public static final String LDIF_DIFF = "ldif-diff";
+
+  /**
    * Performs validation on the specified file to make sure that it is
    * an actual OpenDS installation.
    * @param rootDirectory File directory candidate

--
Gitblit v1.10.0