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/config_ja.properties | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/opends/src/messages/messages/config_ja.properties b/opends/src/messages/messages/config_ja.properties index 5f1e75d..23ce28f 100644 --- a/opends/src/messages/messages/config_ja.properties +++ b/opends/src/messages/messages/config_ja.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. +# Portions Copyright 2013 ForgeRock AS. @@ -235,7 +236,7 @@ SEVERE_WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u3067\u5b9a\u7fa9\u3055\u308c\u305f\u5c5e\u6027\u69cb\u6587\u306f\u3001\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u3067\u5b9a\u7fa9\u3055\u308c\u305f\u5225\u306e\u69cb\u6587\u3068\u7af6\u5408\u3057\u3066\u3044\u307e\u3059: %s\u3002\u3053\u306e\u5c5e\u6027\u69cb\u6587\u306f\u4f7f\u7528\u3055\u308c\u307e\u305b\u3093 SEVERE_ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b9\u30ad\u30fc\u30de\u5b9a\u7fa9\u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3002\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u304c\u5b58\u5728\u3057\u307e\u305b\u3093 SEVERE_ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b9\u30ad\u30fc\u30de\u5b9a\u7fa9\u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3002\u30b9\u30ad\u30fc\u30de\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u306f\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093 -SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u307e\u305f\u306f %s \u304b\u3089\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b9\u30ad\u30fc\u30de\u5b9a\u7fa9\u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u8868\u793a\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s +SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u304b\u3089\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30b9\u30ad\u30fc\u30de\u5b9a\u7fa9\u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u89a7\u8868\u793a\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %2$s \u5185\u306e\u30b9\u30ad\u30fc\u30de\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %1$s \u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u53d6\u308a\u7528\u306b\u958b\u3044\u3066\u3044\u308b\u3068\u304d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %2$s \u5185\u306e\u30b9\u30ad\u30fc\u30de\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %1$s \u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u5185\u5bb9\u3092 LDIF \u30a8\u30f3\u30c8\u30ea\u3068\u3057\u3066\u8aad\u307f\u53d6\u3063\u3066\u3044\u308b\u3068\u304d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\u30b9\u30ad\u30fc\u30de\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %s \u306e\u5c5e\u6027\u578b\u5b9a\u7fa9\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093: %s -- Gitblit v1.10.0