From 0d97a7da226d93b8b87467efde523aa2120ceabc Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 07 Jun 2013 14:08:13 +0000
Subject: [PATCH] Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-1806. Back a few years ago, when we did the SVR4 package, we split the schema into read-only (Install) and writable (Instance). With the template model in 2.6, the whole schema is under config, and we should never edit/change the one in the template. So, I've removed all code related to the 2 locations for schema, reverted some I10N messages to their previous versions, and tidy up code and tests. All unit-tests are passing. And it's also possible to change the instance.loc and run setup and have a fully functioning server :-)
---
opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index ecd222a..178c4da 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -928,10 +928,7 @@
hmJavaArguments.put(origJavaArguments, transformedArguments);
}
}
- else
- {
- // Already checked if supported.
- }
+ // else, support is already checked.
}
Properties fileProperties = getJavaPropertiesFileContents(
@@ -1157,6 +1154,12 @@
String libDir = Utils.getPath(Utils
.getInstancePathFromInstallPath(installPath),
Installation.LIBRARIES_PATH_RELATIVE);
+ // Create directory if it doesn't exist yet
+ File fLib = new File(libDir);
+ if (! fLib.exists())
+ {
+ fLib.mkdir();
+ }
if (Utils.isWindows())
{
destinationFile = Utils.getPath(libDir,
--
Gitblit v1.10.0