From 56269af431723ec4c456c92d0d019e7f6e16832a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Feb 2014 16:17:31 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 11
opendj3-server-dev/src/messages/messages/access_control_ja.properties | 6
opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/HTTPAccessLogPublisherConfiguration.xml | 4
opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java | 1
opendj3-server-dev/src/messages/messages/access_control_fr.properties | 6
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java | 6
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 6
opendj3-server-dev/src/messages/messages/protocol_ja.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java | 7
opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java | 6
opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java | 1
opendj3-server-dev/src/messages/messages/replication_zh_CN.properties | 2
opendj3-server-dev/src/messages/messages/protocol_fr.properties | 2
opendj3-server-dev/src/messages/messages/replication_es.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/SignatureAction.java | 9
opendj3-server-dev/src/messages/messages/extension_ko.properties | 6
opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogger.java | 3
opendj3-server-dev/src/messages/messages/extension.properties | 4
opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml | 2
opendj3-server-dev/src/messages/messages/protocol.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java | 156 ++++++++++--------
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 2
opendj3-server-dev/src/messages/messages/extension_ja.properties | 6
opendj3-server-dev/src/messages/messages/extension_zh_CN.properties | 6
opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 5
opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml | 2
opendj3-server-dev/src/messages/messages/extension_es.properties | 6
opendj3-server-dev/src/messages/messages/replication.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java | 11 -
opendj3-server-dev/src/messages/messages/access_control_es.properties | 6
opendj3-server-dev/src/messages/messages/extension_fr.properties | 6
opendj3-server-dev/src/messages/messages/replication_de.properties | 2
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java | 3
opendj3-server-dev/src/server/org/opends/server/loggers/DebugMessageFormatter.java | 4
opendj3-server-dev/src/messages/messages/protocol_es.properties | 2
opendj3-server-dev/src/messages/messages/protocol_de.properties | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 4
opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml | 4
opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisher.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java | 3
opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java | 3
opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml | 4
opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties | 4
opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogPublisher.java | 11
opendj3-server-dev/src/server/org/opends/server/loggers/ZIPAction.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/DebugTracer.java | 2
opendj3-server-dev/src/messages/messages/extension_de.properties | 6
opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogger.java | 1
opendj3-server-dev/src/messages/messages/extension_zh_TW.properties | 6
opendj3-server-dev/src/messages/messages/replication_fr.properties | 2
opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java | 47 +----
opendj3-server-dev/src/messages/messages/replication_ja.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java | 6
opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties | 4
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 2
opendj3-server-dev/resource/config/config.ldif | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogPublisher.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/EncryptAction.java | 2
opendj3-server-dev/src/messages/messages/access_control.properties | 8
opendj3-server-dev/src/messages/messages/replication_ko.properties | 2
opendj3-server-dev/src/messages/messages/replication_zh_TW.properties | 2
opendj3-server-dev/src/server/org/opends/server/loggers/FileNamingPolicy.java | 3
opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java | 2
69 files changed, 215 insertions(+), 249 deletions(-)
diff --git a/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties b/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
index ba32ba4..818aa9e 100644
--- a/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
+++ b/opendj3-server-dev/resource/admin/example-plugin/example_plugin.properties
@@ -47,6 +47,6 @@
# ORDINAL is an integer unique among other ordinals in this file
#
SEVERE_ERR_INITIALIZE_PLUGIN_1="Invalid plugin type %s for the example plugin.
-NOTICE_DO_STARTUP_2=Example plugin message '%s'.
-NOTICE_APPLY_CONFIGURATION_CHANGE_3="Example plugin message has been changed \
+NOTE_DO_STARTUP_2=Example plugin message '%s'.
+NOTE_APPLY_CONFIGURATION_CHANGE_3="Example plugin message has been changed \
from '%s' to '%s'.
diff --git a/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties b/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
index 4ea3238..4b5f73f 100644
--- a/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
+++ b/opendj3-server-dev/resource/admin/example-plugin/example_plugin_fr.properties
@@ -47,6 +47,6 @@
# ORDINAL is an integer unique among other ordinals in this file
#
SEVERE_ERR_INITIALIZE_PLUGIN_1="Type de plugin invalide %s pour le plugin d'exemple.
-NOTICE_DO_STARTUP_2=Message du plugin d'exemple '%s'.
-NOTICE_APPLY_CONFIGURATION_CHANGE_3="Le message du plugin d'exemple a été modifié \
+NOTE_DO_STARTUP_2=Message du plugin d'exemple '%s'.
+NOTE_APPLY_CONFIGURATION_CHANGE_3="Le message du plugin d'exemple a été modifié \
de '%s' en '%s'.
diff --git a/opendj3-server-dev/resource/config/config.ldif b/opendj3-server-dev/resource/config/config.ldif
index 5cd3e3d..dab4a50 100644
--- a/opendj3-server-dev/resource/config/config.ldif
+++ b/opendj3-server-dev/resource/config/config.ldif
@@ -787,7 +787,7 @@
ds-cfg-log-file: logs/replication
ds-cfg-log-file-permissions: 640
ds-cfg-default-severity: none
-ds-cfg-override-severity: SYNC=INFO,MILD_ERROR,MILD_WARNING,NOTICE
+ds-cfg-override-severity: SYNC=INFO,ERROR,WARNING,NOTICE
ds-cfg-asynchronous: false
ds-cfg-rotation-policy: cn=7 Days Time Limit Rotation Policy,cn=Log Rotation Policies,cn=config
ds-cfg-rotation-policy: cn=Size Limit Rotation Policy,cn=Log Rotation Policies,cn=config
diff --git a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
index c845b6d..1cebdd0 100644
--- a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
+++ b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
@@ -23,7 +23,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
- ! Portions copyright 2011-2013 ForgeRock AS
+ ! Portions copyright 2011-2014 ForgeRock AS
! -->
<adm:managed-object name="access-log-publisher"
plural-name="access-log-publishers"
@@ -61,7 +61,7 @@
<adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
- <adm:value>org.opends.server.api.AccessLogPublisher</adm:value>
+ <adm:value>org.opends.server.loggers.AccessLogPublisher</adm:value>
</adm:defined>
</adm:default-behavior>
</adm:property-override>
diff --git a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
index a0feeac..e2bbcf0 100644
--- a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
+++ b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
@@ -65,7 +65,7 @@
<adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
- <adm:value>org.opends.server.api.DebugLogPublisher</adm:value>
+ <adm:value>org.opends.server.loggers.DebugLogPublisher</adm:value>
</adm:defined>
</adm:default-behavior>
</adm:property-override>
diff --git a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
index 673a928..8083019 100644
--- a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
+++ b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
@@ -52,7 +52,7 @@
<adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
- <adm:value>org.opends.server.api.ErrorLogPublisher</adm:value>
+ <adm:value>org.opends.server.loggers.ErrorLogPublisher</adm:value>
</adm:defined>
</adm:default-behavior>
</adm:property-override>
diff --git a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/HTTPAccessLogPublisherConfiguration.xml b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/HTTPAccessLogPublisherConfiguration.xml
index 0788192..6054793 100644
--- a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/HTTPAccessLogPublisherConfiguration.xml
+++ b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/HTTPAccessLogPublisherConfiguration.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2013 ForgeRock AS
+ ! Copyright 2013-2014 ForgeRock AS
! -->
<adm:managed-object name="http-access-log-publisher"
plural-name="http-access-log-publishers"
@@ -51,7 +51,7 @@
<adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
- <adm:value>org.opends.server.api.HTTPAccessLogPublisher</adm:value>
+ <adm:value>org.opends.server.loggers.HTTPAccessLogPublisher</adm:value>
</adm:defined>
</adm:default-behavior>
</adm:property-override>
diff --git a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
index 2026b2d..49700be 100644
--- a/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
+++ b/opendj3-server-dev/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
@@ -23,7 +23,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
- ! Portions copyright 2013 ForgeRock AS
+ ! Portions copyright 2013-2014 ForgeRock AS
! -->
<adm:managed-object name="log-publisher" plural-name="log-publishers"
package="org.opends.server.admin.std" abstract="true"
@@ -65,7 +65,7 @@
<adm:syntax>
<adm:java-class>
<adm:instance-of>
- org.opends.server.api.LogPublisher
+ org.opends.server.loggers.LogPublisher
</adm:instance-of>
</adm:java-class>
</adm:syntax>
diff --git a/opendj3-server-dev/src/messages/messages/access_control.properties b/opendj3-server-dev/src/messages/messages/access_control.properties
index 7e23a0c..9458790 100644
--- a/opendj3-server-dev/src/messages/messages/access_control.properties
+++ b/opendj3-server-dev/src/messages/messages/access_control.properties
@@ -39,7 +39,7 @@
# where:
#
# SEVERITY is one of:
-# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+# [INFO, WARN, ERR, DEBUG, NOTICE]
#
# DESCRIPTION is an upper case string providing a hint as to the context of
# the message in upper case with the underscore ('_') character serving as
@@ -334,12 +334,12 @@
WARN_ACI_ATTRIBUTE_NOT_INDEXED_96=Backend %s does not have a \
presence index defined for attribute type %s. Access control initialization \
may take a very long time to complete in this backend
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=The provided Access Control \
+WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=The provided Access Control \
Instruction (ACI) bind rule SSF expression "%s" failed to parse for \
the following reason: "%s"
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=The provided Access Control \
+WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=The provided Access Control \
Instruction (ACI) bind rule ssf expression value "%s" is not in the \
valid range. A valid ssf value is in the range of 1 to 1024
- SEVERE_WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=The provided Access Control \
+WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=The provided Access Control \
Instruction (ACI) bind rule timeofday expression "%s" failed to parse for \
the following reason: "%s"
diff --git a/opendj3-server-dev/src/messages/messages/access_control_es.properties b/opendj3-server-dev/src/messages/messages/access_control_es.properties
index c8debf0..c152d52 100644
--- a/opendj3-server-dev/src/messages/messages/access_control_es.properties
+++ b/opendj3-server-dev/src/messages/messages/access_control_es.properties
@@ -132,6 +132,6 @@
WARN_ACI_SYNTAX_DOUBLE_PERIOD_IN_NUMERIC_OID_93=El valor del OID targetcontrol de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) "%s" proporcionado no pudo analizarse porque el OID num\u00e9rico contiene dos puntos consecutivos en la posici\u00f3n %d
WARN_ACI_SYNTAX_INVALID_TARGEXTOP_EXPRESSION_95=El valor de expresi\u00f3n extop de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) "%s" proporcionado no es v\u00e1lido. Para ser v\u00e1lido, el valor de expresi\u00f3n de palabra clave extop requiere una o m\u00e1s cadenas de OID de solicitud de operaci\u00f3n extendida v\u00e1lidas en el siguiente formato: oid [|| oid1] ... [|| oidN]
WARN_ACI_ATTRIBUTE_NOT_INDEXED_96=El backend %s no tiene un \u00edndice de presencia definido para el tipo de atributo %s. Es posible que la inicializaci\u00f3n de control de acceso tarde mucho tiempo en completarse en este backend
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=Se ha producido un error al analizar la expresi\u00f3n SSF "%s" de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) proporcionada debido al siguiente motivo: "%s"
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=El valor "%s" de la expresi\u00f3n SSF de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) proporcionada no se encuentra dentro del rango v\u00e1lido. Para que un valor de SSF sea v\u00e1lido debe encontrarse en el rango de 1 a 1.024
- SEVERE_WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=Se ha producido un error al analizar la expresi\u00f3n de hora del d\u00eda "%s" de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) debido al siguiente motivo: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=Se ha producido un error al analizar la expresi\u00f3n SSF "%s" de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) proporcionada debido al siguiente motivo: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=El valor "%s" de la expresi\u00f3n SSF de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) proporcionada no se encuentra dentro del rango v\u00e1lido. Para que un valor de SSF sea v\u00e1lido debe encontrarse en el rango de 1 a 1.024
+WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=Se ha producido un error al analizar la expresi\u00f3n de hora del d\u00eda "%s" de la regla enlace de la instrucci\u00f3n de control de acceso (ACI, Access Control Instruction) debido al siguiente motivo: "%s"
diff --git a/opendj3-server-dev/src/messages/messages/access_control_fr.properties b/opendj3-server-dev/src/messages/messages/access_control_fr.properties
index 69c698e..cf241d2 100644
--- a/opendj3-server-dev/src/messages/messages/access_control_fr.properties
+++ b/opendj3-server-dev/src/messages/messages/access_control_fr.properties
@@ -132,6 +132,6 @@
WARN_ACI_SYNTAX_DOUBLE_PERIOD_IN_NUMERIC_OID_93=\u00c9chec de l'analyse de la valeur d'OID targetcontrol de l'instruction de contr\u00f4le d'acc\u00e8s\u00a0(ACI) fournie ("%s") car l'OID num\u00e9rique contient deux points cons\u00e9cutifs \u00e0 la position %d
WARN_ACI_SYNTAX_INVALID_TARGEXTOP_EXPRESSION_95=La valeur d'expression extop de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) fournie ("%s") n'est pas valide. Pour \u00eatre valide, la valeur d'expression de mot-cl\u00e9 extop doit contenir une ou plusieurs cha\u00eenes d'OID de requ\u00eate d'op\u00e9ration \u00e9tendue valides au format suivant\u00a0: oid [|| oid1] ... [|| oidN]
WARN_ACI_ATTRIBUTE_NOT_INDEXED_96=Le backend %s n'a aucun index de pr\u00e9sence d\u00e9fini pour le type d'attribut %s. L'initialisation du contr\u00f4le d'acc\u00e8s peut \u00eatre assez longue dans ce backend
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=\u00c9chec de l'analyse de l'expression "%s" SSF de la r\u00e8gle de liaison de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) pour la raison suivante\u00a0: "%s"
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=La valeur "%s" d'expression ssf de la r\u00e8gle de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) n'est pas dans la plage valide. Une valeur ssf valide est comprise dans la plage allant de 1 \u00e0 1024.
- SEVERE_WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=\u00c9chec de l'analyse de l'expression "%s" timeofday de la r\u00e8gle de liaison de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) pour la raison suivante\u00a0: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=\u00c9chec de l'analyse de l'expression "%s" SSF de la r\u00e8gle de liaison de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) pour la raison suivante\u00a0: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=La valeur "%s" d'expression ssf de la r\u00e8gle de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) n'est pas dans la plage valide. Une valeur ssf valide est comprise dans la plage allant de 1 \u00e0 1024.
+WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=\u00c9chec de l'analyse de l'expression "%s" timeofday de la r\u00e8gle de liaison de l'instruction de contr\u00f4le d'acc\u00e8s (ACI) pour la raison suivante\u00a0: "%s"
diff --git a/opendj3-server-dev/src/messages/messages/access_control_ja.properties b/opendj3-server-dev/src/messages/messages/access_control_ja.properties
index f215b5c..e46cc7d 100644
--- a/opendj3-server-dev/src/messages/messages/access_control_ja.properties
+++ b/opendj3-server-dev/src/messages/messages/access_control_ja.properties
@@ -132,6 +132,6 @@
WARN_ACI_SYNTAX_DOUBLE_PERIOD_IN_NUMERIC_OID_93=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u306e targetcontrol OID \u5024 "%s" \u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u6570\u5024\u306e OID \u306e\u4f4d\u7f6e %d \u306b 2 \u3064\u306e\u9023\u7d9a\u3059\u308b\u30d4\u30ea\u30aa\u30c9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
WARN_ACI_SYNTAX_INVALID_TARGEXTOP_EXPRESSION_95=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u306e extop \u5f0f\u306e\u5024 "%s" \u306f\u7121\u52b9\u3067\u3059\u3002extop \u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u6709\u52b9\u306a\u5f0f\u306e\u5024\u3067\u306f\u30011 \u3064\u4ee5\u4e0a\u306e\u6709\u52b9\u306a\u62e1\u5f35\u64cd\u4f5c\u8981\u6c42 OID \u6587\u5b57\u5217\u3092\u6b21\u306e\u5f62\u5f0f\u3067\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059: oid [|| oid1] ... [|| oidN]
WARN_ACI_ATTRIBUTE_NOT_INDEXED_96=\u30d0\u30c3\u30af\u30a8\u30f3\u30c9 %s \u3067\u3001\u5c5e\u6027\u578b %s \u306b\u30d7\u30ec\u30bc\u30f3\u30b9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u306e\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u3067\u306f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u306e\u521d\u671f\u5316\u306b\u304b\u306a\u308a\u6642\u9593\u304c\u304b\u304b\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e SSF \u5f0f "%s" \u306f\u3001\u6b21\u306e\u7406\u7531\u3067\u89e3\u6790\u306b\u5931\u6557\u3057\u307e\u3057\u305f: "%s"
- SEVERE_WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e ssf \u5f0f\u306e\u5024 "%s" \u306f\u3001\u6709\u52b9\u7bc4\u56f2\u5185\u306e\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6709\u52b9\u306a ssf \u5024\u306f 1 \u304b\u3089 1024 \u307e\u3067\u3067\u3059\u3002
- SEVERE_WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e timeofday \u5f0f "%s" \u306f\u3001\u6b21\u306e\u7406\u7531\u3067\u89e3\u6790\u306b\u5931\u6557\u3057\u307e\u3057\u305f: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_FORMAT_97=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e SSF \u5f0f "%s" \u306f\u3001\u6b21\u306e\u7406\u7531\u3067\u89e3\u6790\u306b\u5931\u6557\u3057\u307e\u3057\u305f: "%s"
+WARN_ACI_SYNTAX_INVALID_SSF_RANGE_98=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e ssf \u5f0f\u306e\u5024 "%s" \u306f\u3001\u6709\u52b9\u7bc4\u56f2\u5185\u306e\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u6709\u52b9\u306a ssf \u5024\u306f 1 \u304b\u3089 1024 \u307e\u3067\u3067\u3059\u3002
+WARN_ACI_SYNTAX_INVALID_TIMEOFDAY_FORMAT_99=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u547d\u4ee4 (ACI) \u30d0\u30a4\u30f3\u30c9\u30eb\u30fc\u30eb\u306e timeofday \u5f0f "%s" \u306f\u3001\u6b21\u306e\u7406\u7531\u3067\u89e3\u6790\u306b\u5931\u6557\u3057\u307e\u3057\u305f: "%s"
diff --git a/opendj3-server-dev/src/messages/messages/extension.properties b/opendj3-server-dev/src/messages/messages/extension.properties
index 2bca4ec..fa8592e 100644
--- a/opendj3-server-dev/src/messages/messages/extension.properties
+++ b/opendj3-server-dev/src/messages/messages/extension.properties
@@ -318,7 +318,7 @@
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=An unexpected error occurred \
while attempting to determine the value of the ds-cfg-server-fqdn attribute \
in configuration entry %s: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while \
+ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while \
trying to create an %s context: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=An error occurred \
while attempting to decode the SASL %s username "%s" because it \
@@ -338,7 +338,7 @@
find any user entries for the provided username of %s
ERR_SASL_AUTHZID_INVALID_DN_202=The provided authorization ID \
%s contained an invalid DN: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=The entry %s specified as \
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=The entry %s specified as \
the authorization identity does not exist
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=The entry %s specified as \
the authorization identity could not be retrieved: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_de.properties b/opendj3-server-dev/src/messages/messages/extension_de.properties
index cfe413b..bf56ac6 100644
--- a/opendj3-server-dev/src/messages/messages/extension_de.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_de.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=Der Server konnte keine Benutzereintr\u00e4ge f\u00fcr den angegebenen Benutzernamen %s finden
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=Das angegebene Passwort ist ung\u00fcltig
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=Die Authentifizierung mit SASL CRAM-MD5 ist f\u00fcr Benutzer %s nicht m\u00f6glich, da keines der Passw\u00f6rter im Benutzereintrag in umkehrbarer Form gespeichert ist
- INFO_SASL_UNSUPPORTED_CALLBACK_192=F\u00fcr den SASL-Server wurde ein unerwarteter R\u00fcckruf zur Verwendung bei der %s-Authentifizierung angegeben: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=F\u00fcr den SASL-Server wurde ein unerwarteter R\u00fcckruf zur Verwendung bei der %s-Authentifizierung angegeben: %s
ERR_SASL_NO_CREDENTIALS_193=Die Client-Verbindung wies %s-Statusinformationen auf, die darauf hinweisen, dass der Client im Begriff war, eine %s-Verbindung herzustellen, die Verbindungsanforderung jedoch keine Berechtigungsnachweise enthielt
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=Unerwarteter Fehler beim Versuch, den Wert des Attributs ds-cfg-server-fqdn in Konfigurationseintrag %s festzulegen: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=Beim Versuch, einen %s-Kontext zu erstellen, ist ein unerwarteter Fehler aufgetreten: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=Beim Versuch, einen %s-Kontext zu erstellen, ist ein unerwarteter Fehler aufgetreten: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=Beim Versuch, den SASL-%s-Benutzernamen %s zu entschl\u00fcsseln, ist ein Fehler aufgetreten, da er offenbar einen DN enthielt, die DN-Entschl\u00fcsselung jedoch fehlgeschlagen ist: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=Bei dem Benutzernamen in der Verbindungsanforderung SASL %s handelt es sich offenbar um einen leeren DN. Dies ist nicht zul\u00e4ssig
INFO_SASL_CANNOT_LOCK_ENTRY_198=Der Directory-Server konnte f\u00fcr den Benutzereintrag %s keine Lesesperre erhalten, um ihn abrufen zu k\u00f6nnen
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=Der in der Verbindungsanforderung SASL %s enthaltene Benutzername enthielt null Zeichen, was nicht zul\u00e4ssig ist. Bei der Authentifizierung mit %s sind leere Zeichenfolgen als Benutzernamen unzul\u00e4ssig
ERR_SASL_NO_MATCHING_ENTRIES_201=Der Server konnte keine Benutzereintr\u00e4ge f\u00fcr den angegebenen Benutzernamen %s finden
ERR_SASL_AUTHZID_INVALID_DN_202=Die angegebene Autorisierungs-ID %s enthielt einen ung\u00fcltigen DN: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=Der als Autorisierungsidentit\u00e4t angegebene Eintrag %s existiert nicht
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=Der als Autorisierungsidentit\u00e4t angegebene Eintrag %s existiert nicht
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=Der als Autorisierungsidentit\u00e4t angegebene Eintrag %s konnte nicht abgerufen werden: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=Der Server konnte keinen Eintrag finden, der der Autorisierungs-ID %s entspricht
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=Beim Versuch, die Klartextpassw\u00f6rter f\u00fcr Benutzer %s zwecks Durchf\u00fchrung der SASL %s-Authentifizierung abzurufen, ist ein Fehler aufgetreten: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_es.properties b/opendj3-server-dev/src/messages/messages/extension_es.properties
index aff9ec5..1dc317a 100644
--- a/opendj3-server-dev/src/messages/messages/extension_es.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_es.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=El servidor no pudo encontrar entradas de usuario para el nombre de usuario proporcionado de %s
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=La contrase\u00f1a proporcionada no es v\u00e1lida
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=La autenticaci\u00f3n SASL CRAM-MD5 no es posible para el usuario %s porque ninguna de las contrase\u00f1as de la entrada del usuario est\u00e1n almacenadas con forma reversible
- INFO_SASL_UNSUPPORTED_CALLBACK_192=Se proporcion\u00f3 una devoluci\u00f3n de llamada no admitida o inesperada para el servidor SASL con el fin de utilizarla durante la autenticaci\u00f3n %s: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=Se proporcion\u00f3 una devoluci\u00f3n de llamada no admitida o inesperada para el servidor SASL con el fin de utilizarla durante la autenticaci\u00f3n %s: %s
ERR_SASL_NO_CREDENTIALS_193=La conexi\u00f3n del cliente inclu\u00eda informaci\u00f3n de estado de %s. Se indicaba que el cliente estaba realizando un enlace de %s, pero que la solicitud de enlace no inclu\u00eda credenciales
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=Se ha producido un error inesperado al tratar de determinar el valor del atributo the ds-cfg-server-fqdn en la entrada de configuraci\u00f3n %s: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=Se produjo un error inesperado al intentar crear un contexto de %s: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=Se produjo un error inesperado al intentar crear un contexto de %s: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=Se produjo un error al intentar descodificar el nombre de usuario %s de SASL "%s" porque, aunque parec\u00eda contener un ND, la descodificaci\u00f3n de \u00e9ste fall\u00f3: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=El nombre de usuario de la solicitud de enlace de SASL %s parece ser un ND vac\u00edo. Esto no est\u00e1 permitido
INFO_SASL_CANNOT_LOCK_ENTRY_198=Directory Server no pudo obtener un bloqueo de lectura en la entrada de usuario %s para recuperarla
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=El nombre de usuario contenido en la solicitud de enlace de SASL %s ten\u00eda una longitud de cero caracteres, lo cual no est\u00e1 permitido. La autenticaci\u00f3n %s no permite que se utilice una cadena vac\u00eda como nombre de usuario
ERR_SASL_NO_MATCHING_ENTRIES_201=El servidor no pudo encontrar entradas de usuario para el nombre de usuario proporcionado de %s
ERR_SASL_AUTHZID_INVALID_DN_202=El ID de autorizaci\u00f3n proporcionado %s conten\u00eda un ND no v\u00e1lido: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=La entrada %s especificada como identidad de autorizaci\u00f3n no existe
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=La entrada %s especificada como identidad de autorizaci\u00f3n no existe
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=No se puede recuperar la entrada %s, que se especific\u00f3 como identidad de la autorizaci\u00f3n: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=El servidor no pudo encontrar ninguna entrada que se correspondiera con el ID de autorizaci\u00f3n %s
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=Se produjo un error al intentar recuperar la(s) contrase\u00f1a(s) no cifrada(s) para el usuario %s con el fin de realizar la autenticaci\u00f3n SASL %s: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_fr.properties b/opendj3-server-dev/src/messages/messages/extension_fr.properties
index 8b37dc9..21aa3dc 100644
--- a/opendj3-server-dev/src/messages/messages/extension_fr.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_fr.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=Impossible au serveur de trouver des entr\u00e9es utilisateur pour le nom d'utilisateur fourni de %s
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=Le mot de passe fourni n'est pas valide
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=Authentification SASL CRAM-MD5 impossible pour l'utilisateur %s car aucun des mots de passe de l'entr\u00e9e utilisateur n'est stock\u00e9 sous forme r\u00e9versible
- INFO_SASL_UNSUPPORTED_CALLBACK_192=Un rappel inattendu ou non pris en charge est fourni pour le serveur SASL lors de l'authentification %s\u00a0: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=Un rappel inattendu ou non pris en charge est fourni pour le serveur SASL lors de l'authentification %s\u00a0: %s
ERR_SASL_NO_CREDENTIALS_193=La connexion client inclut les informations de statut %s, indiquant que le client effectue une liaison %s mais que la requ\u00eate de liaison n'inclut pas d'informations d'identification
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=Une erreur inattendue s\u2019est produite lors de la tentative de d\u00e9termination de la valeur de l\u2019attribut de configuration ds-cfg-server-fqdn dans l\u2019entr\u00e9e de configuration %s\u00a0: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=Une erreur inattendue s'est produite lors de la cr\u00e9ation d'un contexte\u00a0%s : %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=Une erreur inattendue s'est produite lors de la cr\u00e9ation d'un contexte\u00a0%s : %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=Une erreur s'est produite lors du d\u00e9codage du nom d'utilisateur SASL %s "%s" car il semble contenir un DN dont le d\u00e9codage a \u00e9chou\u00e9\u00a0: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=Le nom d'utilisateur de la requ\u00eate de liaison SASL %s semble \u00eatre un DN vide. Cela n'est pas autoris\u00e9
INFO_SASL_CANNOT_LOCK_ENTRY_198=Impossible pour Directory Server d'obtenir un verrou de lecture pour l'entr\u00e9e utilisateur %s en vue de la r\u00e9cup\u00e9rer
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=Le nom d'utilisateur contenu dans la requ\u00eate de liaison SASL %s poss\u00e8de une longueur de z\u00e9ro caract\u00e8res, ce qui est interdit. L'authentification %s n'autorise pas l'utilisation d'une cha\u00eene vide comme nom d'utilisateur
ERR_SASL_NO_MATCHING_ENTRIES_201=Impossible au serveur de trouver des entr\u00e9es utilisateur pour le nom d'utilisateur fourni de %s
ERR_SASL_AUTHZID_INVALID_DN_202=L'ID d'autorisation fournie %s contient un DN non valide\u00a0: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=L'entr\u00e9e %s sp\u00e9cifi\u00e9e comme identit\u00e9 d'autorisation n'existe pas
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=L'entr\u00e9e %s sp\u00e9cifi\u00e9e comme identit\u00e9 d'autorisation n'existe pas
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=Impossible de r\u00e9cup\u00e9rer l'entr\u00e9e %s sp\u00e9cifi\u00e9e comme identit\u00e9 d'autorisation\u00a0: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=Impossible pour le serveur de trouver une entr\u00e9e correspondant \u00e0 l'ID d'autorisation %s
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=Une erreur s'est produite lors de la r\u00e9cup\u00e9ration d'au moins un mot de passe en texte clair pour l'utilisateur %s \u00e0 des fins d'authentification SASL %s\u00a0: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_ja.properties b/opendj3-server-dev/src/messages/messages/extension_ja.properties
index acd602f..65a9cfb 100644
--- a/opendj3-server-dev/src/messages/messages/extension_ja.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_ja.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=\u30b5\u30fc\u30d0\u30fc\u3067\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u540d %s \u306e\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=\u6307\u5b9a\u3057\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=SASL CRAM-MD5 \u8a8d\u8a3c\u306f\u30e6\u30fc\u30b6\u30fc %s \u306b\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea\u5185\u306b\u53ef\u9006\u5f62\u5f0f\u3067\u683c\u7d0d\u3055\u308c\u3066\u3044\u308b\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u3042\u308a\u307e\u305b\u3093
- INFO_SASL_UNSUPPORTED_CALLBACK_192=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30b3\u30fc\u30eb\u30d0\u30c3\u30af\u307e\u305f\u306f\u4e88\u671f\u3057\u306a\u3044\u30b3\u30fc\u30eb\u30d0\u30c3\u30af\u304c\u3001%s \u8a8d\u8a3c\u306e\u3068\u304d\u306b\u4f7f\u7528\u3059\u308b SASL \u30b5\u30fc\u30d0\u30fc\u306b\u5bfe\u3057\u3066\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30b3\u30fc\u30eb\u30d0\u30c3\u30af\u307e\u305f\u306f\u4e88\u671f\u3057\u306a\u3044\u30b3\u30fc\u30eb\u30d0\u30c3\u30af\u304c\u3001%s \u8a8d\u8a3c\u306e\u3068\u304d\u306b\u4f7f\u7528\u3059\u308b SASL \u30b5\u30fc\u30d0\u30fc\u306b\u5bfe\u3057\u3066\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f: %s
ERR_SASL_NO_CREDENTIALS_193=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u63a5\u7d9a\u306b %s \u72b6\u614b\u60c5\u5831\u304c\u542b\u307e\u308c\u3066\u304a\u308a\u3001\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c %s \u30d0\u30a4\u30f3\u30c9\u306e\u5b9f\u884c\u51e6\u7406\u4e2d\u3067\u3042\u308b\u3053\u3068\u3092\u793a\u3057\u3066\u3044\u307e\u3057\u305f\u304c\u3001\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u306b\u8cc7\u683c\u60c5\u5831\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3067\u3057\u305f
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u306e ds-cfg-server-fqdn \u5c5e\u6027\u306e\u5024\u3092\u5224\u65ad\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=%s \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u4f5c\u6210\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=%s \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u4f5c\u6210\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=SASL %s \u306e\u30e6\u30fc\u30b6\u30fc\u540d "%s" \u3092\u5fa9\u53f7\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002DN \u304c\u542b\u307e\u308c\u3066\u3044\u305f\u3088\u3046\u3067\u3059\u304c\u3001DN \u306e\u5fa9\u53f7\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=SASL %s \u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u5185\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u304c\u7a7a\u306e DN \u306e\u3088\u3046\u3067\u3059\u3002\u3053\u308c\u306f\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093
INFO_SASL_CANNOT_LOCK_ENTRY_198=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %s \u3092\u53d6\u308a\u51fa\u3059\u305f\u3081\u306e\u305d\u306e\u30a8\u30f3\u30c8\u30ea\u306e\u8aad\u307f\u53d6\u308a\u30ed\u30c3\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=SASL %s \u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u306b\u542b\u307e\u308c\u308b\u30e6\u30fc\u30b6\u30fc\u540d\u306e\u9577\u3055\u304c 0 \u6587\u5b57\u3067\u3059\u3002\u3053\u308c\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002%s \u8a8d\u8a3c\u3067\u306f\u3001\u7a7a\u306e\u6587\u5b57\u5217\u3092\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093
ERR_SASL_NO_MATCHING_ENTRIES_201=\u30b5\u30fc\u30d0\u30fc\u3067\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u540d %s \u306e\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
ERR_SASL_AUTHZID_INVALID_DN_202=\u6307\u5b9a\u3055\u308c\u305f\u8a8d\u53ef ID %s \u306b\u7121\u52b9\u306a DN \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3057\u305f: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u8a8d\u53ef ID \u3068\u3057\u3066\u6307\u5b9a\u3055\u308c\u305f\u30a8\u30f3\u30c8\u30ea %s \u304c\u5b58\u5728\u3057\u307e\u305b\u3093
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u8a8d\u53ef ID \u3068\u3057\u3066\u6307\u5b9a\u3055\u308c\u305f\u30a8\u30f3\u30c8\u30ea %s \u304c\u5b58\u5728\u3057\u307e\u305b\u3093
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=\u8a8d\u53ef ID \u3068\u3057\u3066\u6307\u5b9a\u3055\u308c\u305f\u30a8\u30f3\u30c8\u30ea %s \u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=\u30b5\u30fc\u30d0\u30fc\u306f\u3001\u8a8d\u53ef ID %s \u306b\u5bfe\u5fdc\u3059\u308b\u30a8\u30f3\u30c8\u30ea\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=SASL %2$s \u8a8d\u8a3c\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u30e6\u30fc\u30b6\u30fc %1$s \u306e\u5e73\u6587\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %3$s
diff --git a/opendj3-server-dev/src/messages/messages/extension_ko.properties b/opendj3-server-dev/src/messages/messages/extension_ko.properties
index 0fc9863..435d236 100644
--- a/opendj3-server-dev/src/messages/messages/extension_ko.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_ko.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=\uc11c\ubc84\uac00 \uc81c\uacf5\ub41c \uc0ac\uc6a9\uc790 \uc774\ub984 %s\uc5d0 \ub300\ud55c \uc0ac\uc6a9\uc790 \ud56d\ubaa9\uc744 \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=\uc81c\uacf5\ub41c \ube44\ubc00\ubc88\ud638\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=\uc0ac\uc6a9\uc790 \ud56d\ubaa9\uc758 \ube44\ubc00\ubc88\ud638\uac00 \ucde8\uc18c\ud560 \uc218 \uc788\ub294 \ud615\uc2dd\uc73c\ub85c \uc800\uc7a5\ub418\uc5b4 \uc788\uc9c0 \uc54a\uae30 \ub54c\ubb38\uc5d0 \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud574 SASL CRAM-MD5 \uc778\uc99d\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
- INFO_SASL_UNSUPPORTED_CALLBACK_192=An unsupported or unexpected callback was provided to the SASL server for use during %s authentication: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=An unsupported or unexpected callback was provided to the SASL server for use during %s authentication: %s
ERR_SASL_NO_CREDENTIALS_193=The client connection included %s state information, indicating that the client was in the process of performing a %s bind, but the bind request did not include any credentials
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0\uc11c ds-cfg-server-fqdn \uc18d\uc131 \uac12\uc744 \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=An error occurred while attempting to decode the SASL %s username "%s" because it appeared to contain a DN but DN decoding failed: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=The username in the SASL %s bind request appears to be an empty DN. \uc774\ub294 \ud5c8\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
INFO_SASL_CANNOT_LOCK_ENTRY_198=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uac00 \uc0ac\uc6a9\uc790 \ud56d\ubaa9 %s\uc744(\ub97c) \uac80\uc0c9\ud558\ub294 \ub370 \ud544\uc694\ud55c \uc77d\uae30 \uc7a0\uae08\uc744 \uac00\uc838\uc624\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=The username contained in the SASL %s bind request had a length of zero characters, which is not allowed. %s authentication does not allow an empty string for use as the username
ERR_SASL_NO_MATCHING_ENTRIES_201=\uc11c\ubc84\uac00 \uc81c\uacf5\ub41c \uc0ac\uc6a9\uc790 \uc774\ub984 %s\uc5d0 \ub300\ud55c \uc0ac\uc6a9\uc790 \ud56d\ubaa9\uc744 \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
ERR_SASL_AUTHZID_INVALID_DN_202=\uc81c\uacf5\ub41c \uad8c\ud55c \ubd80\uc5ec ID %s\uc5d0 \uc798\ubabb\ub41c DN\uc774 \ud3ec\ud568\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\uad8c\ud55c \ubd80\uc5ec \uc544\uc774\ub514\ub85c \uc9c0\uc815\ub41c \ud56d\ubaa9 %s\uc774(\uac00) \uc5c6\uc2b5\ub2c8\ub2e4.
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\uad8c\ud55c \ubd80\uc5ec \uc544\uc774\ub514\ub85c \uc9c0\uc815\ub41c \ud56d\ubaa9 %s\uc774(\uac00) \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=\uad8c\ud55c \ubd80\uc5ec \uc544\uc774\ub514\ub85c \uc9c0\uc815\ub41c \ud56d\ubaa9 %s\uc744(\ub97c) \uac80\uc0c9\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=\uc11c\ubc84\uc5d0\uc11c \uad8c\ud55c \ubd80\uc5ec \uc544\uc774\ub514 %s\uc5d0 \ud574\ub2f9\ud558\ub294 \ud56d\ubaa9\uc744 \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=An error occurred while attempting to retrieve the clear-text password(s) for user %s in order to perform SASL %s authentication: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties b/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
index e4836c4..8bfb89b 100644
--- a/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=\u5bf9\u4e8e\u63d0\u4f9b\u7684\u7528\u6237\u540d %s\uff0c\u670d\u52a1\u5668\u627e\u4e0d\u5230\u4efb\u4f55\u7528\u6237\u6761\u76ee
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=\u63d0\u4f9b\u7684\u5bc6\u7801\u65e0\u6548
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=\u65e0\u6cd5\u5bf9\u7528\u6237 %s \u8fdb\u884c SASL CRAM-MD5 \u9a8c\u8bc1\uff0c\u56e0\u4e3a\u8be5\u7528\u6237\u6761\u76ee\u4e2d\u6ca1\u6709\u4efb\u4f55\u5bc6\u7801\u662f\u4ee5\u53ef\u9006\u683c\u5f0f\u5b58\u50a8\u7684
- INFO_SASL_UNSUPPORTED_CALLBACK_192=\u4e3a SASL \u670d\u52a1\u5668\u63d0\u4f9b\u4e86\u4e0d\u53d7\u652f\u6301\u7684\u6216\u610f\u5916\u56de\u8c03\u4ee5\u5728 %s \u9a8c\u8bc1\u671f\u95f4\u4f7f\u7528: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=\u4e3a SASL \u670d\u52a1\u5668\u63d0\u4f9b\u4e86\u4e0d\u53d7\u652f\u6301\u7684\u6216\u610f\u5916\u56de\u8c03\u4ee5\u5728 %s \u9a8c\u8bc1\u671f\u95f4\u4f7f\u7528: %s
ERR_SASL_NO_CREDENTIALS_193=\u5ba2\u6237\u7aef\u8fde\u63a5\u5305\u542b %s \u72b6\u6001\u4fe1\u606f\uff0c\u6307\u793a\u5ba2\u6237\u7aef\u6b63\u5728\u6267\u884c %s \u7ed1\u5b9a\u64cd\u4f5c\uff0c\u4f46\u7ed1\u5b9a\u8bf7\u6c42\u4e0d\u5305\u542b\u4efb\u4f55\u51ed\u8bc1
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=\u5728\u5c1d\u8bd5\u786e\u5b9a\u914d\u7f6e\u6761\u76ee %s \u4e2d\u7684 ds-cfg-server-fqdn \u5c5e\u6027\u7684\u503c\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=\u5c1d\u8bd5\u5bf9 SASL %s \u7528\u6237\u540d "%s" \u8fdb\u884c\u89e3\u7801\u65f6\u51fa\u73b0\u9519\u8bef\uff0c\u56e0\u4e3a\u5b83\u4f3c\u4e4e\u5305\u542b DN\uff0c\u4f46 DN \u89e3\u7801\u5931\u8d25: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=SASL %s \u7ed1\u5b9a\u8bf7\u6c42\u4e2d\u7684\u7528\u6237\u540d\u4f3c\u4e4e\u4e3a\u7a7a DN\u3002\u4e0d\u5141\u8bb8\u5b58\u5728\u8fd9\u79cd\u60c5\u51b5
INFO_SASL_CANNOT_LOCK_ENTRY_198=\u76ee\u5f55\u670d\u52a1\u5668\u65e0\u6cd5\u83b7\u53d6\u5bf9\u7528\u6237\u6761\u76ee %s \u7684\u8bfb\u53d6\u9501\u5b9a\u4ee5\u68c0\u7d22\u8be5\u6761\u76ee
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=SASL %s \u7ed1\u5b9a\u8bf7\u6c42\u4e2d\u5305\u542b\u7684\u7528\u6237\u540d\u7684\u957f\u5ea6\u4e3a\u96f6\u4e2a\u5b57\u7b26\uff0c\u4e0d\u5141\u8bb8\u5b58\u5728\u8fd9\u79cd\u60c5\u51b5\u3002%s \u9a8c\u8bc1\u4e0d\u5141\u8bb8\u5c06\u7a7a\u5b57\u7b26\u4e32\u7528\u4f5c\u7528\u6237\u540d
ERR_SASL_NO_MATCHING_ENTRIES_201=\u5bf9\u4e8e\u63d0\u4f9b\u7684\u7528\u6237\u540d %s\uff0c\u670d\u52a1\u5668\u627e\u4e0d\u5230\u4efb\u4f55\u7528\u6237\u6761\u76ee
ERR_SASL_AUTHZID_INVALID_DN_202=\u63d0\u4f9b\u7684\u6388\u6743 ID %s \u5305\u542b\u65e0\u6548\u7684 DN: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u6307\u5b9a\u4e3a\u6388\u6743\u8eab\u4efd\u7684\u6761\u76ee %s \u4e0d\u5b58\u5728
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u6307\u5b9a\u4e3a\u6388\u6743\u8eab\u4efd\u7684\u6761\u76ee %s \u4e0d\u5b58\u5728
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=\u65e0\u6cd5\u68c0\u7d22\u6307\u5b9a\u4e3a\u6388\u6743\u8eab\u4efd\u7684\u6761\u76ee %s: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=\u670d\u52a1\u5668\u627e\u4e0d\u5230\u4e0e\u6388\u6743 ID %s \u5bf9\u5e94\u7684\u4efb\u4f55\u6761\u76ee
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=\u5c1d\u8bd5\u68c0\u7d22\u7528\u6237 %s \u7684\u660e\u6587\u5bc6\u7801\u4ee5\u6267\u884c SASL %s \u9a8c\u8bc1\u65f6\u51fa\u73b0\u9519\u8bef: %s
diff --git a/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties b/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
index ae619ff..330f060 100644
--- a/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
+++ b/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
@@ -139,10 +139,10 @@
ERR_SASLCRAMMD5_NO_MATCHING_ENTRIES_184=\u4f3a\u670d\u5668\u627e\u4e0d\u5230\u6240\u63d0\u4f9b\u4f7f\u7528\u8005\u540d\u7a31 %s \u7684\u4efb\u4f55\u4f7f\u7528\u8005\u9805\u76ee
ERR_SASLCRAMMD5_INVALID_PASSWORD_188=\u63d0\u4f9b\u7684\u5bc6\u78bc\u7121\u6548
ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS_189=SASL CRAM-MD5 \u8a8d\u8b49\u4e0d\u9069\u7528\u65bc\u4f7f\u7528\u8005 %s\uff0c\u56e0\u70ba\u4f7f\u7528\u8005\u9805\u76ee\u4e2d\u6c92\u6709\u4ee5\u53ef\u53cd\u8f49\u683c\u5f0f\u5132\u5b58\u7684\u5bc6\u78bc
- INFO_SASL_UNSUPPORTED_CALLBACK_192=An unsupported or unexpected callback was provided to the SASL server for use during %s authentication: %s
+INFO_SASL_UNSUPPORTED_CALLBACK_192=An unsupported or unexpected callback was provided to the SASL server for use during %s authentication: %s
ERR_SASL_NO_CREDENTIALS_193=The client connection included %s state information, indicating that the client was in the process of performing a %s bind, but the bind request did not include any credentials
ERR_SASL_CANNOT_GET_SERVER_FQDN_194=\u5617\u8a66\u5224\u5b9a\u914d\u7f6e\u9805\u76ee %s \u4e2d\u7684 ds-cfg-server-fqdn \u5c6c\u6027\u503c\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
- SEVERE_ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
+ERR_SASL_CONTEXT_CREATE_ERROR_195=An unexpected error occurred while trying to create an %s context: %s
ERR_SASL_CANNOT_DECODE_USERNAME_AS_DN_196=An error occurred while attempting to decode the SASL %s username "%s" because it appeared to contain a DN but DN decoding failed: %s
ERR_SASL_USERNAME_IS_NULL_DN_197=The username in the SASL %s bind request appears to be an empty DN. \u9019\u662f\u4e0d\u5141\u8a31\u7684
INFO_SASL_CANNOT_LOCK_ENTRY_198=\u76ee\u9304\u4f3a\u670d\u5668\u7121\u6cd5\u53d6\u5f97\u4f7f\u7528\u8005\u9805\u76ee %s \u7684\u8b80\u53d6\u9396\u5b9a\uff0c\u4ee5\u64f7\u53d6\u8a72\u9805\u76ee
@@ -150,7 +150,7 @@
ERR_SASL_ZERO_LENGTH_USERNAME_200=The username contained in the SASL %s bind request had a length of zero characters, which is not allowed. %s authentication does not allow an empty string for use as the username
ERR_SASL_NO_MATCHING_ENTRIES_201=\u4f3a\u670d\u5668\u627e\u4e0d\u5230\u6240\u63d0\u4f9b\u4f7f\u7528\u8005\u540d\u7a31 %s \u7684\u4efb\u4f55\u4f7f\u7528\u8005\u9805\u76ee
ERR_SASL_AUTHZID_INVALID_DN_202=\u63d0\u4f9b\u7684\u6388\u6b0a ID %s \u5df2\u5305\u542b\u7121\u6548\u7684 DN: %s
- MILD_ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u6307\u5b9a\u70ba\u6388\u6b0a\u8b58\u5225\u7684\u9805\u76ee %s \u4e0d\u5b58\u5728
+ERR_SASL_AUTHZID_NO_SUCH_ENTRY_203=\u6307\u5b9a\u70ba\u6388\u6b0a\u8b58\u5225\u7684\u9805\u76ee %s \u4e0d\u5b58\u5728
ERR_SASL_AUTHZID_CANNOT_GET_ENTRY_204=\u7121\u6cd5\u64f7\u53d6\u6307\u5b9a\u70ba\u6388\u6b0a\u8b58\u5225\u7684\u9805\u76ee %s: %s
ERR_SASL_AUTHZID_NO_MAPPED_ENTRY_205=\u4f3a\u670d\u5668\u627e\u4e0d\u5230\u4efb\u4f55\u8207\u6388\u6b0a ID %s \u5c0d\u61c9\u7684\u9805\u76ee
ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS_207=An error occurred while attempting to retrieve the clear-text password(s) for user %s in order to perform SASL %s authentication: %s
diff --git a/opendj3-server-dev/src/messages/messages/protocol.properties b/opendj3-server-dev/src/messages/messages/protocol.properties
index 6cdf30a..266a18d 100644
--- a/opendj3-server-dev/src/messages/messages/protocol.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol.properties
@@ -863,7 +863,7 @@
underlying data source: %s
ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=Cannot decode the provided \
subtree delete control because it contains a value
- SEVERE_ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=An error occurred \
+ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=An error occurred \
while attempting to initialize the SSL context for use in the LDAP \
Connection Handler: %s
ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=The Directory Server does not \
diff --git a/opendj3-server-dev/src/messages/messages/protocol_de.properties b/opendj3-server-dev/src/messages/messages/protocol_de.properties
index cc3c08a..1533175 100644
--- a/opendj3-server-dev/src/messages/messages/protocol_de.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol_de.properties
@@ -339,7 +339,7 @@
ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=Es wurden keine g\u00fcltigen Trap-Ziele gefunden. Es wird kein Trap gesendet
ERR_ASN1_READ_ERROR_1500=Fehler beim Zugriff auf die zugrunde liegende Datenquelle: %s
ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=Die angegebene Steuerung der Unterstrukturl\u00f6schung kann nicht entschl\u00fcsselt werden, da sie einen Wert enth\u00e4lt
- SEVERE_ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Beim Versuch, den SSL-Kontext zur Verwendung im LDAP-Verbindungs-Handler zu initialisieren, ist ein Fehler aufgetreten: %s
+ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Beim Versuch, den SSL-Kontext zur Verwendung im LDAP-Verbindungs-Handler zu initialisieren, ist ein Fehler aufgetreten: %s
ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=Der Directory-Server unterst\u00fctzte nicht die LDAP-Protokollversion %d. Diese Verbindung wird geschlossen
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST_1506=Die spezifizierte OpenDMK-JAR-Datei '%s' wurde nicht gefunden. Stellen Sie sicher, dass der in dem Konfigurationsparameter opendmk-jarfile des SNMP-Verbindungshandlers eingestellte Wert einen g\u00fcltigen Pfad zu der jdmkrt.jar-Datei darstellt und auf die Datei zugegriffen werden kann
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL_1507=Die erforderliche Klasse konnte nicht mithilfe der JAR-Datei '%s' geladen werden. Stellen Sie sicher, dass die JAR-Datei nicht besch\u00e4digt ist
diff --git a/opendj3-server-dev/src/messages/messages/protocol_es.properties b/opendj3-server-dev/src/messages/messages/protocol_es.properties
index 8316cb5..b12ce4d 100644
--- a/opendj3-server-dev/src/messages/messages/protocol_es.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol_es.properties
@@ -339,7 +339,7 @@
ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=No se han encontrado destinos de capturas v\u00e1lidos No se enviar\u00e1 ninguna captura
ERR_ASN1_READ_ERROR_1500=Se ha producido un error al acceder al origen de datos subyacente: %s
ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=No puede descodificarse el control de eliminaci\u00f3n de sub\u00e1rbol proporcionado porque contiene un valor
- SEVERE_ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Se produjo un error al intentar inicializar el contexto SSL para su uso en el controlador de conexi\u00f3n LDAP: %s
+ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Se produjo un error al intentar inicializar el contexto SSL para su uso en el controlador de conexi\u00f3n LDAP: %s
ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=Directory Server no admite la versi\u00f3n %d del protocolo LDAP; esta conexi\u00f3n se cerrar\u00e1
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST_1506=No pudo encontrarse el archivo OpenDMK jar '%s' especificado Compruebe que el valor definido en el par\u00e1metro de configuraci\u00f3n opendmk-jarfile del controlador de conexi\u00f3n SNMP sea la ruta v\u00e1lida al archivo jdmkrt.jar y que el archivo sea accesible
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL_1507=No pudieron cargarse las clases requeridas por medio del archivo jar '%s'. Compruebe que el archivo jar no est\u00e9 da\u00f1ado
diff --git a/opendj3-server-dev/src/messages/messages/protocol_fr.properties b/opendj3-server-dev/src/messages/messages/protocol_fr.properties
index c2c6182..ea8ecb5 100644
--- a/opendj3-server-dev/src/messages/messages/protocol_fr.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol_fr.properties
@@ -339,7 +339,7 @@
ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=Aucune destination de d\u00e9routements valide n\u2019a \u00e9t\u00e9 trouv\u00e9e. Aucun d\u00e9routement ne sera envoy\u00e9
ERR_ASN1_READ_ERROR_1500=Une erreur s\u2019est produite lors de l\u2019acc\u00e8s \u00e0 la source de donn\u00e9es sous-jacente\u00a0: %s
ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=Impossible de d\u00e9coder le contr\u00f4le de suppression de sous-arborescence fourni, car il contient une valeur
- SEVERE_ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Une erreur s'est produite lors d'une tentative d'initialiser le contexte SSL \u00e0 utiliser dans le gestionnaire de connexion LDAP\u00a0: %s
+ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=Une erreur s'est produite lors d'une tentative d'initialiser le contexte SSL \u00e0 utiliser dans le gestionnaire de connexion LDAP\u00a0: %s
ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=Directory Server ne prend pas en charge la version de protocole LDAP %d. Cette connexion va \u00eatre ferm\u00e9e
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST_1506=Le fichier jar OpenDMK sp\u00e9cifi\u00e9 (%s) est introuvable. V\u00e9rifiez que la valeur d\u00e9finie dans le param\u00e8tre de configuration opendmk-jarfile du gestionnaire de connexion SNMP correspond au chemin valide du fichier jdmkrt.jar et que ce fichier est accessible
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL_1507=Impossible de charger les classes requises avec le fichier jar "%s". V\u00e9rifiez que le fichier jar n\u2019est pas alt\u00e9r\u00e9
diff --git a/opendj3-server-dev/src/messages/messages/protocol_ja.properties b/opendj3-server-dev/src/messages/messages/protocol_ja.properties
index 04a6c11..dc9b85c 100644
--- a/opendj3-server-dev/src/messages/messages/protocol_ja.properties
+++ b/opendj3-server-dev/src/messages/messages/protocol_ja.properties
@@ -337,7 +337,7 @@
ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=\u6709\u52b9\u306a\u30c8\u30e9\u30c3\u30d7\u306e\u5b9b\u5148\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30c8\u30e9\u30c3\u30d7\u306f\u9001\u4fe1\u3055\u308c\u307e\u305b\u3093
ERR_ASN1_READ_ERROR_1500=\u914d\u4e0b\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=\u6307\u5b9a\u3055\u308c\u305f\u30b5\u30d6\u30c4\u30ea\u30fc\u524a\u9664\u5236\u5fa1\u3092\u5fa9\u53f7\u5316\u3067\u304d\u307e\u305b\u3093\u3002\u5024\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
- SEVERE_ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=LDAP \u63a5\u7d9a\u30cf\u30f3\u30c9\u30e9\u3067\u4f7f\u7528\u3059\u308b SSL \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
+ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE_1504=LDAP \u63a5\u7d9a\u30cf\u30f3\u30c9\u30e9\u3067\u4f7f\u7528\u3059\u308b SSL \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_LDAP_UNSUPPORTED_PROTOCOL_VERSION_1505=Directory Server \u306f LDAP \u30d7\u30ed\u30c8\u30b3\u30eb\u30d0\u30fc\u30b8\u30e7\u30f3 %d \u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u306e\u63a5\u7d9a\u3092\u7d42\u4e86\u3057\u307e\u3059
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_DOES_NOT_EXIST_1506=\u6307\u5b9a\u3055\u308c\u305f OpenDMK jar \u30d5\u30a1\u30a4\u30eb '%s' \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002SNMP \u63a5\u7d9a\u30cf\u30f3\u30c9\u30e9\u306e opendmk-jarfile \u69cb\u6210\u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u8a2d\u5b9a\u3055\u308c\u305f\u5024\u304c jdmkrt.jar \u30d5\u30a1\u30a4\u30eb\u3078\u306e\u6709\u52b9\u306a\u30d1\u30b9\u3067\u3042\u308b\u3053\u3068\u3001\u304a\u3088\u3073\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
ERR_SNMP_CONNHANDLER_OPENDMK_JARFILES_NOT_OPERATIONAL_1507=jar \u30d5\u30a1\u30a4\u30eb '%s' \u3092\u4f7f\u7528\u3057\u3066\u5fc5\u9808\u30af\u30e9\u30b9\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002jar \u30d5\u30a1\u30a4\u30eb\u304c\u58ca\u308c\u3066\u3044\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/opendj3-server-dev/src/messages/messages/replication.properties b/opendj3-server-dev/src/messages/messages/replication.properties
index 3b02d9f..1e81de3 100644
--- a/opendj3-server-dev/src/messages/messages/replication.properties
+++ b/opendj3-server-dev/src/messages/messages/replication.properties
@@ -167,7 +167,7 @@
testing existence or creating the replication backend : %s
ERR_DELETE_REPL_BACKEND_FAILED_90=An unexpected error occurred when \
deleting the replication backend : %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=An error occurred when \
+ERR_BACKEND_EXPORT_ENTRY_91=An error occurred when \
exporting the entry %s : %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =An error occurred when \
creating the LDIF writer to export backend : %s
diff --git a/opendj3-server-dev/src/messages/messages/replication_de.properties b/opendj3-server-dev/src/messages/messages/replication_de.properties
index 48ebe19..4e3780f 100644
--- a/opendj3-server-dev/src/messages/messages/replication_de.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_de.properties
@@ -111,7 +111,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=Protokollfehler: Ein Replikationsserver ist nicht das erwartete Ziel einer Nachricht des Typs %s
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=Beim \u00dcberpr\u00fcfen des Vorhandenseins oder bei der Erstellung des Replikations-Backends ist ein unerwarteter Fehler aufgetreten : %s
ERR_DELETE_REPL_BACKEND_FAILED_90=Beim L\u00f6schen des Replikations-Backends ist ein unerwarteter Fehler aufgetreten : %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=Beim Exportieren des Eintrags %s ist ein Fehler aufgetreten: %s
+ERR_BACKEND_EXPORT_ENTRY_91=Beim Exportieren des Eintrags %s ist ein Fehler aufgetreten: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =Beim Erstellen des LDIF-Schreibers zum Exportieren des Backends iste ein Fehler aufgetreten : %s
ERR_BACKEND_SEARCH_ENTRY_93 =Bei der Suche nach %s ist ein Fehler aufgetreten: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=Eintrag %s ist nicht im Replikationsserver-Backends vorhanden
diff --git a/opendj3-server-dev/src/messages/messages/replication_es.properties b/opendj3-server-dev/src/messages/messages/replication_es.properties
index 98ac65e..d12178f 100644
--- a/opendj3-server-dev/src/messages/messages/replication_es.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_es.properties
@@ -111,7 +111,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=Error de protocolo: no se espera que un servidor de r\u00e9plica sea el destino de un mensaje del tipo %s
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=Se ha producido un error inesperado al comprobar la existencia o crear el backend de repetici\u00f3n: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=Se ha producido un error inesperado al eliminar el backend de repetici\u00f3n: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=Se produjo un error al exportar la entrada %s : %s
+ERR_BACKEND_EXPORT_ENTRY_91=Se produjo un error al exportar la entrada %s : %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =Se ha producido un error al crear el editor de LDIF para exportar el backend: %s
ERR_BACKEND_SEARCH_ENTRY_93 =Se ha producido un error al buscar %s: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=La entrada %s no existe en el backend de servidor de repetici\u00f3n
diff --git a/opendj3-server-dev/src/messages/messages/replication_fr.properties b/opendj3-server-dev/src/messages/messages/replication_fr.properties
index e6c2dec..83252b5 100644
--- a/opendj3-server-dev/src/messages/messages/replication_fr.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_fr.properties
@@ -111,7 +111,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=Erreur de protocole : il n'est pas pr\u00e9vu qu'un serveur de r\u00e9plication soit la destination d'un message de type %s
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=Une erreur inattendue s'est produite lors de la cr\u00e9ation ou du test de l'existence du backend de r\u00e9plication\u00a0: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=Une erreur inattendue s'est produite lors de la suppression du backend de r\u00e9plication\u00a0: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=Occurrence d'erreur lors de l'exportation de l'entr\u00e9e %s\u00a0: %s
+ERR_BACKEND_EXPORT_ENTRY_91=Occurrence d'erreur lors de l'exportation de l'entr\u00e9e %s\u00a0: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =Une erreur s'est produite lors de la cr\u00e9ation du processus d'\u00e9criture LDIF pour exporter le backend\u00a0: %s
ERR_BACKEND_SEARCH_ENTRY_93 =Une erreur s'est produite lors de la recherche de %s\u00a0: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=L'entr\u00e9e %s n'existe pas dans le backend de serveur de r\u00e9plication
diff --git a/opendj3-server-dev/src/messages/messages/replication_ja.properties b/opendj3-server-dev/src/messages/messages/replication_ja.properties
index 7ab638d..5dc8149 100644
--- a/opendj3-server-dev/src/messages/messages/replication_ja.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_ja.properties
@@ -111,7 +111,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=\u30d7\u30ed\u30c8\u30b3\u30eb\u30a8\u30e9\u30fc: \u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u306f\u30bf\u30a4\u30d7 %s \u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5b9b\u5148\u3068\u3057\u3066\u671f\u5f85\u3055\u308c\u3066\u3044\u307e\u305b\u3093
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e\u5b58\u5728\u3092\u78ba\u8a8d\u4e2d\u3001\u307e\u305f\u306f\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u3092\u4f5c\u6210\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e\u524a\u9664\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=\u30a8\u30f3\u30c8\u30ea %s \u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
+ERR_BACKEND_EXPORT_ENTRY_91=\u30a8\u30f3\u30c8\u30ea %s \u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3059\u308b\u305f\u3081\u306e LDIF \u30e9\u30a4\u30bf\u30fc\u3092\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_BACKEND_SEARCH_ENTRY_93 =%s \u306e\u691c\u7d22\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=\u30a8\u30f3\u30c8\u30ea %s \u306f\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306b\u5b58\u5728\u3057\u307e\u305b\u3093
diff --git a/opendj3-server-dev/src/messages/messages/replication_ko.properties b/opendj3-server-dev/src/messages/messages/replication_ko.properties
index f179623..4f6d405 100644
--- a/opendj3-server-dev/src/messages/messages/replication_ko.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_ko.properties
@@ -105,7 +105,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=\ud504\ub85c\ud1a0\ucf5c \uc624\ub958: \ubcf5\uc81c \uc11c\ubc84\ub294 %s \uc720\ud615 \uba54\uc2dc\uc9c0\uc758 \ub300\uc0c1\uc774 \ub420 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=\ubcf5\uc81c \ubc31\uc5d4\ub4dc\ub97c \ub9cc\ub4e4\uac70\ub098 \uc788\ub294\uc9c0 \ud14c\uc2a4\ud2b8\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=\ubcf5\uc81c \ubc31\uc5d4\ub4dc\ub97c \uc0ad\uc81c\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=%s \ud56d\ubaa9\uc744 \ub0b4\ubcf4\ub0b4\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
+ERR_BACKEND_EXPORT_ENTRY_91=%s \ud56d\ubaa9\uc744 \ub0b4\ubcf4\ub0b4\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =\ubc31\uc5d4\ub4dc\ub97c \ub0b4\ubcf4\ub0b4\uae30 \uc704\ud55c LDIF \uc791\uc131\uae30\ub97c \ub9cc\ub4dc\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
ERR_BACKEND_SEARCH_ENTRY_93 =%s\uc744(\ub97c) \uac80\uc0c9\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=%s \ud56d\ubaa9\uc774 \ubcf5\uc81c \uc11c\ubc84 \ubc31\uc5d4\ub4dc\uc5d0 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties b/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
index b71ef3c..83db807 100644
--- a/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
@@ -111,7 +111,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=\u534f\u8bae\u9519\u8bef\uff1a\u590d\u5236\u670d\u52a1\u5668\u4e0d\u662f\u7c7b\u578b\u4e3a %s \u7684\u6d88\u606f\u7684\u9884\u671f\u76ee\u6807
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=\u6d4b\u8bd5\u5b58\u5728\u6027\u6216\u521b\u5efa\u590d\u5236\u540e\u7aef\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=\u5220\u9664\u590d\u5236\u540e\u7aef\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=\u5728\u5bfc\u51fa\u6761\u76ee %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
+ERR_BACKEND_EXPORT_ENTRY_91=\u5728\u5bfc\u51fa\u6761\u76ee %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =\u521b\u5efa LDIF \u7f16\u5199\u5668\u4ee5\u5bfc\u51fa\u540e\u7aef\u65f6\u51fa\u73b0\u9519\u8bef: %s
ERR_BACKEND_SEARCH_ENTRY_93 =\u641c\u7d22 %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=\u590d\u5236\u670d\u52a1\u5668\u540e\u7aef\u4e2d\u4e0d\u5b58\u5728\u6761\u76ee %s
diff --git a/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties b/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
index 1bd5597..f0bcb1d 100644
--- a/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
+++ b/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
@@ -105,7 +105,7 @@
NOTE_ERR_ROUTING_TO_SERVER_88=\u5354\u5b9a\u932f\u8aa4: \u8907\u88fd\u4f3a\u670d\u5668\u4e0d\u61c9\u70ba\u8a0a\u606f\u985e\u578b %s \u7684\u76ee\u6a19
ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=\u6e2c\u8a66\u5b58\u5728\u6027\u6216\u5efa\u7acb\u8907\u88fd\u5f8c\u7aef\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
ERR_DELETE_REPL_BACKEND_FAILED_90=\u522a\u9664\u8907\u88fd\u5f8c\u7aef\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
- SEVERE_ERR_BACKEND_EXPORT_ENTRY_91=\u532f\u51fa\u9805\u76ee %s \u6642\u767c\u751f\u932f\u8aa4: %s
+ERR_BACKEND_EXPORT_ENTRY_91=\u532f\u51fa\u9805\u76ee %s \u6642\u767c\u751f\u932f\u8aa4: %s
ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =\u5efa\u7acb LDIF \u7de8\u5beb\u5668\u4ee5\u532f\u51fa\u5f8c\u7aef\u6642\u767c\u751f\u932f\u8aa4: %s
ERR_BACKEND_SEARCH_ENTRY_93 =\u641c\u5c0b %s \u6642\u767c\u751f\u932f\u8aa4: %s
ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST_94=\u9805\u76ee %s \u4e0d\u5b58\u5728\u65bc\u8907\u88fd\u4f3a\u670d\u5668\u5f8c\u7aef\u4e2d
diff --git a/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java b/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
index 380e8d2..d8fbe0d 100644
--- a/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
+++ b/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
@@ -49,53 +49,28 @@
/**
* The severity that will be used for informational messages.
*/
- INFORMATION("INFO", "INFO"),
+ INFORMATION("INFO"),
/**
* The severity that will be used for warning messages.
*/
- WARNING("WARN", "WARN"),
+ WARNING("WARN"),
/**
* The severity that will be used for warning messages.
*/
- ERROR("ERR", "ERR"),
-
- /**
- * The severity that will be used for mild warning messages.
- */
- MILD_WARNING("MILD_WARN", "WARN"),
-
- /**
- * The severity that will be used for severe warning messages.
- */
- SEVERE_WARNING("SEVERE_WARN", "WARN"),
-
- /**
- * The severity that will be used for mild error messages.
- */
- MILD_ERROR("MILD_ERR", "ERR"),
-
- /**
- * The severity that will be used for severe error messages.
- */
- SEVERE_ERROR("SEVERE_ERR", "ERR"),
-
- /**
- * The severity that will be used for fatal error messages.
- */
- FATAL_ERROR("FATAL_ERR", "ERR"),
+ ERROR("ERR"),
/**
* The severity that will be used for debug messages.
*/
- DEBUG("DEBUG", "DEBUG"),
+ DEBUG("DEBUG"),
/**
* The severity that will be used for important informational
* messages.
*/
- NOTICE("NOTE", "NOTE");
+ NOTICE("NOTE");
static private Set<String> PROPERTY_KEY_FORM_VALUES_SET;
@@ -134,15 +109,14 @@
return sev;
}
- private final String propertyKeyForm;
- private final String messageDescriptorForm;
+ private final String name;
/**
* Gets the abbreviated form of this <code>Severity</code>.
* @return String abbreviated form
*/
public String messageDesciptorName() {
- return messageDescriptorForm;
+ return name;
}
/**
@@ -152,12 +126,11 @@
* @return name of this severity
*/
public String propertyKeyFormName() {
- return propertyKeyForm;
+ return name;
}
- private Severity(String propertyKeyForm, String messageDescriptorName) {
- this.propertyKeyForm = propertyKeyForm;
- this.messageDescriptorForm = messageDescriptorName;
+ private Severity(String propertyKeyForm) {
+ this.name = propertyKeyForm;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 6e473f1..542e885 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -74,6 +74,8 @@
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.JMXAlertHandler;
import org.opends.server.loggers.*;
+import org.opends.server.loggers.DebugLogPublisher;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.monitors.BackendMonitor;
import org.opends.server.monitors.ConnectionHandlerMonitor;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 3a209d1..5d884cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -42,7 +42,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.LogPublisherCfg;
-import org.opends.server.api.LogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 543c0f5..8fd0bac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -45,7 +45,6 @@
import org.opends.server.admin.std.meta.AccessLogPublisherCfgDefn.*;
import org.opends.server.admin.std.server.AccessLogFilteringCriteriaCfg;
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
-import org.opends.server.api.AccessLogPublisher;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.Group;
import org.opends.server.authorization.dseecompat.PatternDN;
@@ -68,7 +67,7 @@
/**
* Criteria based filter.
*/
- static final class CriteriaFilter implements Filter
+ private static final class CriteriaFilter implements Filter
{
private final AccessLogFilteringCriteriaCfg cfg;
private final boolean logConnectRecords;
@@ -96,7 +95,7 @@
* @throws ConfigException
* If the configuration cannot be parsed.
*/
- CriteriaFilter(final AccessLogFilteringCriteriaCfg cfg)
+ private CriteriaFilter(final AccessLogFilteringCriteriaCfg cfg)
throws ConfigException
{
this.cfg = cfg;
@@ -695,7 +694,7 @@
/**
* Log message filter predicate.
*/
- static interface Filter
+ private static interface Filter
{
/**
* Returns {@code true} if the provided client connect should be logged.
@@ -745,7 +744,7 @@
/**
* A filter which performs a logical OR over a set of sub-filters.
*/
- static final class OrFilter implements Filter
+ private static final class OrFilter implements Filter
{
private final Filter[] subFilters;
@@ -757,7 +756,7 @@
* @param subFilters
* The sub-filters.
*/
- OrFilter(final Filter[] subFilters)
+ private OrFilter(final Filter[] subFilters)
{
this.subFilters = subFilters;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
similarity index 98%
rename from opendj3-server-dev/src/server/org/opends/server/api/AccessLogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
index 6cfdc2e..b8cf540 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
@@ -24,12 +24,13 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2011-2014 ForgeRock AS.
*/
-package org.opends.server.api;
+package org.opends.server.loggers;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
import org.opends.server.types.*;
@@ -408,7 +409,7 @@
* @param searchEntry
* The search result entry to be logged.
*/
- public void logSearchResultEntry(SearchOperation searchOperation,
+ void logSearchResultEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
// Do nothing
@@ -429,7 +430,7 @@
* @param searchReference
* The search result reference to be logged.
*/
- public void logSearchResultReference(
+ void logSearchResultReference(
SearchOperation searchOperation,
SearchResultReference searchReference)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
index c76e11b..0500b90 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
@@ -33,7 +33,6 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.std.meta.AccessLogPublisherCfgDefn;
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
-import org.opends.server.api.AccessLogPublisher;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
import org.opends.server.types.*;
@@ -89,16 +88,6 @@
return instance;
}
-
-
- /**
- * Removes all existing access log publishers from the logger.
- */
- public synchronized static void removeAllAccessLogPublishers()
- {
- loggerStorage.removeAllLogPublishers();
- }
-
/**
* Returns all the registered access log publishers.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java
similarity index 94%
rename from opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java
index 721c076..1a63926 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java
@@ -24,19 +24,15 @@
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2013-2014 ForgeRock AS
*/
-package org.opends.server.tools;
+package org.opends.server.loggers;
import java.io.PrintStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import org.opends.server.admin.std.server.DebugLogPublisherCfg;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.ServerContext;
-import org.opends.server.loggers.DebugMessageFormatter;
-import org.opends.server.loggers.DebugStackTraceFormatter;
-import org.opends.server.loggers.TraceSettings;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/DebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogPublisher.java
similarity index 96%
rename from opendj3-server-dev/src/server/org/opends/server/api/DebugLogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogPublisher.java
index 6bf2797..7d8004b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/DebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogPublisher.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
* Portions Copyright 2012-2014 ForgeRock AS.
*/
-package org.opends.server.api;
+package org.opends.server.loggers;
import java.util.HashMap;
import java.util.List;
@@ -33,7 +33,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.DebugLogPublisherCfg;
-import org.opends.server.loggers.TraceSettings;
/**
* This class defines the set of methods and structures that must be
@@ -99,7 +98,7 @@
* or {@code null} if no method-level tracing is configured
* for the scope.
*/
- public final Map<String,TraceSettings> getMethodSettings(
+ final Map<String,TraceSettings> getMethodSettings(
String className)
{
if(methodTraceSettings == null)
@@ -122,7 +121,7 @@
*
* @return The current trace settings for the class.
*/
- public final TraceSettings getClassSettings(String className)
+ final TraceSettings getClassSettings(String className)
{
TraceSettings settings = TraceSettings.DISABLED;
@@ -204,7 +203,7 @@
* {@code null} if no trace setting is defined for that
* scope.
*/
- public final TraceSettings getTraceSettings(String scope)
+ final TraceSettings getTraceSettings(String scope)
{
if (scope == null) {
if(classTraceSettings != null)
@@ -254,7 +253,7 @@
* {@code null} if no trace setting is defined for that
* scope.
*/
- public final TraceSettings removeTraceSettings(String scope)
+ final TraceSettings removeTraceSettings(String scope)
{
TraceSettings removedSettings = null;
if (scope == null) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogger.java
index 01e3104..4d343df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugLogger.java
@@ -35,7 +35,6 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.std.meta.DebugLogPublisherCfgDefn;
import org.opends.server.admin.std.server.DebugLogPublisherCfg;
-import org.opends.server.api.DebugLogPublisher;
/**
* A logger for debug and trace logging. DebugLogger provides a debugging
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugMessageFormatter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugMessageFormatter.java
index d07d71f..90ab922 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugMessageFormatter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugMessageFormatter.java
@@ -33,7 +33,7 @@
* format tokens with the text value of message arguments in debug logging
* records.
*/
-public class DebugMessageFormatter
+class DebugMessageFormatter
{
/**
* Format the message format string with the provided arguments.
@@ -42,7 +42,7 @@
* @param msgArgs the arguments to use when replacing tokens in the message.
* @return the formatted message string.
*/
- public static String format(String msg, Object[] msgArgs)
+ static String format(String msg, Object[] msgArgs)
{
StringBuilder buffer= new StringBuilder();
Object[] decoratedArgs = decorateMessageArgs(msgArgs);
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java
index ce9d4df..7b23dd1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java
@@ -29,84 +29,91 @@
import static org.opends.server.util.ServerConstants.EOL;
/**
- * A DebugStackTraceFormatter converts an exception's stack trace into
- * a String appropriate for tracing, optionally performing filtering
- * of stack frames.
+ * A DebugStackTraceFormatter converts an exception's stack trace into a String
+ * appropriate for tracing, optionally performing filtering of stack frames.
*/
-public class DebugStackTraceFormatter
+class DebugStackTraceFormatter
{
/**
* The stack depth value to indicate the entire stack should be printed.
*/
- public static final int COMPLETE_STACK= Integer.MAX_VALUE;
+ public static final int COMPLETE_STACK = Integer.MAX_VALUE;
/**
- * A nested frame filter that removes debug and trailing no OpenDS frames.
- */
+ * A nested frame filter that removes debug and trailing no OpenDS frames.
+ */
public static final FrameFilter SMART_FRAME_FILTER = new SmartFrameFilter();
/**
* A FrameFilter provides stack frame filtering used during formatting.
*/
- public interface FrameFilter {
+ interface FrameFilter
+ {
/**
- * Filters out all undesired stack frames from the given Throwable's
- * stack trace.
- * @param frames the frames to filter
+ * Filters out all undesired stack frames from the given Throwable's stack
+ * trace.
+ *
+ * @param frames
+ * the frames to filter
* @return an array of StackTraceElements to be used in formatting.
*/
- public StackTraceElement[] getFilteredStackTrace(
- StackTraceElement[] frames);
+ public StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames);
}
/**
- * A basic FrameFilter that filters out frames from the debug logging and
- * non OpenDS classes.
+ * A basic FrameFilter that filters out frames from the debug logging and non
+ * OpenDS classes.
*/
- private static class SmartFrameFilter implements FrameFilter {
+ private static class SmartFrameFilter implements FrameFilter
+ {
private boolean isFrameForPackage(StackTraceElement frame,
- String packageName)
+ String packageName)
{
- boolean isContained= false;
+ boolean isContained = false;
- if (frame != null) {
- String className= frame.getClassName();
- isContained= className != null && className.startsWith(packageName);
+ if (frame != null)
+ {
+ String className = frame.getClassName();
+ isContained = className != null && className.startsWith(packageName);
}
return isContained;
}
/**
- * Return the stack trace of an exception with debug and trailing non
- * OpenDS frames filtered out.
+ * Return the stack trace of an exception with debug and trailing non OpenDS
+ * frames filtered out.
*
- * @param frames the frames to filter
+ * @param frames
+ * the frames to filter
* @return the filtered stack trace.
*/
- public StackTraceElement[] getFilteredStackTrace(
- StackTraceElement[] frames)
+ public StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames)
{
- StackTraceElement[] trimmedStack= null;
- if (frames != null && frames.length > 0) {
- int firstFrame= 0;
+ StackTraceElement[] trimmedStack = null;
+ if (frames != null && frames.length > 0)
+ {
+ int firstFrame = 0;
// Skip leading frames debug logging classes
- while (firstFrame < frames.length &&
- DebugTracer.isLoggingStackTraceElement(frames[firstFrame])) {
+ while (firstFrame < frames.length
+ && DebugTracer.isLoggingStackTraceElement(frames[firstFrame]))
+ {
firstFrame++;
}
// Skip trailing frames not in OpenDS classes
- int lastFrame= frames.length - 1;
- while (lastFrame > firstFrame &&
- !isFrameForPackage(frames[lastFrame], "org.opends")) {
+ int lastFrame = frames.length - 1;
+ while (lastFrame > firstFrame
+ && !isFrameForPackage(frames[lastFrame], "org.opends"))
+ {
lastFrame--;
}
- trimmedStack= new StackTraceElement[lastFrame - firstFrame + 1];
- for (int i= firstFrame; i <= lastFrame; i++) {
- trimmedStack[i - firstFrame]= frames[i];
+ trimmedStack = new StackTraceElement[lastFrame - firstFrame + 1];
+ for (int i = firstFrame; i <= lastFrame; i++)
+ {
+ trimmedStack[i - firstFrame] = frames[i];
}
}
@@ -115,9 +122,11 @@
}
/**
- * Generate a String representation of the entire stack trace of the
- * given Throwable.
- * @param t - the Throwable for which to generate the stack trace.
+ * Generate a String representation of the entire stack trace of the given
+ * Throwable.
+ *
+ * @param t
+ * - the Throwable for which to generate the stack trace.
* @return the stack trace.
*/
public static String formatStackTrace(Throwable t)
@@ -126,28 +135,30 @@
}
/**
- * Generate a String representation of the possibly filtered stack trace
- * of the given Throwable.
- * @param t - the Throwable for which to generate the stack trace.
- * @param maxDepth - the maximum number of stack frames to include in the
- * trace.
- * @param includeCause - also include the stack trace for the cause Throwable.
+ * Generate a String representation of the possibly filtered stack trace of
+ * the given Throwable.
+ *
+ * @param t
+ * - the Throwable for which to generate the stack trace.
+ * @param maxDepth
+ * - the maximum number of stack frames to include in the trace.
+ * @param includeCause
+ * - also include the stack trace for the cause Throwable.
* @return the stack trace.
*/
- public static String formatStackTrace(Throwable t, int maxDepth,
- boolean includeCause)
+ static String formatStackTrace(Throwable t, int maxDepth, boolean includeCause)
{
- StringBuilder buffer= new StringBuilder();
+ StringBuilder buffer = new StringBuilder();
StackTraceElement[] trace = t.getStackTrace();
int frameLimit = Math.min(maxDepth, trace.length);
- for (int i=0; i < frameLimit; i++)
+ for (int i = 0; i < frameLimit; i++)
{
buffer.append(" at ");
buffer.append(trace[i]);
buffer.append(EOL);
}
- if(frameLimit < trace.length)
+ if (frameLimit < trace.length)
{
buffer.append(" ... ");
buffer.append(trace.length - frameLimit);
@@ -155,7 +166,7 @@
buffer.append(EOL);
}
- if(includeCause)
+ if (includeCause)
{
Throwable ourCause = t.getCause();
if (ourCause != null)
@@ -168,8 +179,7 @@
}
private static void formatStackTraceForCause(Throwable t, int maxDepth,
- StringBuilder buffer,
- StackTraceElement[] causedTrace)
+ StringBuilder buffer, StackTraceElement[] causedTrace)
{
StackTraceElement[] trace = t.getStackTrace();
int framesToSkip = Math.max(trace.length - maxDepth, 0);
@@ -177,15 +187,17 @@
// Compute number of frames in common between this and caused
int m = trace.length - 1 - framesToSkip;
int n = causedTrace.length - 1 - framesToSkip;
- while (m >= 0 && n >=0 && trace[m].equals(causedTrace[n])) {
- m--; n--;
+ while (m >= 0 && n >= 0 && trace[m].equals(causedTrace[n]))
+ {
+ m--;
+ n--;
}
framesToSkip = trace.length - 1 - m;
buffer.append("Caused by: ");
buffer.append(t);
buffer.append(EOL);
- for (int i=0; i <= m; i++)
+ for (int i = 0; i <= m; i++)
{
buffer.append(" at ");
buffer.append(trace[i]);
@@ -206,31 +218,33 @@
}
/**
- * Generate a String representation of the possibly filtered stack trace
- * from the current position in executation.
+ * Generate a String representation of the possibly filtered stack trace from
+ * the current position in executation.
*
- * @param stackTrace - The stack trace elements to format.
- * @param maxDepth - the maximum number of stack frames to include in the
- * trace.
+ * @param stackTrace
+ * - The stack trace elements to format.
+ * @param maxDepth
+ * - the maximum number of stack frames to include in the trace.
* @return the stack trace.
*/
- public static String formatStackTrace(StackTraceElement[] stackTrace,
- int maxDepth)
+ static String formatStackTrace(StackTraceElement[] stackTrace, int maxDepth)
{
- StringBuilder buffer= new StringBuilder();
+ StringBuilder buffer = new StringBuilder();
- if (stackTrace != null) {
- int frameLimit= Math.min(maxDepth, stackTrace.length);
- if (frameLimit > 0) {
+ if (stackTrace != null)
+ {
+ int frameLimit = Math.min(maxDepth, stackTrace.length);
+ if (frameLimit > 0)
+ {
-
- for (int i= 0; i < frameLimit; i++) {
+ for (int i = 0; i < frameLimit; i++)
+ {
buffer.append(" ");
buffer.append(stackTrace[i]);
buffer.append(EOL);
}
- if(frameLimit < stackTrace.length)
+ if (frameLimit < stackTrace.length)
{
buffer.append(" ...(");
buffer.append(stackTrace.length - frameLimit);
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugTracer.java b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugTracer.java
index 648f96a..89f5381 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/DebugTracer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/DebugTracer.java
@@ -28,8 +28,6 @@
import java.util.Map;
-import org.opends.server.api.DebugLogPublisher;
-
/**
* Class for source-code tracing at the method level.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/EncryptAction.java b/opendj3-server-dev/src/server/org/opends/server/loggers/EncryptAction.java
index 7b7f7c4..bf70182 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/EncryptAction.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/EncryptAction.java
@@ -54,7 +54,7 @@
* encryption.
* @param encryptAlg The encryption algorithm that should be used.
*/
- public EncryptAction(String origFile, String newFile,
+ EncryptAction(String origFile, String newFile,
boolean deleteOriginal, String alias, String encryptAlg)
{
this.originalFile = new File(origFile);
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogPublisher.java
similarity index 98%
rename from opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogPublisher.java
index d507223..f580217 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogPublisher.java
@@ -24,10 +24,12 @@
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2013-2014 ForgeRock AS
*/
-package org.opends.server.api;
+package org.opends.server.loggers;
import java.util.HashMap;
+
import org.forgerock.i18n.slf4j.LocalizedLogger;
+
import java.util.HashSet;
import java.util.List;
import java.util.Map;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
index c9d104d..e2d407e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ErrorLogger.java
@@ -27,14 +27,15 @@
package org.opends.server.loggers;
import static org.opends.messages.ConfigMessages.*;
+
import java.util.Collection;
+
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.backends.task.Task;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/FileNamingPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/FileNamingPolicy.java
index 93e81bf..6d44a30 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/FileNamingPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/FileNamingPolicy.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -32,7 +33,7 @@
* A FileNamingPolicy is used by a MultiFileWriter to generate the
* sequence of file names to use when writing.
*/
-public interface FileNamingPolicy
+interface FileNamingPolicy
{
/**
* Initializes the policy and returns the current name to use.
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java b/opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java
index 6f7ab92..323b2e1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/GZIPAction.java
@@ -57,7 +57,7 @@
* @param deleteOrig Whether the source file should be deleted after
* compression or not.
*/
- public GZIPAction(String origFile, String newFile, boolean deleteOrig)
+ GZIPAction(String origFile, String newFile, boolean deleteOrig)
{
this.originalFile = new File(origFile);
this.newFile = new File(newFile);
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/HTTPAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java
similarity index 96%
rename from opendj3-server-dev/src/server/org/opends/server/api/HTTPAccessLogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java
index e7439b9..5d848c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/HTTPAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java
@@ -23,13 +23,12 @@
*
* Portions Copyright 2013-2014 ForgeRock AS.
*/
-package org.opends.server.api;
+package org.opends.server.loggers;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
-import org.opends.server.loggers.HTTPRequestInfo;
/**
* This class defines the set of methods and structures that must be implemented
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogger.java
index 655f126..255edf7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/HTTPAccessLogger.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -32,7 +32,6 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.std.meta.HTTPAccessLogPublisherCfgDefn;
import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
-import org.opends.server.api.HTTPAccessLogPublisher;
/**
* This class defines the wrapper that will invoke all registered HTTP access
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/LogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisher.java
similarity index 98%
rename from opendj3-server-dev/src/server/org/opends/server/api/LogPublisher.java
rename to opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisher.java
index 8623965..e7af9e0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/LogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisher.java
@@ -24,7 +24,7 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2011-2014 ForgeRock AS.
*/
-package org.opends.server.api;
+package org.opends.server.loggers;
import java.io.Closeable;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index fee3413..7c4c5be 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -613,7 +613,7 @@
* tries to rename the file. On failure, all subsequent log write requests
* will throw exceptions.
*/
- public synchronized void rotate()
+ private synchronized void rotate()
{
try
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/SignatureAction.java b/opendj3-server-dev/src/server/org/opends/server/loggers/SignatureAction.java
index f9d28b0..e3a01df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/SignatureAction.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/SignatureAction.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -43,7 +44,7 @@
* This class implements a post rotation action that signs
* the file.
*/
-public class SignatureAction implements PostRotationAction
+class SignatureAction implements PostRotationAction
{
private static final String delimiter = "---------";
@@ -59,7 +60,7 @@
* @param origFile The source file name to sign.
* @param alias The certificate alias to use for signing.
*/
- public SignatureAction(String origFile, String alias)
+ SignatureAction(String origFile, String alias)
{
this.originalFile = new File(origFile);
this.alias = alias;
@@ -75,7 +76,7 @@
* @param digestAlg The MD5 digest algorithm to use.
* @param alias The certificate alias to use for signing.
*/
- public SignatureAction(String origFile, String sigAlg, String digestAlg,
+ SignatureAction(String origFile, String sigAlg, String digestAlg,
String alias)
{
this.originalFile = new File(origFile);
@@ -277,7 +278,7 @@
{
for(int i = 0; i < bArray.length; i++)
{
- System.out.print(Integer.toHexString((int)bArray[i]));
+ System.out.print(Integer.toHexString(bArray[i]));
}
System.out.println("");
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
index 6d2d86e..bed74b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -39,7 +39,6 @@
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.DebugTargetCfg;
import org.opends.server.admin.std.server.FileBasedDebugLogPublisherCfg;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.api.DirectoryThread;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index 10a9a7c..ee6e30e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -45,7 +45,6 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
import org.opends.server.admin.std.server.FileBasedErrorLogPublisherCfg;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index 59c8ae9..8f20b18 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -44,7 +44,6 @@
import org.forgerock.util.Utils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedHTTPAccessLogPublisherCfg;
-import org.opends.server.api.HTTPAccessLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
index e91c40b..7d05245 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
@@ -30,7 +30,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
index 08b315c..f22017e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
@@ -137,7 +137,7 @@
* @param level
* Level for this settings.
*/
- public TraceSettings(Level level)
+ private TraceSettings(Level level)
{
this(level, false, false, 0, false);
@@ -159,7 +159,7 @@
* @param includeCause
* whether to include the cause of exceptions.
*/
- public TraceSettings(Level level, boolean noArgs,
+ TraceSettings(Level level, boolean noArgs,
boolean noRetVal, int stackDepth, boolean includeCause)
{
this.level = level;
@@ -176,7 +176,7 @@
* The debug target configuration that contains the information to
* use to initialize this trace setting.
*/
- public TraceSettings(DebugTargetCfg config)
+ TraceSettings(DebugTargetCfg config)
{
this.level =
Level.getLevel(config.isEnabled(), config.isDebugExceptionsOnly());
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/ZIPAction.java b/opendj3-server-dev/src/server/org/opends/server/loggers/ZIPAction.java
index 1bfc141..156d18d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/ZIPAction.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/ZIPAction.java
@@ -39,7 +39,7 @@
* This class implements a post rotation action that compresses
* the file using ZIP compression.
*/
-public class ZIPAction implements PostRotationAction
+class ZIPAction implements PostRotationAction
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -57,7 +57,7 @@
* @param deleteOrig Whether the source file should be deleted after
* compression or not.
*/
- public ZIPAction(String origFile, String newFile, boolean deleteOrig)
+ ZIPAction(String origFile, String newFile, boolean deleteOrig)
{
this.originalFile = new File(origFile);
this.newFile = new File(newFile);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 6d6ab3d..b7cd715 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -43,14 +43,14 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
-import org.opends.server.api.DebugLogPublisher;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
+import org.opends.server.loggers.DebugLogPublisher;
import org.opends.server.loggers.DebugLogger;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.TextDebugLogPublisher;
import org.opends.server.loggers.TextErrorLogPublisher;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
index 2e93546..4cd5e63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
@@ -36,8 +36,6 @@
import java.util.List;
import org.opends.server.api.Backend;
-import org.opends.server.api.ErrorLogPublisher;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
@@ -47,7 +45,9 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
+import org.opends.server.loggers.DebugLogPublisher;
import org.opends.server.loggers.DebugLogger;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.TextDebugLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.TextErrorLogPublisher;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index da226b4..de56136 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -48,7 +48,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.core.CoreConfigManager;
@@ -56,6 +55,7 @@
import org.opends.server.core.LockFileManager;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.extensions.ConfigFileHandler;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.TextErrorLogPublisher;
import org.opends.server.loggers.TextWriter;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
index 92f860c..89ecb16 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
@@ -31,10 +31,9 @@
import static org.opends.messages.ToolMessages.*;
-import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.ErrorLogger;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
index c5f14c9..1a9d5fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
@@ -40,11 +40,13 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
-import org.opends.server.util.args.LDAPConnectionArgumentParser;
+import org.opends.server.util.args.LDAPConnectionArgumentParser;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.config.ConfigException;
+import org.opends.server.loggers.DebugLogPublisher;
import org.opends.server.loggers.DebugLogger;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.TextDebugLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.ErrorLogger;
@@ -58,8 +60,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.Backend;
-import org.opends.server.api.ErrorLogPublisher;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.RebuildConfig;
import org.opends.server.backends.jeb.RebuildConfig.RebuildMode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index 451e1ad..334402b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -39,8 +39,6 @@
import java.util.List;
import org.opends.server.api.Backend;
-import org.opends.server.api.ErrorLogPublisher;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.config.ConfigException;
import static org.opends.server.config.ConfigConstants.*;
@@ -49,7 +47,9 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
+import org.opends.server.loggers.DebugLogPublisher;
import org.opends.server.loggers.DebugLogger;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.TextDebugLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.ErrorLogger;
@@ -57,10 +57,12 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.BuildVersion;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.CLIException;
import com.forgerock.opendj.cli.StringArgument;
+
import org.opends.server.util.args.LDAPConnectionArgumentParser;
import static org.opends.messages.ToolMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index 0f59f22..06633a4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -30,8 +30,6 @@
import org.opends.server.api.Backend;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.api.ErrorLogPublisher;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.VerifyConfig;
import org.opends.server.config.ConfigException;
@@ -39,7 +37,9 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
+import org.opends.server.loggers.DebugLogPublisher;
import org.opends.server.loggers.DebugLogger;
+import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.TextDebugLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.ErrorLogger;
@@ -47,6 +47,7 @@
import org.opends.server.loggers.TraceSettings;
import org.opends.server.types.*;
import org.opends.server.util.BuildVersion;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 9fb8fef..b561add 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -41,11 +41,7 @@
import org.opends.server.admin.client.ldap.LDAPConnection;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.api.AccessLogPublisher;
import org.opends.server.api.Backend;
-import org.opends.server.api.DebugLogPublisher;
-import org.opends.server.api.ErrorLogPublisher;
-import org.opends.server.api.HTTPAccessLogPublisher;
import org.opends.server.api.WorkQueue;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.backends.jeb.*;
--
Gitblit v1.10.0