From fc3e8c96fa3e5b8b2ca6f8a3236a5463f2cc9591 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 07 Jun 2011 10:41:53 +0000
Subject: [PATCH] Fix OPENDJ-190: Look for tools.properties, etc. in ~/.opendj rather than ~/.opends
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java | 3 ++-
opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
index 7889f06..fa8b29c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -179,7 +180,7 @@
private static String getKeyStorePath()
{
return System.getProperty("user.home") + File.separator +
- ".opends" + File.separator + "gui-keystore";
+ ".opendj" + File.separator + "gui-keystore";
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
index 2456d29..023f062 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
@@ -94,7 +94,7 @@
* The name of the opends configuration direction in the user
* home directory.
*/
- public static final String DEFAULT_OPENDS_CONFIG_DIR = ".opends";
+ public static final String DEFAULT_OPENDS_CONFIG_DIR = ".opendj";
/**
* The default properties file name.
--
Gitblit v1.10.0