From a3b0441c12b207c0fdfce0566dba2db5ecd3816c Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 25 Apr 2014 14:41:38 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1343 Migrate dsconfig - Moved dsconfig package to opendj-config. -> Several checkstyle errors still exist and will be fixed after this commit in order to let the changes on main files more readable. -> BuildVersion.java will be renamed, moved later.
---
opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
index 2136c21..596e331 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
@@ -321,7 +321,7 @@
throw new IllegalStateException("configuration framework already initialized.");
}
this.installPath = installPath == null ? System.getProperty("user.dir") : installPath;
- this.instancePath = instancePath == null ? installPath : instancePath;
+ this.instancePath = instancePath == null ? this.installPath : instancePath;
this.parent = parent;
initialize0();
return this;
@@ -801,4 +801,22 @@
}
}
+ /**
+ * Returns the installation path.
+ *
+ * @return The installation path of this instance.
+ */
+ public String getInstallPath() {
+ return installPath;
+ }
+
+ /**
+ * Returns the instance path.
+ *
+ * @return The instance path.
+ */
+ public String getInstancePath() {
+ return instancePath;
+ }
+
}
--
Gitblit v1.10.0