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/src/messages/messages/quicksetup_zh_CN.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/opends/src/messages/messages/quicksetup_zh_CN.properties b/opends/src/messages/messages/quicksetup_zh_CN.properties index c8b7753..f3041d4 100644 --- a/opends/src/messages/messages/quicksetup_zh_CN.properties +++ b/opends/src/messages/messages/quicksetup_zh_CN.properties @@ -898,7 +898,7 @@ SEVERE_ERR_COULD_NOT_FIND_REPLICATIONID=\u627e\u4e0d\u5230\u8fdc\u7a0b\u540c\u7ea7\u8bbe\u5907\u4ee5\u521d\u59cb\u5316\u672c\u5730\u57fa DN %s \u7684\u5185\u5bb9\u3002 INFO_NEW_UPGRADE_SCRIPT_AVAILABLE=\u5df2\u53d1\u5e03\u65b0\u7684 '%s' \u7248\u672c\u3002\u5728\u6267\u884c\u6b64\u64cd\u4f5c\u540e\uff0c\u5e94\u5220\u9664\u8be5\u811a\u672c\uff0c\u5e76\u5c06 '%s' \u91cd\u547d\u540d\u4e3a '%1$s'\u3002 MILD_ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS=\u5728\u4f7f\u7528 Java \u5c5e\u6027\u66f4\u65b0\u811a\u672c\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u9519\u8bef\u4ee3\u7801: %d -SEVERE_ERR_INCOMPATIBLE_VERSION=\u6240\u9700\u7684\u6700\u4f4e Java \u7248\u672c\u4e3a %s\u3002%n%n\u68c0\u6d4b\u5230\u7684\u7248\u672c\u4e3a %s\u3002%n\u68c0\u6d4b\u5230\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u4e3a %s%n%n\\u8bf7\u5c06 OPENDS_JAVA_HOME \u8bbe\u7f6e\u4e3a\u517c\u5bb9 Java \u5b89\u88c5\u7684\u6839\u76ee\u5f55\uff1b\u6216\u8005\u7f16\u8f91 java.properties \u6587\u4ef6\uff0c\u7136\u540e\u8fd0\u884c dsjavaproperties \u811a\u672c\u4ee5\u6307\u5b9a\u8981\u4f7f\u7528\u7684 Java \u7248\u672c\u3002 +SEVERE_ERR_INCOMPATIBLE_VERSION=\u6240\u9700\u7684\u6700\u4f4e Java \u7248\u672c\u4e3a %s\u3002%n%n\u68c0\u6d4b\u5230\u7684\u7248\u672c\u4e3a %s\u3002%n\u68c0\u6d4b\u5230\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u4e3a %s%n%n\\u8bf7\u5c06 OPENDJ_JAVA_HOME \u8bbe\u7f6e\u4e3a\u517c\u5bb9 Java \u5b89\u88c5\u7684\u6839\u76ee\u5f55\uff1b\u6216\u8005\u7f16\u8f91 java.properties \u6587\u4ef6\uff0c\u7136\u540e\u8fd0\u884c dsjavaproperties \u811a\u672c\u4ee5\u6307\u5b9a\u8981\u4f7f\u7528\u7684 Java \u7248\u672c\u3002 SEVERE_ERR_INVALID_JAVA_ARGS='%s' \u4e2d\u7684\u670d\u52a1\u5668\u5b89\u88c5\u4e2d\u4f7f\u7528\u7684 Java \u53c2\u6570\u4f3c\u4e4e\u4e0d\u4e0e\u7528\u4e8e\u8fd0\u884c\u5347\u7ea7\u7a0b\u5e8f (%s) \u7684 Java \u865a\u62df\u673a\u517c\u5bb9\u3002%n%n \u5982\u679c\u9700\u8981\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\uff0c\u8bf7\u5220\u9664%s\u6587\u4ef6\u5e76\u91cd\u65b0\u70b9\u51fb'\u4e0b\u4e00\u6b65'.%n\u5f53\u5347\u7ea7\u5b8c\u6210\u540e\uff0c\u4f60\u9700\u8981\u91cd\u65b0\u8fd0\u884c%s\u547d\u4ee4\u6765\u8bbe\u7f6eJAVA\u7684\u53c2\u6570. INFO_ADS_CONTEXT_EXCEPTION_MSG=\u6ce8\u518c\u4fe1\u606f\u9519\u8bef\u3002\u9519\u8bef\u7c7b\u578b: '%s'\u3002 INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=\u6ce8\u518c\u4fe1\u606f\u9519\u8bef\u3002\u9519\u8bef\u7c7b\u578b: '%s'\u3002\u8be6\u7ec6\u4fe1\u606f: %s -- Gitblit v1.10.0