From d42b15e420478dc45785fff6e00b863cc1f8a0f9 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).
---
opends/src/quicksetup/org/opends/quicksetup/Application.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index 6373cf6..61e5963 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -180,8 +180,16 @@
public Installation getInstallation() {
if (installation == null) {
String installPath = getInstallationPath();
+ String instancePath = getInstancePath();
if (installPath != null) {
- installation = new Installation(installPath);
+ if (instancePath == null)
+ {
+ installation = new Installation(installPath, installPath);
+ }
+ else
+ {
+ installation = new Installation(installPath, instancePath);
+ }
}
}
return installation;
@@ -538,6 +546,13 @@
public abstract String getInstallationPath();
/**
+ * Returns the instance path.
+ * @return the instance path.
+ */
+ public abstract String getInstancePath();
+
+
+ /**
* Gets the current step.
* @return ProgressStep representing the current step
*/
--
Gitblit v1.10.0