From 9aa85f0854e05558bf94ba174539e112b7a3b7ff 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

---
 opends/src/server/org/opends/server/tools/ToolConstants.java     |    2 +-
 opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java b/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
index 7889f06..fa8b29c 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
+++ b/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/opends/src/server/org/opends/server/tools/ToolConstants.java b/opends/src/server/org/opends/server/tools/ToolConstants.java
index 2456d29..023f062 100644
--- a/opends/src/server/org/opends/server/tools/ToolConstants.java
+++ b/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