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_zh_TW.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/messages/messages/config_zh_TW.properties b/opends/src/messages/messages/config_zh_TW.properties index a622fff..10a8a40 100644 --- a/opends/src/messages/messages/config_zh_TW.properties +++ b/opends/src/messages/messages/config_zh_TW.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. +# Portions Copyright 2013 ForgeRock AS. @@ -228,14 +229,14 @@ SEVERE_WARN_CONFIG_SCHEMA_SYNTAX_NO_ENABLED_ATTR_180=\u5c6c\u6027\u8a9e\u6cd5\u914d\u7f6e\u9805\u76ee %s \u4e0d\u5305\u542b ds-cfg-enabled \u5c6c\u6027\uff0c\u800c\u6b64\u5c6c\u6027\u7528\u4f86\u8868\u793a\u61c9\u8a72\u555f\u7528\u6216\u505c\u7528\u8a9e\u6cd5\u3002\u5982\u679c\u6c92\u6709\u6b64\u5c6c\u6027\uff0c\u5247\u6703\u9810\u8a2d\u70ba\u505c\u7528 INFO_CONFIG_SCHEMA_SYNTAX_DISABLED_181=\u914d\u7f6e\u9805\u76ee %s \u4e2d\u5b9a\u7fa9\u7684\u5c6c\u6027\u8a9e\u6cd5\u5df2\u6a19\u793a\u70ba\u505c\u7528\uff0c\u56e0\u6b64\u5c07\u4e0d\u6703\u4f7f\u7528\u3002\u5982\u679c\u904e\u53bb\u5df2\u5c07\u5b83\u7528\u65bc\u4e00\u6216\u591a\u500b\u5c6c\u6027\uff0c\u5247\u90a3\u4e9b\u5c6c\u6027\u503c\u7684\u76f8\u7b26\u53ef\u80fd\u7121\u6cd5\u518d\u904b\u4f5c SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_UNABLE_TO_DETERMINE_ENABLED_STATE_182=\u5617\u8a66\u5224\u5b9a\u61c9\u8a72\u555f\u7528\u6216\u505c\u7528\u8207\u914d\u7f6e\u9805\u76ee %s \u76f8\u95dc\u7684\u5c6c\u6027\u8a9e\u6cd5\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s\u3002\u5c07\u4e88\u4ee5\u505c\u7528 -SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_NO_CLASS_ATTR_183=Matching rule configuration entry %s does not contain attribute ds-cfg-java-class, which is used to specify the name of the class that provides the attribute syntax implementation. \u5c07\u505c\u7528\u8207\u6b64\u914d\u7f6e\u9805\u76ee\u76f8\u95dc\u7684\u8a9e\u6cd5 +#SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_NO_CLASS_ATTR_183=Matching rule configuration entry %s does not contain attribute ds-cfg-java-class, which is used to specify the name of the class that provides the attribute syntax implementation. \u5c07\u505c\u7528\u8207\u6b64\u914d\u7f6e\u9805\u76ee\u76f8\u95dc\u7684\u8a9e\u6cd5 SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_GET_CLASS_184=\u5617\u8a66\u5224\u5b9a\u542b\u6709\u5c6c\u6027\u8a9e\u6cd5 %s \u5be6\u4f5c\u7684 Java \u985e\u5225\u540d\u7a31\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s\u3002\u5c07\u505c\u7528\u6b64\u8a9e\u6cd5 SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_INSTANTIATE_185=\u76ee\u9304\u4f3a\u670d\u5668\u7121\u6cd5\u8f09\u5165\u985e\u5225 %s\uff0c\u4e26\u4f7f\u7528\u6b64\u985e\u5225\u4f86\u5efa\u7acb\u914d\u7f6e\u9805\u76ee %s \u4e2d\u5b9a\u7fa9\u7684\u5c6c\u6027\u8a9e\u6cd5\u5be6\u4f8b\u3002\u767c\u751f\u7684\u932f\u8aa4\u70ba: %s\u3002\u5c07\u505c\u7528\u6b64\u8a9e\u6cd5 SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_INITIALIZE_186=\u5617\u8a66\u4f7f\u7528\u914d\u7f6e\u9805\u76ee %2$s \u4e2d\u7684\u8cc7\u8a0a\uff0c\u521d\u59cb\u5316\u5f9e\u985e\u5225 %1$s \u8f09\u5165\u7684\u5c6c\u6027\u8a9e\u6cd5\u6642\u767c\u751f\u932f\u8aa4: %3$s\u3002\u5c07\u505c\u7528\u6b64\u8a9e\u6cd5 SEVERE_WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\u914d\u7f6e\u9805\u76ee %s \u4e2d\u5b9a\u7fa9\u7684\u5c6c\u6027\u8a9e\u6cd5\uff0c\u8207\u4f3a\u670d\u5668\u914d\u7f6e\u4e2d\u5b9a\u7fa9\u7684\u53e6\u4e00\u500b\u8a9e\u6cd5\u885d\u7a81: %s\u3002\u5c07\u4e0d\u6703\u4f7f\u7528\u6b64\u5c6c\u6027\u8a9e\u6cd5 SEVERE_ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\u7121\u6cd5\u8b80\u53d6\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u5b9a\u7fa9\uff0c\u56e0\u70ba\u6a21\u5f0f\u76ee\u9304 %s \u4e0d\u5b58\u5728 SEVERE_ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\u7121\u6cd5\u8b80\u53d6\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u5b9a\u7fa9\uff0c\u56e0\u70ba\u6a21\u5f0f\u76ee\u9304 %s \u5b58\u5728\u4f46\u4e0d\u662f\u76ee\u9304 -SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=Unable to read the Directory Server schema definitions from directory %s or %s because an unexpected error occurred while trying to list the files in that directory: %s +#SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=Unable to read the Directory Server schema definitions from directory %s because an unexpected error occurred while trying to list the files in that directory: %s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s (\u4f4d\u65bc\u76ee\u9304 %s \u4e2d)\uff0c\u56e0\u70ba\u5617\u8a66\u958b\u555f\u6a94\u6848\u4ee5\u8b80\u53d6\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s (\u4f4d\u65bc\u76ee\u9304 %s \u4e2d)\uff0c\u56e0\u70ba\u5617\u8a66\u5c07\u5b83\u7684\u5167\u5bb9\u8b80\u53d6\u70ba LDIF \u9805\u76ee\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\u7121\u6cd5\u5256\u6790\u6a21\u5f0f\u914d\u7f6e\u6a94\u6848 %s \u4e2d\u7684\u5c6c\u6027\u985e\u578b\u5b9a\u7fa9: %s -- Gitblit v1.10.0