From 7801a7d30b468f91444f2cbaec6c2a752f093b9a Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 14 Jun 2007 20:00:21 +0000
Subject: [PATCH] installation tests
---
opends/src/quicksetup/org/opends/quicksetup/Installation.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Installation.java b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
index c49c92d..8762705 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -213,6 +213,17 @@
public static final String LDIF_DIFF = "ldif-diff";
/**
+ * Directories required to be present for this installation
+ * to be considered valid.
+ */
+ public static final String[] REQUIRED_DIRECTORIES =
+ new String[] {
+ CONFIG_PATH_RELATIVE,
+ DATABASES_PATH_RELATIVE,
+ LIBRARIES_PATH_RELATIVE
+ };
+
+ /**
* Performs validation on the specified file to make sure that it is
* an actual OpenDS installation.
* @param rootDirectory File directory candidate
@@ -236,13 +247,7 @@
String[] children = rootDirectory.list();
if (children != null) {
Set<String> childrenSet = new HashSet<String>(Arrays.asList(children));
- String[] dirsToCheck = new String[] {
- CONFIG_PATH_RELATIVE,
- DATABASES_PATH_RELATIVE,
- LIBRARIES_PATH_RELATIVE,
- // perhaps we should check more
- };
- for (String dir : dirsToCheck) {
+ for (String dir : REQUIRED_DIRECTORIES) {
if (!childrenSet.contains(dir)) {
failureReason = getMsg("error-install-root-dir-no-dir",
Utils.getPath(rootDirectory), dir);
--
Gitblit v1.10.0