From 0d97a7da226d93b8b87467efde523aa2120ceabc Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Fri, 07 Jun 2013 14:08:13 +0000 Subject: [PATCH] Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-1806. Back a few years ago, when we did the SVR4 package, we split the schema into read-only (Install) and writable (Instance). With the template model in 2.6, the whole schema is under config, and we should never edit/change the one in the template. So, I've removed all code related to the 2 locations for schema, reverted some I10N messages to their previous versions, and tidy up code and tests. All unit-tests are passing. And it's also possible to change the instance.loc and run setup and have a fully functioning server :-) --- opends/src/messages/messages/task_ja.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/messages/messages/task_ja.properties b/opends/src/messages/messages/task_ja.properties index 53925b5..f4c43c4 100644 --- a/opends/src/messages/messages/task_ja.properties +++ b/opends/src/messages/messages/task_ja.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. +# Portions Copyright 2013 ForgeRock AS. @@ -52,8 +53,8 @@ INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE_3=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u30d7\u30ed\u30bb\u30b9\u304c\u30bf\u30b9\u30af %s \u306b\u3088\u308a\u958b\u59cb\u3055\u308c\u307e\u3057\u305f INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE_4=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u30d7\u30ed\u30bb\u30b9\u304c\u30bf\u30b9\u30af %s \u306b\u3088\u308a\u958b\u59cb\u3055\u308c\u307e\u3057\u305f: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_FILENAME_5=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u30bf\u30b9\u30af\u30a8\u30f3\u30c8\u30ea %2$s \u306e\u5c5e\u6027 %1$s \u3067\u30b9\u30ad\u30fc\u30de\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3067\u3057\u305f -SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u6307\u5b9a\u3055\u308c\u305f\u30b9\u30ad\u30fc\u30de\u30d5\u30a1\u30a4\u30eb %s \u304c\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u307e\u305f\u306f %s \u306b\u5b58\u5728\u3057\u307e\u305b\u3093 -SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u30d5\u30a1\u30a4\u30eb %s \u304c\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u307e\u305f\u306f %s \u306b\u5b58\u5728\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u5224\u5b9a\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s +SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u6307\u5b9a\u3055\u308c\u305f\u30b9\u30ad\u30fc\u30de\u30d5\u30a1\u30a4\u30eb %s \u304c\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u306b\u5b58\u5728\u3057\u307e\u305b\u3093 +SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u30d5\u30a1\u30a4\u30eb %s \u304c\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u306b\u5b58\u5728\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u5224\u5b9a\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE_8=\u30b9\u30ad\u30fc\u30de\u30d5\u30a1\u30a4\u30eb %s \u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b\u30ed\u30fc\u30c9\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA_9=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u306b 1 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u30b5\u30fc\u30d0\u30fc\u306f\u8907\u6570\u56de\u8a66\u884c\u3057\u305f\u3042\u3068\u3001\u30b9\u30ad\u30fc\u30de\u30a8\u30f3\u30c8\u30ea %s \u306e\u66f8\u304d\u8fbc\u307f\u30ed\u30c3\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f SEVERE_ERR_TASK_ADDSCHEMAFILE_INSUFFICIENT_PRIVILEGES_10=\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306e\u5341\u5206\u306a\u7279\u6a29\u304c\u3042\u308a\u307e\u305b\u3093 -- Gitblit v1.10.0