From 3dfb061cbafd3a97c9359f739942924a8ee525f1 Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Wed, 02 Nov 2011 12:07:15 +0000 Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones. --- opends/resource/config/java.properties | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/opends/resource/config/java.properties b/opends/resource/config/java.properties index 54f1e8e..a06ec13 100644 --- a/opends/resource/config/java.properties +++ b/opends/resource/config/java.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2008-2010 Sun Microsystems, Inc. +# Portions Copyright 2011 ForgeRock AS # # @@ -56,14 +57,14 @@ # specified settings. # # Examples: -# Specify to overwrite the content of the environment variable OPENDS_JAVA_HOME +# Specify to overwrite the content of the environment variable OPENDJ_JAVA_HOME # (i.e. the contents of this properties file for the java home will be analyzed -# before checking whether OPENDS_JAVA_HOME is specified in the environment): +# before checking whether OPENDJ_JAVA_HOME is specified in the environment): # overwrite-env-java-home=true # -# Specify to overwrite the content of the environment variable OPENDS_JAVA_ARGS +# Specify to overwrite the content of the environment variable OPENDJ_JAVA_ARGS # (i.e. the contents of this properties file for the java args will be analyzed -# before checking whether OPENDS_JAVA_ARGS is specified in the environment): +# before checking whether OPENDJ_JAVA_ARGS is specified in the environment): # overwrite-env-java-args=true # # Specify to use a particular Java Virtual Machine for the offline import: -- Gitblit v1.10.0