From ebf357c00c505d1406f65ab9438e4fecfc1a2200 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 18 Sep 2008 10:14:53 +0000
Subject: [PATCH] These changes are separating the current delivery into an "Install Layout" (the binaries) and an "Instance Layout" (the user data).
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
index 0411d22..282d8a7 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
@@ -126,8 +126,9 @@
ZipExtractor extractor = new ZipExtractor(buildFile);
extractor.extract(stageDirectory);
LOG.log(Level.INFO, "Extraction finished");
- Installation installation = new Installation(stageDirectory);
- if (!installation.isValid()) {
+ Installation installation = new Installation(stageDirectory,
+ stageDirectory);
+ if (!installation.isValid(stageDirectory)) {
LOG.log(Level.INFO, "Extraction produed an invalid OpenDS" +
"installation: " + installation.getInvalidityReason());
Message invalidMsg = INFO_BUILD_EXTRACTOR_FILE_INVALID.get(
@@ -162,7 +163,8 @@
private File initStageDirectory() throws ApplicationException {
File stageDir;
- Installation installation = new Installation(getInstallationPath());
+ Installation installation = new Installation(getInstallationPath(),
+ getInstancePath());
stageDir = installation.getTemporaryUpgradeDirectory();
if (stageDir.exists()) {
FileManager fm = new FileManager();
@@ -193,6 +195,14 @@
/**
* {@inheritDoc}
+ */
+ public String getInstancePath() {
+ return Utils.getInstancePathFromClasspath(getInstallationPath());
+ }
+
+
+ /**
+ * {@inheritDoc}
* @param launcher
*/
public UserData createUserData(Launcher launcher)
--
Gitblit v1.10.0