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/installer/Installer.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 9481c96..f61e948 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -816,7 +816,8 @@
if (Utils.isWebStart())
{
- setInstallation(new Installation(getUserData().getServerLocation()));
+ String installDir = getUserData().getServerLocation();
+ setInstallation(new Installation(installDir, installDir));
}
checkAbort();
@@ -1892,7 +1893,7 @@
getFormattedSuccess(
INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
formatter.getFormattedText(
- Message.raw(getInstallationPath())),
+ Message.raw(getInstancePath())),
INFO_GENERAL_SERVER_STOPPED.get(),
cmd)));
hmSummary.put(InstallProgressStep.FINISHED_CANCELED,
@@ -1926,7 +1927,7 @@
getFormattedSuccess(
INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
formatter.getFormattedText(
- Message.raw(getInstallationPath())),
+ Message.raw(getInstancePath())),
status,
cmd)));
hmSummary.put(InstallProgressStep.FINISHED_WITH_ERROR,
@@ -3967,7 +3968,7 @@
*/
protected String getSelfSignedKeystorePath()
{
- String parentFile = getPath(getInstallationPath(),
+ String parentFile = getPath(getInstancePath(),
Installation.CONFIG_PATH_RELATIVE);
return (getPath(parentFile, "keystore"));
}
@@ -3980,7 +3981,7 @@
*/
private String getTrustManagerPath()
{
- String parentFile = getPath(getInstallationPath(),
+ String parentFile = getPath(getInstancePath(),
Installation.CONFIG_PATH_RELATIVE);
return (getPath(parentFile, "truststore"));
}
@@ -3992,7 +3993,7 @@
*/
private String getTemporaryCertificatePath()
{
- String parentFile = getPath(getInstallationPath(),
+ String parentFile = getPath(getInstancePath(),
Installation.CONFIG_PATH_RELATIVE);
return (getPath(parentFile, "server-cert.txt"));
}
@@ -4003,7 +4004,7 @@
*/
private String getKeystorePinPath()
{
- String parentFile = getPath(getInstallationPath(),
+ String parentFile = getPath(getInstancePath(),
Installation.CONFIG_PATH_RELATIVE);
return (getPath(parentFile, "keystore.pin"));
}
--
Gitblit v1.10.0