mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Violette Roche-Montane
30.40.2014 b28b8ac61c82094cd4ff34e5d25c4fb0d20b6f62
Checkpoint for OPENDJ-1343 Migrate dsconfig
- Removed System.getProperty("user.dir") from the initialization of the configuration framework and replaced it with the System.getenv(["INSTALL_ROOT"]["INSTANCE_ROOT"]).
1 files modified
9 ■■■■ changed files
opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java 9 ●●●● patch | view | raw | blame | history
opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
@@ -320,8 +320,13 @@
        if (loader != null) {
            throw new IllegalStateException("configuration framework already initialized.");
        }
        this.installPath = installPath == null ? System.getProperty("user.dir") : installPath;
        this.instancePath = instancePath == null ? this.installPath : instancePath;
        this.installPath = installPath == null ? System.getenv("INSTALL_ROOT") : installPath;
        if (instancePath != null) {
            this.instancePath = instancePath;
        } else {
            this.instancePath = System.getenv("INSTANCE_ROOT") != null ? System.getenv("INSTANCE_ROOT")
                    : this.installPath;
        }
        this.parent = parent;
        initialize0();
        return this;