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/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java b/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
index 7910087..8afc9a5 100644
--- a/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
@@ -163,7 +163,8 @@
     String value;
     // Use this instead of Installation.getLocal() because making that call
     // starts a new JVM and the command-line becomes less responsive.
-    String root = Utils.getInstallPathFromClasspath();
+    String installPath = Utils.getInstallPathFromClasspath();
+    String root = Utils.getInstancePathFromClasspath(installPath);
     if (root != null)
     {
       String libDir = Utils.getPath(root, Installation.LIBRARIES_PATH_RELATIVE);
@@ -206,7 +207,8 @@
     String defaultPropertiesValue;
     // Use this instead of Installation.getLocal() because making that call
     // starts a new JVM and the command-line becomes less responsive.
-    String root = Utils.getInstallPathFromClasspath();
+    String installPath = Utils.getInstallPathFromClasspath();
+    String root = Utils.getInstancePathFromClasspath(installPath);
     if (root != null)
     {
       String configDir = Utils.getPath(root, Installation.CONFIG_PATH_RELATIVE);

--
Gitblit v1.10.0