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_ko.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/messages/messages/config_ko.properties b/opends/src/messages/messages/config_ko.properties index a2c97d1..54439ab 100644 --- a/opends/src/messages/messages/config_ko.properties +++ b/opends/src/messages/messages/config_ko.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=\uc18d\uc131 \uad6c\ubb38 \uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uad6c\ubb38\uc744 \ud65c\uc131\ud654 \ub610\ub294 \ube44\ud65c\uc131\ud654\ud560\uc9c0 \uc5ec\ubd80\ub97c \ub098\ud0c0\ub0b4\ub294 \ub370 \uc0ac\uc6a9\ub418\ub294 ds-cfg-enabled \uc18d\uc131\uc774 \ud3ec\ud568\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc774 \uc18d\uc131\uc774 \uc5c6\uc73c\uba74 \uae30\ubcf8\uc801\uc73c\ub85c \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. INFO_CONFIG_SCHEMA_SYNTAX_DISABLED_181=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uc815\uc758\ub41c \uc18d\uc131 \uad6c\ubb38\uc774 \ube44\ud65c\uc131\uc73c\ub85c \ud45c\uc2dc\ub418\uc5b4 \uc788\uc73c\ubbc0\ub85c \uc0ac\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc774\uc804\uc5d0 \ud558\ub098 \uc774\uc0c1\uc758 \uc18d\uc131\uc5d0 \ub300\ud574 \uc77c\uce58 \uaddc\uce59\uc774 \uc0ac\uc6a9\ub41c \uacbd\uc6b0 \ud574\ub2f9 \uc18d\uc131 \uac12\uc5d0 \ub300\ud55c \uc77c\uce58\uac00 \ub354 \uc774\uc0c1 \uc791\ub3d9\ud558\uc9c0 \uc54a\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_UNABLE_TO_DETERMINE_ENABLED_STATE_182=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uc5f0\uacb0\ub41c \uc18d\uc131 \uad6c\ubb38\uc744 \ud65c\uc131\ud654 \ub610\ub294 \ube44\ud65c\uc131\ud654\ud560\uc9c0 \uc5ec\ubd80\ub97c \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s. \uc18d\uc131 \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. -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. \uc774 \uad6c\uc131 \ud56d\ubaa9\uacfc \uc5f0\uacb0\ub41c \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. +#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. \uc774 \uad6c\uc131 \ud56d\ubaa9\uacfc \uc5f0\uacb0\ub41c \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_GET_CLASS_184=\uc18d\uc131 \uad6c\ubb38 %s\uc5d0 \ub300\ud55c \uad6c\ud604\uc774 \ud3ec\ud568\ub41c Java \ud074\ub798\uc2a4 \uc774\ub984\uc744 \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s. \uc774 \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_INSTANTIATE_185=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0\uc11c %s \ud074\ub798\uc2a4\ub97c \ub85c\ub4dc\ud558\uc5ec \uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uc815\uc758\ub41c \ub300\ub85c \uc18d\uc131 \uad6c\ubb38 \uc778\uc2a4\ud134\uc2a4\ub97c \ub9cc\ub4e4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. %s \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc774 \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_SYNTAX_CANNOT_INITIALIZE_186=%1$s \ud074\ub798\uc2a4\uc5d0\uc11c \ub85c\ub4dc\ub41c \uc18d\uc131 \uad6c\ubb38\uc744 \uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 \uc815\ubcf4\ub85c \ucd08\uae30\ud654\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3$s. \uc774 \uad6c\ubb38\uc774 \ube44\ud65c\uc131\ud654\ub429\ub2c8\ub2e4. SEVERE_WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0 \uc815\uc758\ub41c \uc18d\uc131 \uad6c\ubb38\uc774 \uc11c\ubc84 \uad6c\uc131\uc5d0 \uc815\uc758\ub41c \ub2e4\ub978 \uad6c\ubb38\uacfc \ucda9\ub3cc\ud569\ub2c8\ub2e4: %s. \uc774 \uc18d\uc131 \uad6c\ubb38\uc774 \uc0ac\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc774(\uac00) \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8 \uc815\uc758\ub97c \uc77d\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. SEVERE_ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc774(\uac00) \uc788\uc9c0\ub9cc \ub514\ub809\ud1a0\ub9ac\uac00 \uc544\ub2c8\ubbc0\ub85c \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8 \uc815\uc758\ub97c \uc77d\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. -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=\uc77d\uc744 \ud30c\uc77c\uc744 \uc5ec\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc5ec \ub514\ub809\ud1a0\ub9ac %2$s\uc758 \uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %1$s\uc744(\ub97c) \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\ub514\ub809\ud1a0\ub9ac %2$s\uc758 \uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %1$s\uc758 \ub0b4\uc6a9\uc744 LDIF \ud56d\ubaa9\uc73c\ub85c \uc77d\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc5ec \uc774 \ud30c\uc77c\uc744 \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\uc2a4\ud0a4\ub9c8 \uad6c\uc131 \ud30c\uc77c %s\uc5d0\uc11c \uc18d\uc131 \uc720\ud615 \uc815\uc758\ub97c \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s -- Gitblit v1.10.0