From a8421d3374bd1320f306569b68458e507931f879 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 May 2011 22:31:25 +0000
Subject: [PATCH] Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
index 56eeadf..355a932 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
@@ -75,7 +75,7 @@
// information.
private Argument usageArgument;
- // The argument that will be used to trigger the display of the OpenDS
+ // The argument that will be used to trigger the display of the OpenDJ
// version.
private Argument versionArgument;
@@ -498,18 +498,10 @@
}
else
{
- // Check in "user home"/.opends directory
+ // Check in "user home"/.opendj directory
final String userDir = System.getProperty("user.home");
propertiesFilePath = findPropertiesFile(userDir + File.separator
- + DEFAULT_OPENDS_CONFIG_DIR);
-
- // TODO
- /*
- * if (propertiesFilePath == null) { // check "Opends instance"/config
- * directory String instanceDir = DirectoryServer.getInstanceRoot();
- * propertiesFilePath = findPropertiesFile(instanceDir+ File.separator +
- * "config"); }
- */
+ + DEFAULT_OPENDJ_CONFIG_DIR);
}
// We don't have a properties file location
@@ -1711,8 +1703,8 @@
private String findPropertiesFile(final String directory)
{
// Look for the tools properties file
- final File f = new File(directory, DEFAULT_OPENDS_PROPERTIES_FILE_NAME
- + DEFAULT_OPENDS_PROPERTIES_FILE_EXTENSION);
+ final File f = new File(directory, DEFAULT_OPENDJ_PROPERTIES_FILE_NAME
+ + DEFAULT_OPENDJ_PROPERTIES_FILE_EXTENSION);
if (f.exists() && f.canRead())
{
return f.getAbsolutePath();
--
Gitblit v1.10.0