You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2026/09/20 00:00:30 UTC

(directory-ldap-api) branch master updated: Externalized String to I18n

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new ff8099c9b Externalized String to I18n
ff8099c9b is described below

commit ff8099c9b3232ea330455799c132cf7373f5466c
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Sun Sep 20 02:00:20 2026 +0200

    Externalized String to I18n
---
 .../api/dsmlv2/response/Dsmlv2ResponseGrammar.java |  2 +-
 .../java/org/apache/directory/api/i18n/I18n.java   | 64 +++++++++++++++-
 .../apache/directory/api/i18n/errors.properties    | 11 ++-
 .../apache/directory/api/i18n/messages.properties  | 57 +++++++++++++-
 .../ldap/client/api/DefaultSchemaLoader.java       |  2 +-
 .../ldap/client/api/LdapConnectionConfig.java      |  5 +-
 .../ldap/client/api/PooledLdapConnection.java      |  4 +-
 .../directory/api/ldap/codec/api/LdapDecoder.java  |  2 +-
 .../directory/api/ldap/codec/api/SaslFilter.java   | 28 ++++---
 .../directory/api/ldap/aci/ACIItemParser.java      | 86 +++++++++++-----------
 .../api/ldap/model/name/ComplexDnParser.java       |  6 +-
 .../api/ldap/model/name/DefaultDnFactory.java      |  2 +-
 .../api/ldap/model/name/FastDnParser.java          |  2 +-
 .../model/subtree/SubtreeSpecificationParser.java  |  3 +-
 14 files changed, 199 insertions(+), 75 deletions(-)

diff --git a/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java b/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java
index b89fe34de..9fb4202a4 100644
--- a/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java
+++ b/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java
@@ -1040,7 +1040,7 @@ public final class Dsmlv2ResponseGrammar extends AbstractGrammar implements Gram
             }
             else
             {
-                throw new XmlPullParserException( "dn attribute is required", xpp, null );
+                throw new XmlPullParserException( I18n.err( I18n.ERR_03049_DN_ATTRIBUTE_REQUIRED ), xpp, null );
             }
         }
     };
diff --git a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
index 7ee13fba3..ec22e1ed0 100644
--- a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
@@ -136,6 +136,7 @@ public enum I18n
     ERR_03046_FILTER_MAX_DEPTH_EXCEEDED( "ERR_03046_FILTER_MAX_DEPTH_EXCEEDED" ),
     ERR_03047_INVALID_BASE64_VALUE( "ERR_03047_INVALID_BASE64_VALUE" ),
     ERR_03048_FILTER_TOO_DEEP( "ERR_03048_FILTER_TOO_DEEP" ),
+    ERR_03049_DN_ATTRIBUTE_REQUIRED( "ERR_03049_DN_ATTRIBUTE_REQUIRED" ),
 
     // api-ldap-client-api              4000-4999
     //     <>                               4000-4100
@@ -223,6 +224,9 @@ public enum I18n
     ERR_04180_FILE_DOES_NOT_EXIST_ON_CLASSPATH( "ERR_04180_FILE_DOES_NOT_EXIST_ON_CLASSPATH" ),
     ERR_04181_INVALID_FILTER_ATTRIBUTE_DESCRIPTIONT( "ERR_04181_INVALID_FILTER_ATTRIBUTE_DESCRIPTIONT" ),
     ERR_04182_INVALID_MATCHING_RULE( "ERR_04182_INVALID_MATCHING_RULE" ),
+    ERR_04183_TRUSTMANAGERS_CANT_BE_NULL( "ERR_04183_TRUSTMANAGERS_CANT_BE_NULL" ),
+    ERR_04184_FAILED_RELEASE_CONNECTION( "ERR_04184_FAILED_RELEASE_CONNECTION" ),
+    ERR_04185_CANT_READ_SCHEMA( "ERR_04185_CANT_READ_SCHEMA" ),
 
     //     template                     4200-4300
     // None
@@ -306,6 +310,8 @@ public enum I18n
     ERR_05204_LDAP_DECODER_FAILURE( "ERR_05204_LDAP_DECODER_FAILURE" ),
     ERR_05205_PDU_DOES_NOT_CONTAIN_ENOUGH_DATA( "ERR_05205_PDU_DOES_NOT_CONTAIN_ENOUGH_DATA" ),
     ERR_05206_INPUT_STREAM_TOO_SHORT_PDU( "ERR_05206_INPUT_STREAM_TOO_SHORT_PDU" ),
+    ERR_05207_INVALID_SASL_LENGTH_PREFIX( "ERR_05207_INVALID_SASL_LENGTH_PREFIX" ),
+    ERR_0528_NEGOCIATED_MAX_BUFFER_TOO_SMALL( "ERR_0528_NEGOCIATED_MAX_BUFFER_TOO_SMALL" ),
 
     //     controls                     5300-5399
     ERR_05300_CANT_DECODE_CHANGE_TYPE( "ERR_05300_CANT_DECODE_CHANGE_TYPE" ),
@@ -770,6 +776,7 @@ public enum I18n
     ERR_13636_INVALID_END_ESCAPED_CHARACTER( "ERR_13636_INVALID_END_ESCAPED_CHARACTER" ),
     ERR_13637_LDAPV2_QUOTED_VALUE_NOT_ACCEPTED( "ERR_13637_LDAPV2_QUOTED_VALUE_NOT_ACCEPTED" ),
     ERR_13638_WRONG_ATTRIBUTE_TYPE( "ERR_13638_WRONG_ATTRIBUTE_TYPE" ),
+    ERR_13639_UTILITY_CLASS_CANT_BE_INSTANCIATED( "ERR_13639_UTILITY_CLASS_CANT_BE_INSTANCIATED" ),
     
     //     schema                           13700 - 13899
     ERR_13700_CANNOT_MODIFY_LOCKED_SCHEMA_OBJECT( "ERR_13700_CANNOT_MODIFY_LOCKED_SCHEMA_OBJECT" ),
@@ -953,6 +960,7 @@ public enum I18n
     ERR_13906_SS_INVALID_ITEM( "ERR_13906_SS_INVALID_ITEM" ),
     ERR_13907_REQUIRED_SPACE_SS_SPEC_EXCLUSIONS( "ERR_13907_REQUIRED_SPACE_SS_SPEC_EXCLUSIONS" ),
     ERR_13908_SS_INVALID_DN( "ERR_13908_SS_INVALID_DN" ),
+    ERR_13909_SUBTREE_SPECIFICATION_REFINEMENT_TOO_DEEP( "ERR_13909_SUBTREE_SPECIFICATION_REFINEMENT_TOO_DEEP" ),
     
     // api-ldap-net-mina                14000 - 14999
     ERR_14000_ERROR_ENCODING_MESSAGE( "ERR_14000_ERROR_ENCODING_MESSAGE" ),
@@ -1370,7 +1378,17 @@ public enum I18n
     MSG_05185_MODIFY_REQUEST( "MSG_05185_MODIFY_REQUEST" ),
 
     //     api                              5200-5299
-    MSG_5200_DECODED_LDAP_MESSAGE( "MSG_5200_DECODED_LDAP_MESSAGE" ),
+    MSG_05200_DECODED_LDAP_MESSAGE( "MSG_05200_DECODED_LDAP_MESSAGE" ),
+    MSG_05201_MESSAGE_RECEIVED( "MSG_05201_MESSAGE_RECEIVED" ),
+    MSG_05202_WILL_NOT_USE_SASL_ON_RECEIVE( "MSG_05202_WILL_NOT_USE_SASL_ON_RECEIVE" ),
+    MSG_05203_PARTIAL_SASL_LENGTH_PREFIX( "MSG_05203_PARTIAL_SASL_LENGTH_PREFIX" ),
+    MSG_05204_PARTIAL_SASL_MESSAGE( "MSG_05204_PARTIAL_SASL_MESSAGE" ),
+    MSG_05205_WILL_USE_SASL_UNWRAP( "MSG_05205_WILL_USE_SASL_UNWRAP" ),
+    MSG_05206_FILTERING_WRITE_REQUEST( "MSG_05206_FILTERING_WRITE_REQUEST" ),
+    MSG_05207_DISABLING_SASL_FILTER( "MSG_05207_DISABLING_SASL_FILTER" ),
+    MSG_05208_WILL_NOT_USE_SASL_ON_WRITE( "MSG_05208_WILL_NOT_USE_SASL_ON_WRITE" ),
+    MSG_05209_SENDING_ENCRYPTED_TOKEN( "MSG_05209_SENDING_ENCRYPTED_TOKEN" ),
+    MSG_05210_WILL_USE_SASL_WRAP( "MSG_05210_WILL_USE_SASL_WRAP" ),
 
     //     controls                         5300-5399
     MSG_05300_CHANGE_TYPE( "MSG_05300_CHANGE_TYPE" ),
@@ -1407,6 +1425,48 @@ public enum I18n
     MSG_07002_DN_PARSED( "MSG_07002_DN_PARSED" ),
     MSG_07003_OID_PARSED( "MSG_07003_OID_PARSED" ),
     MSG_07004_ACI_ITEM_OR_USER_FIRST_ID_NOT_REQUIRED( "MSG_07004_ACI_ITEM_OR_USER_FIRST_ID_NOT_REQUIRED" ),
+    MSG_07005_CHECK_ACI_ITEM( "MSG_07005_CHECK_ACI_ITEM" ),
+    MSG_07006_PARSING_DN( "MSG_07006_PARSING_DN" ),
+    MSG_07007_PARSING_GRANT_AND_DENIAL( "MSG_07007_PARSING_GRANT_AND_DENIAL" ),
+    MSG_07008_PARSING_ITEM_PERMISSION( "MSG_07008_PARSING_ITEM_PERMISSION" ),
+    MSG_07009_PARSING_MAX_COUNT( "MSG_07009_PARSING_MAX_COUNT" ),
+    MSG_07010_PARSING_MAX_VALUE_COUNT( "MSG_07010_PARSING_MAX_VALUE_COUNT" ),
+    MSG_07011_PARSING_PROTECTED_ITEM( "MSG_07011_PARSING_PROTECTED_ITEM" ),
+    MSG_07012_PARSING_REFINEMENT( "MSG_07012_PARSING_REFINEMENT" ),
+    MSG_07013_PARSING_RESTRICTED_VALUE( "MSG_07013_PARSING_RESTRICTED_VALUE" ),
+    MSG_07014_PARSING_SPECIFIC_EXCLUSION( "MSG_07014_PARSING_SPECIFIC_EXCLUSION" ),
+    MSG_07015_PARSING_SUBTREE_SPECIFICATION( "MSG_07015_PARSING_SUBTREE_SPECIFICATION" ),
+    MSG_07016_PARSING_TYPE( "MSG_07016_PARSING_TYPE" ),
+    MSG_07017_PARSING_USER_CLASS( "MSG_07017_PARSING_USER_CLASS" ),
+    MSG_07018_PARSING_USER_PERMISSION( "MSG_07018_PARSING_USER_PERMISSION" ),
+    MSG_07019_PARSING_ACI_ITEM( "MSG_07019_PARSING_ACI_ITEM" ),
+    MSG_07020_PARSING_ACI_ITEM_AUTHENT_LEVEL( "MSG_07020_PARSING_ACI_ITEM_AUTHENT_LEVEL" ),
+    MSG_07021_PARSING_ACI_ITEM_ID_TAG( "MSG_07021_PARSING_ACI_ITEM_ID_TAG" ),
+    MSG_07022_PARSING_ACI_ITEM_ITEM_OR_USER_FIRST( "MSG_07022_PARSING_ACI_ITEM_ITEM_OR_USER_FIRST" ),
+    MSG_07023_PARSING_ACI_ITEM_PRECEDENCE( "MSG_07023_PARSING_ACI_ITEM_PRECEDENCE" ),
+    MSG_07024_PARSING_ATTRIBUTE_TYPE_SET( "MSG_07024_PARSING_ATTRIBUTE_TYPE_SET" ),
+    MSG_07025_PARSING_BASE( "MSG_07025_PARSING_BASE" ),
+    MSG_07026_PARSING_CHOP_AFTER( "MSG_07026_PARSING_CHOP_AFTER" ),
+    MSG_07027_PARSING_CHOP_BEFORE( "MSG_07027_PARSING_CHOP_BEFORE" ),
+    MSG_07028_PARSING_DNS( "MSG_07028_PARSING_DNS" ),
+    MSG_07029_PARSING_GRANT_AND_DENIALS( "MSG_07029_PARSING_GRANT_AND_DENIALS" ),
+    MSG_07030_PARSING_ITEM_FIRST( "MSG_07030_PARSING_ITEM_FIRST" ),
+    MSG_07031_PARSING_ITEM_PERMISSION_GAD( "MSG_07031_PARSING_ITEM_PERMISSION_GAD" ),
+    MSG_07032_PARSING_ITEM_PERMISSION_PRECEDENCE( "MSG_07032_PARSING_ITEM_PERMISSION_PRECEDENCE" ),
+    MSG_07033_PARSING_ITEM_PERMISSION_USER_CLASS( "MSG_07033_PARSING_ITEM_PERMISSION_USER_CLASS" ),
+    MSG_07034_PARSING_ITEM_PERMISSIONS( "MSG_07034_PARSING_ITEM_PERMISSIONS" ),
+    MSG_07035_PARSING_MAXIMUM( "MSG_07035_PARSING_MAXIMUM" ),
+    MSG_07036_PARSING_MINIMUM( "MSG_07036_PARSING_MINIMUM" ),
+    MSG_07037_PARSING_PROTECTED_ITEMS( "MSG_07037_PARSING_PROTECTED_ITEMS" ),
+    MSG_07038_PARSING_REFINEMENTS( "MSG_07038_PARSING_REFINEMENTS" ),
+    MSG_07039_PARSING_SPECIFIC_EXCLUSIONS( "MSG_07039_PARSING_SPECIFIC_EXCLUSIONS" ),
+    MSG_07040_PARSING_USER_CLASSES( "MSG_07040_PARSING_USER_CLASSES" ),
+    MSG_07041_PARSING_USER_FIRST( "MSG_07041_PARSING_USER_FIRST" ),
+    MSG_07042_PARSING_USER_PERMISSION_GAD( "MSG_07042_PARSING_USER_PERMISSION_GAD" ),
+    MSG_07043_PARSING_USER_PERMISSION_PRECEDENCE( "MSG_07043_PARSING_USER_PERMISSION_PRECEDENCE" ),
+    MSG_07044_PARSING_USER_PERMISSION_PROTECTED_ITEM( "MSG_07044_PARSING_USER_PERMISSION_PROTECTED_ITEM" ),
+    MSG_07045_PARSING_USER_PERMISSIONS( "MSG_07045_PARSING_USER_PERMISSIONS" ),
+    MSG_07046_PARSING_VALUES_IN( "MSG_07046_PARSING_VALUES_IN" ),
 
     // api-ldap-extras-codec            8000-8999
     //     <>                               8000-8099
@@ -1518,6 +1578,8 @@ public enum I18n
     MSG_13600_DN_NOT_IN_CACHE_CREATING( "MSG_13600_DN_NOT_IN_CACHE_CREATING" ),
     MSG_13601_DN_FOUND_IN_CACHE( "MSG_13601_DN_FOUND_IN_CACHE" ),
     MSG_13602_PARSED_ATTRIBUTE_TYPE( "MSG_13602_PARSED_ATTRIBUTE_TYPE" ),
+    MSG_13603_DN_CACHE_HIT( "MSG_13603_DN_CACHE_HIT" ),
+    MSG_13604_CANNOT_PARSE_ATTRIBUTE_TYPE( "MSG_13604_CANNOT_PARSE_ATTRIBUTE_TYPE" ),
 
     //     schema                           13700 - 13899
     MSG_13700_FAILED_TO_NORMALIZE( "MSG_13700_FAILED_TO_NORMALIZE" ),
diff --git a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index c34cef8d9..8cb8828a9 100644
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@ -124,6 +124,7 @@ ERR_03045_UNIDENTIFIED_RESPONSE_TYPE=Unidentified search resp type
 ERR_03046_FILTER_MAX_DEPTH_EXCEEDED=The search filter is nested more than {0} levels deep. Use LdapMessageContainer.setMaxFilterDepth( int ) if deeper filters really have to be accepted.
 ERR_03047_INVALID_BASE64_VALUE=Invalid Base 64 encoded value : {0}
 ERR_03048_FILTER_TOO_DEEP=The filter is nested more than {0} levels deep. Use SearchRequestDsml.setMaxFilterDepth( int ) if deeper filters really have to be accepted."
+ERR_03049_DN_ATTRIBUTE_REQUIRED=dn attribute is required
 
 # dsml-engine
 
@@ -212,7 +213,10 @@ ERR_04178_CANT_LOAD_KEY_STORE=LdapClientTrustStoreManager.loadTrustManagers caug
 ERR_04179_TRUST_STORE_CANT_BE_READ=LdapClientTrustStoreManager.getTrustStore finally block on input stream close operation caught IOException={0}
 ERR_04180_FILE_DOES_NOT_EXIST_ON_CLASSPATH=LdapClientTrustStoreManager.getTrustStoreInputStream file does not exist on classpath
 ERR_04181_INVALID_FILTER_ATTRIBUTE_DESCRIPTIONT=Invalid attribute description : {0}
-ERR_04182_INVALID_MATCHING_RULE: Invalid Matching Rule : {0}
+ERR_04182_INVALID_MATCHING_RULE= Invalid Matching Rule : {0}
+ERR_04183_TRUSTMANAGERS_CANT_BE_NULL=TrustManagers must not be null or empty
+ERR_04184_FAILED_RELEASE_CONNECTION=Failed to release connection to pool
+ERR_04185_CANT_READ_SCHEMA=Unable to read schema at: {0}
 
 # api-ldap-client-api template      4200-4300
 
@@ -294,6 +298,8 @@ ERR_05203_CODEC_ARGS_CANNOT_BE_NULL=Codec argument cannot be null
 ERR_05204_LDAP_DECODER_FAILURE=Ldap decoder failure: {0}
 ERR_05205_PDU_DOES_NOT_CONTAIN_ENOUGH_DATA=Ldap decoder failure, PDU does not contain enough data
 ERR_05206_INPUT_STREAM_TOO_SHORT_PDU=The input stream does not contain a full PDU
+ERR_05207_INVALID_SASL_LENGTH_PREFIX=Invalid SASL length prefix {0}, negotiated receive buffer size limit: {1}
+ERR_0528_NEGOCIATED_MAX_BUFFER_TOO_SMALL=0Negotiated max buffer size {0} is too small to wrap any data
 
 # api-ldap-codec-core controls  5300-5399
 ERR_05300_CANT_DECODE_CHANGE_TYPE=failed to decode the changeType for EntryChangeControl
@@ -759,7 +765,7 @@ ERR_13635_INVALID_VALUE_CHARACTER=The Value character ''{0}'' is invalid
 ERR_13636_INVALID_END_ESCAPED_CHARACTER=The RDN ends with an ''\'' characters without the following any following character
 ERR_13637_LDAPV2_QUOTED_VALUE_NOT_ACCEPTED=Quoted values aren''t any more accepted
 ERR_13638_WRONG_ATTRIBUTE_TYPE=Wrong attributeType ''{}'' at {}
-
+ERR_13639_UTILITY_CLASS_CANT_BE_INSTANCIATED=This is a utility class and cannot be instantiated
 
 # api-ldap-model schema          13700-13899
 ERR_13700_CANNOT_MODIFY_LOCKED_SCHEMA_OBJECT=Cannot modify the SchemaObject {0}, it has been locked
@@ -943,6 +949,7 @@ ERR_13905_REQUIRED_SPACE_SS_SPEC_FILTER=A space is required in a SubtreeSpecific
 ERR_13906_SS_INVALID_ITEM=The SubtreeSpecification item OID ''{0}'' does not exist
 ERR_13907_REQUIRED_SPACE_SS_SPEC_EXCLUSIONS=A space is required in a SubtreeSpecification exclusions
 ERR_13908_SS_INVALID_DN=The SubtreeSpecification DN ''{0}'' is invalid
+ERR_13909_SUBTREE_SPECIFICATION_REFINEMENT_TOO_DEEP=The subtreeSpecification refinement is nested deeper than {0} levels
 
 # api-ldap-net-mina 14000-14999
 ERR_14000_ERROR_ENCODING_MESSAGE=Error while encoding message {0}: {1} 
diff --git a/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties b/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
index 84ad63f72..0c1d21f4e 100644
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
@@ -234,7 +234,17 @@ MSG_05184_SEARCH_REFERENCE_URL=Search reference URL found: {0}
 MSG_05185_MODIFY_REQUEST=Modify Request
 
 # api-ldap-codec-core api       5200-5299
-MSG_5200_DECODED_LDAP_MESSAGE=Decoded LdapMessage: {0}
+MSG_05200_DECODED_LDAP_MESSAGE=Decoded LdapMessage: {0}
+MSG_05201_MESSAGE_RECEIVED=Message received:  {0}
+MSG_05202_WILL_NOT_USE_SASL_ON_RECEIVE=Will not use SASL on received message.
+MSG_05203_PARTIAL_SASL_LENGTH_PREFIX=Partial SASL length prefix received:  {0}/{1}
+MSG_05204_PARTIAL_SASL_MESSAGE=Partial SASL message received:  {0}/{1}
+MSG_05205_WILL_USE_SASL_UNWRAP=Will use SASL to unwrap received message of length: {0}
+MSG_05206_FILTERING_WRITE_REQUEST=Filtering write request:  {0}
+MSG_05207_DISABLING_SASL_FILTER=Disabling SaslFilter once; will not use SASL on write request.
+MSG_05208_WILL_NOT_USE_SASL_ON_WRITE=Will not use SASL on write request.
+MSG_05209_SENDING_ENCRYPTED_TOKEN=Sending encrypted token of length {0}.
+MSG_05210_WILL_USE_SASL_WRAP=Will use SASL to wrap message of length: {0}
 
 # api-ldap-codec-core controls  5300-5399
 MSG_05300_CHANGE_TYPE=changeType = {0}
@@ -270,6 +280,49 @@ MSG_07001_FILTER_SET_PARSED=filterParser parsed {0}
 MSG_07002_DN_PARSED=recognized a DistinguishedName: {0} 
 MSG_07003_OID_PARSED=recognized an oid: {0}
 MSG_07004_ACI_ITEM_OR_USER_FIRST_ID_NOT_REQUIRED=The ''itemOrUserFirst'' token is not required and should be removed at {0}
+MSG_07005_CHECK_ACI_ITEM=Check the ACIItem ''{0}''
+MSG_07006_PARSING_DN=Parsing a DN: {0}
+MSG_07007_PARSING_GRANT_AND_DENIAL=Parsing a grantAndDenial: {0}, {1}
+MSG_07008_PARSING_ITEM_PERMISSION=Parsing a itemPermission: {0}
+MSG_07009_PARSING_MAX_COUNT=Parsing a maxCount: {0}
+MSG_07010_PARSING_MAX_VALUE_COUNT=Parsing a maxValueCount: {0}
+MSG_07011_PARSING_PROTECTED_ITEM=Parsing a protecteItem: {0}, {1}
+MSG_07012_PARSING_REFINEMENT=Parsing a refinement: {0}, {1}
+MSG_07013_PARSING_RESTRICTED_VALUE=Parsing a restrictedValue: {0}
+MSG_07014_PARSING_SPECIFIC_EXCLUSION=Parsing a specificExclusion: {0}
+MSG_07015_PARSING_SUBTREE_SPECIFICATION=Parsing a subtreeSpecification: {0}
+MSG_07016_PARSING_TYPE=Parsing a type: {0}
+MSG_07017_PARSING_USER_CLASS=Parsing a userClass: {0}, {1}
+MSG_07018_PARSING_USER_PERMISSION=Parsing a userPermission: {0}
+MSG_07019_PARSING_ACI_ITEM=Parsing ACIItem: ''{0}''
+MSG_07020_PARSING_ACI_ITEM_AUTHENT_LEVEL=Parsing ACIItem's authenticationLevel: {0}
+MSG_07021_PARSING_ACI_ITEM_ID_TAG=Parsing ACIItem's identificationTag: {0}
+MSG_07022_PARSING_ACI_ITEM_ITEM_OR_USER_FIRST=Parsing ACIItem's itemOrUserFirst: {0}
+MSG_07023_PARSING_ACI_ITEM_PRECEDENCE=Parsing ACIItem's precedence: {0}
+MSG_07024_PARSING_ATTRIBUTE_TYPE_SET=Parsing attributeTypeSet: {0}
+MSG_07025_PARSING_BASE=Parsing base: {0}
+MSG_07026_PARSING_CHOP_AFTER=Parsing chopAfter: {0}
+MSG_07027_PARSING_CHOP_BEFORE=Parsing chopBefore: {0}
+MSG_07028_PARSING_DNS=Parsing DNs: {0}
+MSG_07029_PARSING_GRANT_AND_DENIALS=Parsing grantAndDenials: {0}
+MSG_07030_PARSING_ITEM_FIRST=Parsing itemFirst: {0}
+MSG_07031_PARSING_ITEM_PERMISSION_GAD=Parsing itemPermission''s grantsAndDenials: {0}
+MSG_07032_PARSING_ITEM_PERMISSION_PRECEDENCE=Parsing itemPermission''s precedence: {0}
+MSG_07033_PARSING_ITEM_PERMISSION_USER_CLASS=Parsing itemPermission''s userClass: {0}
+MSG_07034_PARSING_ITEM_PERMISSIONS=Parsing itemPermissions: {0}
+MSG_07035_PARSING_MAXIMUM=Parsing maximum: {0}
+MSG_07036_PARSING_MINIMUM=Parsing minimum: {0}
+MSG_07037_PARSING_PROTECTED_ITEMS=Parsing protectedItems: {0}
+MSG_07038_PARSING_REFINEMENTS=Parsing refinements: {0}
+MSG_07039_PARSING_SPECIFIC_EXCLUSIONS=Parsing specificExclusions: {0}
+MSG_07040_PARSING_USER_CLASSES=Parsing userClasses: {0}
+MSG_07041_PARSING_USER_FIRST=Parsing userFirst: {0}
+MSG_07042_PARSING_USER_PERMISSION_GAD=Parsing userPermission''s grantsAndDenials: {0}
+MSG_07043_PARSING_USER_PERMISSION_PRECEDENCE=Parsing userPermission''s precedence: {0}
+MSG_07044_PARSING_USER_PERMISSION_PROTECTED_ITEM=Parsing userPermission''s protectedItems: {0}
+MSG_07045_PARSING_USER_PERMISSIONS=Parsing userPermissions: {0}
+MSG_07046_PARSING_VALUES_IN=Parsing valuesIn: {0}
+
 
 # none
 
@@ -385,6 +438,8 @@ MSG_13500_ATTRIBUTE_NOT_IN_SCHEMA=Requested attribute {0} does not exist in the
 MSG_13600_DN_NOT_IN_CACHE_CREATING=Dn {} not found in the cache, creating
 MSG_13601_DN_FOUND_IN_CACHE=Dn {} found in the cache
 MSG_13602_PARSED_ATTRIBUTE_TYPE=Parsed attributeType ''{}''
+MSG_13603_DN_CACHE_HIT=Dn cache hit - {0} , miss - {1} and is normalized = {2}
+MSG_13604_CANNOT_PARSE_ATTRIBUTE_TYPE=Cannot parse an attributeType at {0}
 
 # api-ldap-model schema       13700-13899
 MSG_13700_FAILED_TO_NORMALIZE=Failed to normalize: {0}
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
index a4019b57d..3681f5e18 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
@@ -320,7 +320,7 @@ public class DefaultSchemaLoader extends AbstractSchemaLoader
         {
             if ( !subschemaSubentryCursor.next() )
             {
-                throw new LdapException( "Unable to read schema at: " + subschemaSubentryDn );
+                throw new LdapException( I18n.err(  I18n.ERR_04185_CANT_READ_SCHEMA, subschemaSubentryDn ) );
             }
             Entry subschemaSubentry = subschemaSubentryCursor.get();
 
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
index 606ea9075..0729e22bc 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
@@ -615,10 +615,11 @@ public class LdapConnectionConfig
     public void setTrustManagers( TrustManager... trustManagers )
     {
         if ( ( trustManagers == null ) || ( trustManagers.length == 0 )
-            || ( trustManagers.length == 1 && trustManagers[0] == null ) )
+            || ( ( trustManagers.length == 1 ) && ( trustManagers[0] == null ) ) )
         {
-            throw new IllegalArgumentException( "TrustManagers must not be null or empty" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_04183_TRUSTMANAGERS_CANT_BE_NULL ) );
         }
+        
         this.trustManagers = trustManagers;
     }
 
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/PooledLdapConnection.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/PooledLdapConnection.java
index 5f8dcc12a..f4c2c91db 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/PooledLdapConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/PooledLdapConnection.java
@@ -21,6 +21,8 @@
 package org.apache.directory.ldap.client.api;
 
 import java.io.IOException;
+
+import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 
 /**
@@ -62,7 +64,7 @@ public class PooledLdapConnection extends LdapConnectionWrapper
         }
         catch ( LdapException e )
         {
-            throw new IOException( "Failed to release connection to pool", e );
+            throw new IOException( I18n.err( I18n.ERR_04184_FAILED_RELEASE_CONNECTION ), e );
         }
     }
 
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapDecoder.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapDecoder.java
index d4ada6727..72b0a87ed 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapDecoder.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapDecoder.java
@@ -98,7 +98,7 @@ public class LdapDecoder
         {
             if ( LOG.isDebugEnabled() )
             {
-                LOG.debug( I18n.msg( I18n.MSG_5200_DECODED_LDAP_MESSAGE, container ) );
+                LOG.debug( I18n.msg( I18n.MSG_05200_DECODED_LDAP_MESSAGE, container ) );
             }
 
             return container.getMessage();
diff --git a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/SaslFilter.java b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/SaslFilter.java
index 4ca786017..db5b6a65e 100644
--- a/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/SaslFilter.java
+++ b/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/SaslFilter.java
@@ -25,6 +25,7 @@ import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
+import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.constants.SaslQoP;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
@@ -168,11 +169,11 @@ public class SaslFilter extends IoFilterAdapter
     public synchronized void messageReceived( NextFilter nextFilter, IoSession session, Object message )
         throws SaslException
     {
-        LOG.debug( "Message received:  {}", message );
+        LOG.debug( I18n.msg( I18n.MSG_05201_MESSAGE_RECEIVED, message ) );
 
         if ( !hasSecurityLayer )
         {
-            LOG.debug( "Will not use SASL on received message." );
+            LOG.debug( I18n.msg( I18n.MSG_05202_WILL_NOT_USE_SASL_ON_RECEIVE ) );
             nextFilter.messageReceived( session, message );
             return;
         }
@@ -212,7 +213,7 @@ public class SaslFilter extends IoFilterAdapter
 
                 if ( lengthOffset < lengthBytes.length )
                 {
-                    LOG.debug( "Partial SASL length prefix received:  {}/{}", lengthOffset, lengthBytes.length );
+                    LOG.debug( I18n.msg( I18n.MSG_05203_PARTIAL_SASL_LENGTH_PREFIX, lengthOffset, lengthBytes.length ) );
                     session.setAttribute( LENGTH_BYTES, lengthBytes );
                     session.setAttribute( LENGTH_OFFSET, lengthOffset );
                     break;
@@ -233,9 +234,7 @@ public class SaslFilter extends IoFilterAdapter
                  */
                 if ( ( bufferSize <= 0 ) || ( bufferSize > maxBufferSize ) )
                 {
-                    throw new SaslException(
-                        "Invalid SASL length prefix " + bufferSize
-                            + ", negotiated receive buffer size limit: " + maxBufferSize );
+                    throw new SaslException( I18n.err( I18n.ERR_05207_INVALID_SASL_LENGTH_PREFIX, bufferSize, maxBufferSize ) );
                 }
 
                 bytes = new byte[bufferSize];
@@ -255,7 +254,7 @@ public class SaslFilter extends IoFilterAdapter
             offset += length;
             if ( offset < bytes.length )
             {
-                LOG.debug( "Partial SASL message received:  {}/{}", offset, bytes.length );
+                LOG.debug( I18n.msg( I18n.MSG_05204_PARTIAL_SASL_MESSAGE, offset, bytes.length ) );
                 session.setAttribute( BYTES, bytes );
                 session.setAttribute( OFFSET, offset );
                 break;
@@ -264,7 +263,7 @@ public class SaslFilter extends IoFilterAdapter
             /*
              * Unwrap the SASL message and forward it to the next filter.
              */
-            LOG.debug( "Will use SASL to unwrap received message of length:  {}", bytes.length );
+            LOG.debug( I18n.msg( I18n.MSG_05205_WILL_USE_SASL_UNWRAP, bytes.length ) );
             byte[] token = unwrap( bytes, 0, bytes.length );
             nextFilter.messageReceived( session, IoBuffer.wrap( token ) );
 
@@ -281,7 +280,7 @@ public class SaslFilter extends IoFilterAdapter
     public synchronized void filterWrite( NextFilter nextFilter, IoSession session, WriteRequest writeRequest )
         throws SaslException
     {
-        LOG.debug( "Filtering write request:  {}", writeRequest );
+        LOG.debug( I18n.msg( I18n.MSG_05206_FILTERING_WRITE_REQUEST, writeRequest ) );
 
         /*
          * Check if security layer processing should be disabled once.
@@ -289,7 +288,7 @@ public class SaslFilter extends IoFilterAdapter
         if ( session.containsAttribute( DISABLE_SECURITY_LAYER_ONCE ) )
         {
             // Remove the marker attribute because it is temporary.
-            LOG.debug( "Disabling SaslFilter once; will not use SASL on write request." );
+            LOG.debug( I18n.msg( I18n.MSG_05207_DISABLING_SASL_FILTER ) );
             session.removeAttribute( DISABLE_SECURITY_LAYER_ONCE );
             nextFilter.filterWrite( session, writeRequest );
             return;
@@ -297,7 +296,7 @@ public class SaslFilter extends IoFilterAdapter
 
         if ( !hasSecurityLayer )
         {
-            LOG.debug( "Will not use SASL on write request." );
+            LOG.debug( I18n.msg( I18n.MSG_05208_WILL_NOT_USE_SASL_ON_WRITE ) );
             nextFilter.filterWrite( session, writeRequest );
             return;
         }
@@ -314,7 +313,7 @@ public class SaslFilter extends IoFilterAdapter
         byte[] bufferBytes = new byte[bufferLength];
         buf.get( bufferBytes );
 
-        LOG.info( "Will use SASL to wrap message of length:  {}", bufferLength );
+        LOG.info( I18n.msg( I18n.MSG_05210_WILL_USE_SASL_WRAP, bufferLength ) );
 
         /*
          * Ensure to not send larger SASL message than negotiated.
@@ -323,8 +322,7 @@ public class SaslFilter extends IoFilterAdapter
 
         if ( max <= 0 )
         {
-            throw new SaslException( "Negotiated max buffer size " + maxBufferSize
-                + " is too small to wrap any data" );
+            throw new SaslException( I18n.err(  I18n.ERR_0528_NEGOCIATED_MAX_BUFFER_TOO_SMALL, maxBufferSize ) );
         }
 
         for ( int offset = 0; offset < bufferLength; offset += max )
@@ -341,7 +339,7 @@ public class SaslFilter extends IoFilterAdapter
             saslLayerBuffer.position( 0 );
             saslLayerBuffer.limit( 4 + saslLayer.length );
 
-            LOG.debug( "Sending encrypted token of length {}.", saslLayerBuffer.limit() );
+            LOG.debug( I18n.msg( I18n.MSG_05209_SENDING_ENCRYPTED_TOKEN, saslLayerBuffer.limit() ) );
             nextFilter.filterWrite( session, new DefaultWriteRequest( saslLayerBuffer, writeRequest.getFuture() ) );
         }
     }
diff --git a/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java b/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java
index a2555fc68..7618e3706 100644
--- a/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java
+++ b/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java
@@ -248,7 +248,7 @@ public class ACIItemParser
     private SubtreeSpecification parseSubtreeSpecification( boolean action, String item, Position pos ) 
             throws ParseException
     {
-        LOG.debug( "Parsing a subtreeSpecification: {}", pos );
+        LOG.debug( I18n.msg(  I18n.MSG_07015_PARSING_SUBTREE_SPECIFICATION, pos ) );
         SubtreeSpecificationModifier ssModifier = null;
         
         if ( action == PARSE )
@@ -313,7 +313,7 @@ public class ACIItemParser
             {
                 case ID_BASE:
                     // ID_base
-                    LOG.debug( "Parsing base: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07025_PARSING_BASE, pos ) );
 
                     if ( baseSeen )
                     {
@@ -337,7 +337,7 @@ public class ACIItemParser
                     
                 case ID_MINIMUM:
                     // ID_minimum
-                    LOG.debug( "Parsing minimum: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07036_PARSING_MINIMUM, pos ) );
 
                     if ( minimumSeen )
                     {
@@ -361,7 +361,7 @@ public class ACIItemParser
                     
                 case ID_MAXIMUM:
                     // ID_maximum
-                    LOG.debug( "Parsing maximum: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07035_PARSING_MAXIMUM, pos ) );
 
                     if ( maximumSeen )
                     {
@@ -385,7 +385,7 @@ public class ACIItemParser
                     
                 case ID_SPECIFIC_EXCLUSIONS:
                     // ID_specificExclusions
-                    LOG.debug( "Parsing a specificExclusion: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07014_PARSING_SPECIFIC_EXCLUSION, pos ) );
 
                     if ( specificExclusionsSeen )
                     {
@@ -425,7 +425,7 @@ public class ACIItemParser
      */
     private Dn parseDn( String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing a DN: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07006_PARSING_DN, pos ) );
 
         String dnStr = parseQuotedSafeUtf8( item, pos );
         Dn dn = null;
@@ -469,7 +469,7 @@ public class ACIItemParser
     private void parseSpecificExclusions( boolean action, String item, Position pos,
             SubtreeSpecificationModifier ssModifier ) throws ParseException
     {
-        LOG.debug( "Parsing specificExclusions: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07039_PARSING_SPECIFIC_EXCLUSIONS, pos ) );
 
         // OPEN_CURLY
         matchChar( item, LCURLY, pos );
@@ -526,7 +526,7 @@ public class ACIItemParser
             {
                 case ID_CHOP_BEFORE:
                     // ID_chopBefore
-                    LOG.debug( "Parsing chopBefore: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07027_PARSING_CHOP_BEFORE, pos ) );
 
                     if ( action == PARSE )
                     {
@@ -537,7 +537,7 @@ public class ACIItemParser
                     
                 case ID_CHOP_AFTER:
                     // ID_chopAfter
-                    LOG.debug( "Parsing chopAfter: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07026_PARSING_CHOP_AFTER, pos ) );
 
                     if ( action == PARSE )
                     {
@@ -629,7 +629,7 @@ public class ACIItemParser
     private GrantAndDenial parseGrantAndDenial( String item, Position pos ) throws ParseException
     {
         String token = getToken( item, pos );
-        LOG.debug( "Parsing a grantAndDenial: {], {}", token, pos );
+        LOG.debug( I18n.msg( I18n.MSG_07007_PARSING_GRANT_AND_DENIAL, token, pos ) );
 
         
         switch ( Strings.toLowerCaseAscii( token ) )
@@ -764,7 +764,7 @@ public class ACIItemParser
             throws ParseException
     {
         String token = Strings.toLowerCaseAscii( getToken( item, pos ) );
-        LOG.debug( "Parsing a protecteItem: {}, {}", token, pos );
+        LOG.debug( I18n.msg( I18n.MSG_07011_PARSING_PROTECTED_ITEM, token, pos ) );
         
         try
         {
@@ -1149,7 +1149,7 @@ public class ACIItemParser
      */
     private Set<ProtectedItem> parseProtectedItems( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing protecteItems: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07037_PARSING_PROTECTED_ITEMS, pos ) );
 
         // The ID_protectedItems token has already been read by the caller function
         // ( SP )*
@@ -1235,7 +1235,7 @@ public class ACIItemParser
     private Set<GrantAndDenial> parseGrantAndDenials( boolean action, String item, Position pos ) 
             throws ParseException
     {
-        LOG.debug( "Parsing grantAndDenials: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07029_PARSING_GRANT_AND_DENIALS, pos ) );
 
         // ( SP )*
         skipSpaces( item, pos, ZERO_N );
@@ -1320,7 +1320,7 @@ public class ACIItemParser
      */
     private List<ExprNode> parseRefinements( boolean action, String item, int depth, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing refinements: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07038_PARSING_REFINEMENTS, pos ) );
 
         // OPEN_CURLY
         matchChar( item, LCURLY, pos );
@@ -1405,7 +1405,7 @@ public class ACIItemParser
         }
 
         String token = getToken( item, pos );
-        LOG.debug( "Parsing a refinement: {}, {}", token, pos );
+        LOG.debug( I18n.msg( I18n.MSG_07012_PARSING_REFINEMENT, token, pos ) );
 
         ExprNode node = null;
         
@@ -1521,7 +1521,7 @@ public class ACIItemParser
      */
     private MaxValueCountElem parseMaxValueCount( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing a maxValueCount: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07010_PARSING_MAX_VALUE_COUNT, pos ) );
 
         // OPEN_CURLY
         matchChar( item, LCURLY, pos );
@@ -1537,7 +1537,7 @@ public class ACIItemParser
         {
             case ID_TYPE:
                 // ID_type
-                LOG.debug( "Parsing a type: {}", pos );
+                LOG.debug( I18n.msg( I18n.MSG_07016_PARSING_TYPE, pos ) );
 
                 // ( SP )+
                 if ( !skipSpaces( item, pos, ONE_N ) )
@@ -1578,7 +1578,7 @@ public class ACIItemParser
                 
             case ID_MAX_COUNT:
                 // ID_maxCount
-                LOG.debug( "Parsing a maxCount: {}", pos );
+                LOG.debug( I18n.msg( I18n.MSG_07009_PARSING_MAX_COUNT, pos ) );
 
                 // ( SP )+ 
                 if ( !skipSpaces( item, pos, ONE_N ) )
@@ -1682,7 +1682,7 @@ public class ACIItemParser
      */
     private RestrictedByElem parseRestrictedValue( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing a restrictedValue: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07013_PARSING_RESTRICTED_VALUE, pos ) );
 
         // OPEN_CURLY
         matchChar( item, LCURLY, pos );
@@ -1698,7 +1698,7 @@ public class ACIItemParser
         {
             // ID_type
             case ID_TYPE:
-                LOG.debug( "Parsing a type: {}", pos );
+                LOG.debug( I18n.msg( I18n.MSG_07016_PARSING_TYPE, pos ) );
 
                 // ( SP )+
                 if ( !skipSpaces( item, pos, ONE_N ) )
@@ -1739,7 +1739,7 @@ public class ACIItemParser
                 
             case ID_VALUES_IN:
                 // ID_valuesIn
-                LOG.debug( "Parsing valuesIn: {}", pos );
+                LOG.debug( I18n.msg( I18n.MSG_07046_PARSING_VALUES_IN, pos ) );
 
                 // ( SP ) +
                 if ( !skipSpaces( item, pos, ONE_N ) )
@@ -1866,7 +1866,7 @@ public class ACIItemParser
      */
     private Set<String> parseDNs( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing DNs: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07006_PARSING_DN, pos ) );
 
         Set<String> names = new HashSet<>();
         boolean isFirst = true;
@@ -1965,7 +1965,7 @@ public class ACIItemParser
             throws ParseException
     {
         String token = getToken(  item, pos );
-        LOG.debug( "Parsing a userClass: {}, {}", token, pos );
+        LOG.debug( I18n.msg( I18n.MSG_07017_PARSING_USER_CLASS, token, pos ) );
 
 
         try 
@@ -2140,7 +2140,7 @@ public class ACIItemParser
     private Set<ItemPermission> parseItemPermissions( boolean action, String item, Position pos ) 
             throws ParseException
     {
-        LOG.debug( "Parsing itemPermissions: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07034_PARSING_ITEM_PERMISSIONS, pos ) );
 
         Set<ItemPermission> itemPermissions = null;
         
@@ -2231,7 +2231,7 @@ public class ACIItemParser
      */
     private ItemPermission parseItemPermission( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing a itemPermission: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07008_PARSING_ITEM_PERMISSION, pos ) );
 
         ItemPermission itemPermission = null;
         int precedence = 0;
@@ -2268,7 +2268,7 @@ public class ACIItemParser
             switch ( Strings.toLowerCaseAscii( token ) )
             {
                 case ID_PRECEDENCE:
-                    LOG.debug( "Parsing itemPermission's precedence: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07032_PARSING_ITEM_PERMISSION_PRECEDENCE, pos ) );
 
                     if ( precedenceSeen )
                     {
@@ -2290,7 +2290,7 @@ public class ACIItemParser
                     break;
 
                 case ID_USER_CLASSES:
-                    LOG.debug( "Parsing itemPermission's userClass: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07033_PARSING_ITEM_PERMISSION_USER_CLASS, pos ) );
 
                     if ( userClassSeen )
                     {
@@ -2305,7 +2305,7 @@ public class ACIItemParser
                     break;
 
                 case ID_GRANTS_AND_DENIALS:
-                    LOG.debug( "Parsing itemPermission's grantsAndDenials: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07031_PARSING_ITEM_PERMISSION_GAD, pos ) );
 
                     if ( grantsAndDenialsSeen )
                     {
@@ -2390,7 +2390,7 @@ public class ACIItemParser
      */
     private UserPermission parseUserPermission( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing a userPermission: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07018_PARSING_USER_PERMISSION, pos ) );
 
         UserPermission userPermission = null;
         Integer precedence = null;
@@ -2430,7 +2430,7 @@ public class ACIItemParser
             {
                 case ID_PRECEDENCE:
                     // ID_precedence
-                    LOG.debug( "Parsing userPermission's precedence: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07043_PARSING_USER_PERMISSION_PRECEDENCE, pos ) );
 
                     if ( precedenceSeen )
                     {
@@ -2453,7 +2453,7 @@ public class ACIItemParser
 
                 case ID_PROTECTED_ITEMS:
                     // ID_protectedItems
-                    LOG.debug( "Parsing userPermission's protectedItems: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07044_PARSING_USER_PERMISSION_PROTECTED_ITEM, pos ) );
 
                     if ( protectedItemsSeen )
                     {
@@ -2469,7 +2469,7 @@ public class ACIItemParser
                     
                 case ID_GRANTS_AND_DENIALS:
                     // ID_grantsAndDenials
-                    LOG.debug( "Parsing userPermission's grantsAndDenials: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07042_PARSING_USER_PERMISSION_GAD, pos ) );
 
                     if ( grantsAndDenialsSeen )
                     {
@@ -2534,7 +2534,7 @@ public class ACIItemParser
     private Set<AttributeType> parseAttributeTypeSet( boolean action, String item, Position pos ) 
             throws ParseException
     {
-        LOG.debug( "Parsing attributeTypeSet: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07024_PARSING_ATTRIBUTE_TYPE_SET, pos ) );
 
         // OPEN_CURLY
         matchChar( item, LCURLY, pos );
@@ -2630,7 +2630,7 @@ public class ACIItemParser
      */
     private Set<UserClass> parseUserClasses( boolean action, String item, Position pos ) throws ParseException
     {
-        LOG.debug( "Parsing userClasses: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07040_PARSING_USER_CLASSES, pos ) );
 
         NoDuplicateKeysMap userClasses = null;
         
@@ -2710,7 +2710,7 @@ public class ACIItemParser
     private Set<UserPermission> parseUserPermissions( boolean action, String item, Position pos ) 
             throws ParseException
     {
-        LOG.debug( "Parsing userPermissions: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07045_PARSING_USER_PERMISSIONS, pos ) );
 
         Set<UserPermission> userPermissions = null;
         
@@ -2822,7 +2822,7 @@ public class ACIItemParser
                 String identificationTag, int precedence,  AuthenticationLevel authenticationLevel )
                     throws ParseException
     {
-        LOG.debug( "Parsing itemFirst: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07030_PARSING_ITEM_FIRST, pos ) );
 
         AciItemTuple aciItemTuple = new AciItemTuple();
         
@@ -2910,7 +2910,7 @@ public class ACIItemParser
                 String identificationTag, int precedence,  AuthenticationLevel authenticationLevel )
                     throws ParseException
     {
-        LOG.debug( "Parsing userFirst: {}", pos );
+        LOG.debug( I18n.msg( I18n.MSG_07041_PARSING_USER_FIRST, pos ) );
 
         AciItemTuple aciItemTuple = new AciItemTuple();
         
@@ -3000,7 +3000,7 @@ public class ACIItemParser
      */
     private ACIItem parseAciItem( boolean action, String item ) throws ParseException
     {
-        LOG.debug( "Parsing ACIItem: '{}'", item );
+        LOG.debug( I18n.msg( I18n.MSG_07019_PARSING_ACI_ITEM, item ) );
 
         Position pos = new Position( item );
         
@@ -3050,7 +3050,7 @@ public class ACIItemParser
             switch ( Strings.toLowerCaseAscii( token ) )
             {
                 case ID_IDENTIFICATION_TAG:
-                    LOG.debug( "Parsing ACIItem's identificationTag: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07021_PARSING_ACI_ITEM_ID_TAG, pos ) );
 
                     if ( identificationTagSeen )
                     {
@@ -3071,7 +3071,7 @@ public class ACIItemParser
                     break;
                     
                 case ID_PRECEDENCE:
-                    LOG.debug( "Parsing ACIItem's precedence: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07023_PARSING_ACI_ITEM_PRECEDENCE, pos ) );
 
                     if ( precedenceSeen )
                     {
@@ -3092,7 +3092,7 @@ public class ACIItemParser
                     break;
                     
                 case ID_AUTHENTICATION_LEVEL:
-                    LOG.debug( "Parsing ACIItem's authenticationLevel: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07020_PARSING_ACI_ITEM_AUTHENT_LEVEL, pos ) );
 
                     if ( authenticationLevelSeen )
                     {
@@ -3139,7 +3139,7 @@ public class ACIItemParser
                     break;
                     
                 case ID_ITEM_OR_USER_FIRST:
-                    LOG.debug( "Parsing ACIItem's itemOrUserFirst: {}", pos );
+                    LOG.debug( I18n.msg( I18n.MSG_07022_PARSING_ACI_ITEM_ITEM_OR_USER_FIRST, pos ) );
 
                     if ( itemOrUserFirstSeen )
                     {
@@ -3293,7 +3293,7 @@ public class ACIItemParser
         
         try
         {
-            LOG.debug( "Check the ACIItem '{}'", item );
+            LOG.debug( I18n.msg( I18n.MSG_07005_CHECK_ACI_ITEM, item ) );
 
             parseAciItem( VALIDATE, item );
             
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/ComplexDnParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/ComplexDnParser.java
index e03a6c90a..a5b765284 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/ComplexDnParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/ComplexDnParser.java
@@ -106,7 +106,7 @@ import static org.apache.directory.api.util.ParserUtil.SPACE;
     /** No constructor allowed */
     private ComplexDnParser() 
     {
-        throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_13639_UTILITY_CLASS_CANT_BE_INSTANCIATED ) );
     }
     
     
@@ -1352,7 +1352,7 @@ import static org.apache.directory.api.util.ParserUtil.SPACE;
                         
                         default:
                             // Not an attributeType...
-                            LOG.debug( "Cannot parse an attributeType at {}", pos );
+                            LOG.debug( I18n.msg(  I18n.MSG_13604_CANNOT_PARSE_ATTRIBUTE_TYPE, pos ) );
                             
                             return "";
                     }
@@ -1669,7 +1669,7 @@ import static org.apache.directory.api.util.ParserUtil.SPACE;
         {
             case START:
                 // Not an attributeType...
-                LOG.debug( "Cannot parse an attributeType at {}", pos );
+                LOG.debug( I18n.msg(  I18n.MSG_13604_CANNOT_PARSE_ATTRIBUTE_TYPE, pos ) );
                 return "";
 
             case STATE_1:
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/DefaultDnFactory.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/DefaultDnFactory.java
index deeba8a3d..f7df099ab 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/DefaultDnFactory.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/DefaultDnFactory.java
@@ -123,7 +123,7 @@ public class DefaultDnFactory implements DnFactory
 
         if ( enableStats )
         {
-            LOG.debug( "Dn cache hit - {} , miss - {} and is normalized = {}", hitCount, missCount, cachedDn.isSchemaAware() );
+            LOG.debug( I18n.msg( I18n.MSG_13603_DN_CACHE_HIT, hitCount, missCount, cachedDn.isSchemaAware() ) );
         }
 
         return cachedDn;
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java
index 63ed95630..35715404f 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java
@@ -43,7 +43,7 @@ import org.apache.directory.api.util.Strings;
     /** No constructor allowed */
     private FastDnParser() 
     {
-        throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" );
+        throw new UnsupportedOperationException( I18n.err(  I18n.ERR_13639_UTILITY_CLASS_CANT_BE_INSTANCIATED ) );
     }
 
     
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/subtree/SubtreeSpecificationParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/subtree/SubtreeSpecificationParser.java
index 6beab92df..814261e33 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/subtree/SubtreeSpecificationParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/subtree/SubtreeSpecificationParser.java
@@ -517,8 +517,7 @@ public class SubtreeSpecificationParser
         // administrative value is hostile input, not a valid specification.
         if ( depth > MAX_REFINEMENT_DEPTH )
         {
-            throw new ParseException( "The subtreeSpecification refinement is nested deeper than "
-                + MAX_REFINEMENT_DEPTH + " levels", pos.start );
+            throw new ParseException( I18n.err( I18n.ERR_13909_SUBTREE_SPECIFICATION_REFINEMENT_TOO_DEEP, MAX_REFINEMENT_DEPTH ), pos.start );
         }
 
         // Skip optional spaces