directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-ldap-api] branch master updated: o Changed some error message number o Added some more
Date Thu, 07 Mar 2019 02:46:36 GMT
This is an automated email from the ASF dual-hosted git repository.

elecharny 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 f6eb1a0  o Changed some error message number o Added some more
f6eb1a0 is described below

commit f6eb1a0911958a120a10e13ff17d4e3ffad91cbf
Author: emmanuel lecharny <elecharny@apache.org>
AuthorDate: Thu Mar 7 03:46:33 2019 +0100

    o Changed some error message number
    o Added some more
---
 .../java/org/apache/directory/api/i18n/I18n.java   |  72 ++++++-----
 .../apache/directory/api/i18n/errors.properties    |  69 ++++++-----
 .../apache/directory/api/i18n/messages.properties  |   1 +
 .../codec/standalone/StandaloneLdapApiService.java |   2 +-
 .../src/main/antlr/SubtreeSpecificationChecker.g   |  79 ++++++------
 ldap/model/src/main/antlr/subtree-specification.g  | 134 +++++++++++++++------
 .../api/ldap/model/message/AliasDerefMode.java     |   2 +-
 .../api/ldap/model/message/SearchRequestImpl.java  |   2 +-
 .../DitContentRuleDescriptionSchemaParser.java     |   2 +-
 .../DitStructureRuleDescriptionSchemaParser.java   |   3 +-
 .../LdapComparatorDescriptionSchemaParser.java     |   4 +-
 .../parsers/LdapSyntaxDescriptionSchemaParser.java |   3 +-
 .../MatchingRuleDescriptionSchemaParser.java       |   3 +-
 .../MatchingRuleUseDescriptionSchemaParser.java    |   3 +-
 .../parsers/NameFormDescriptionSchemaParser.java   |   3 +-
 .../parsers/NormalizerDescriptionSchemaParser.java |   3 +-
 .../ObjectClassDescriptionSchemaParser.java        |   3 +-
 .../model/schema/parsers/OpenLdapSchemaParser.java |   2 +-
 .../SyntaxCheckerDescriptionSchemaParser.java      |   3 +-
 .../ldap/model/schema/registries/Registries.java   |  10 +-
 20 files changed, 243 insertions(+), 160 deletions(-)

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 f56922a..93c8da4 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
@@ -639,6 +639,8 @@ public enum I18n
     ERR_13514_UNKNOWN_SORT_RESPONSE_RESULT( "ERR_13514_UNKNOWN_SORT_RESPONSE_RESULT" ),
     ERR_13515_UNEXPECTED_MOD_OP( "ERR_13515_UNEXPECTED_MOD_OP" ),
     ERR_13516_UNEXPECTED_MESSAGE_TYPE( "ERR_13516_UNEXPECTED_MESSAGE_TYPE" ),
+    ERR_13517_UNEXPECTED_ALIAS_DEREF_MODE( "ERR_13517_UNEXPECTED_ALIAS_DEREF_MODE" ),
+    ERR_13518_CLASS_INVALID_ENULM_VALUE( "ERR_13518_CLASS_INVALID_ENULM_VALUE" ),
 
     //     name                             13600 - 13699
     ERR_13600_TYPE_IS_NULL_OR_EMPTY( "ERR_13600_TYPE_IS_NULL_OR_EMPTY" ),
@@ -805,37 +807,44 @@ public enum I18n
     ERR_13832_ATTRIBUTE_TYPE_DESC_PARSE_FAILURE( "ERR_13832_ATTRIBUTE_TYPE_DESC_PARSE_FAILURE" ),
     ERR_13833_CANNOT_PARSE_NULL_DCR( "ERR_13833_CANNOT_PARSE_NULL_DCR" ),
     ERR_13834_DCR_PARSING_FAILURE( "ERR_13834_DCR_PARSING_FAILURE" ),
-    ERR_13385_DCR_DESC_PARSING_FAILURE( "ERR_13385_DCR_DESC_PARSING_FAILURE" ),
-    ERR_13386_CANNOT_PARSE_NULL_DSR( "ERR_13386_CANNOT_PARSE_NULL_DSR" ),
-    ERR_13387_DSR_PARSING_FAILURE( "ERR_13387_DSR_PARSING_FAILURE" ),
-    ERR_13388_DSR_DESC_PARSING_FAILURE( "ERR_13388_DSR_DESC_PARSING_FAILURE" ),
-    ERR_13389_CANNOT_PARSE_NULL_COMP( "ERR_13389_CANNOT_PARSE_NULL_COMP" ),
-    ERR_13390_COMP_PARSING_FAILURE( "ERR_13390_COMP_PARSING_FAILURE" ),
-    ERR_13391_COMP_DESC_PARSING_FAILURE( "ERR_13391_COMP_DESC_PARSING_FAILURE" ),
-    ERR_13392_CANNOT_PARSE_NULL_SYNTAX( "ERR_13392_CANNOT_PARSE_NULL_SYNTAX" ),
-    ERR_13393_SYNTAX_PARSING_FAILURE( "ERR_13393_SYNTAX_PARSING_FAILURE" ),
-    ERR_13394_SYNTAX_DESC_PARSING_FAILURE( "ERR_13394_SYNTAX_DESC_PARSING_FAILURE" ),
-    ERR_13395_CANNOT_PARSE_NULL_MR( "ERR_13395_CANNOT_PARSE_NULL_MR" ),
-    ERR_13396_MR_PARSING_FAILURE( "ERR_13396_MR_PARSING_FAILURE" ),
-    ERR_13397_MR_DESC_PARSING_FAILURE( "ERR_13397_MR_DESC_PARSING_FAILURE" ),
-    ERR_13398_CANNOT_PARSE_NULL_MRU( "ERR_13398_CANNOT_PARSE_NULL_MRU" ),
-    ERR_13399_MRU_PARSING_FAILURE( "ERR_13399_MRU_PARSING_FAILURE" ),
-    ERR_13400_MRU_DESC_PARSING_FAILURE( "ERR_13400_MRU_DESC_PARSING_FAILURE" ),
-    ERR_13401_CANNOT_PARSE_NULL_NF( "ERR_13401_CANNOT_PARSE_NULL_NF" ),
-    ERR_13402_NF_PARSING_FAILURE( "ERR_13402_NF_PARSING_FAILURE" ),
-    ERR_13403_NF_DESC_PARSING_FAILURE( "ERR_13403_NF_DESC_PARSING_FAILURE" ),
-    ERR_13404_CANNOT_PARSE_NULL_NORM( "ERR_13404_CANNOT_PARSE_NULL_NORM" ),
-    ERR_13405_NORM_PARSING_FAILURE( "ERR_13405_NORM_PARSING_FAILURE" ),
-    ERR_13406_NORM_DESC_PARSING_FAILURE( "ERR_13406_NORM_DESC_PARSING_FAILURE" ),
-    ERR_13407_CANNOT_PARSE_NULL_OC( "ERR_13407_CANNOT_PARSE_NULL_OC" ),
-    ERR_13408_OC_PARSING_FAILURE( "ERR_13408_OC_PARSING_FAILURE" ),
-    ERR_13409_OC_DESC_PARSING_FAILURE( "ERR_13409_OC_DESC_PARSING_FAILURE" ),
-    ERR_13410_CANNOT_PARSE_NULL_SC( "ERR_13410_CANNOT_PARSE_NULL_SC" ),
-    ERR_13411_SC_PARSING_FAILURE( "ERR_13411_SC_PARSING_FAILURE" ),
-    ERR_13412_SC_PARSING_FAILURE( "ERR_13412_SC_PARSING_FAILURE" ),
-    ERR_13413_MR_DOES_NOT_HAVE_A_COMP( "ERR_13413_MR_DOES_NOT_HAVE_A_COMP" ),
-    ERR_13414_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX( "ERR_13414_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX" ),
-
+    ERR_13835_DCR_DESC_PARSING_FAILURE( "ERR_13385_DCR_DESC_PARSING_FAILURE" ),
+    ERR_13836_CANNOT_PARSE_NULL_DSR( "ERR_13386_CANNOT_PARSE_NULL_DSR" ),
+    ERR_13837_DSR_PARSING_FAILURE( "ERR_13387_DSR_PARSING_FAILURE" ),
+    ERR_13838_DSR_DESC_PARSING_FAILURE( "ERR_13838_DSR_DESC_PARSING_FAILURE" ),
+    ERR_13839_CANNOT_PARSE_NULL_COMP( "ERR_13839_CANNOT_PARSE_NULL_COMP" ),
+    ERR_13840_COMP_PARSING_FAILURE( "ERR_13840_COMP_PARSING_FAILURE" ),
+    ERR_13841_COMP_DESC_PARSING_FAILURE( "ERR_13841_COMP_DESC_PARSING_FAILURE" ),
+    ERR_13842_CANNOT_PARSE_NULL_SYNTAX( "ERR_13842_CANNOT_PARSE_NULL_SYNTAX" ),
+    ERR_13843_SYNTAX_PARSING_FAILURE( "ERR_13843_SYNTAX_PARSING_FAILURE" ),
+    ERR_13844_SYNTAX_DESC_PARSING_FAILURE( "ERR_13844_SYNTAX_DESC_PARSING_FAILURE" ),
+    ERR_13845_CANNOT_PARSE_NULL_MR( "ERR_13845_CANNOT_PARSE_NULL_MR" ),
+    ERR_13846_MR_PARSING_FAILURE( "ERR_13846_MR_PARSING_FAILURE" ),
+    ERR_13847_MR_DESC_PARSING_FAILURE( "ERR_13847_MR_DESC_PARSING_FAILURE" ),
+    ERR_13848_CANNOT_PARSE_NULL_MRU( "ERR_13848_CANNOT_PARSE_NULL_MRU" ),
+    ERR_13849_MRU_PARSING_FAILURE( "ERR_13849_MRU_PARSING_FAILURE" ),
+    ERR_13850_MRU_DESC_PARSING_FAILURE( "ERR_13850_MRU_DESC_PARSING_FAILURE" ),
+    ERR_13851_CANNOT_PARSE_NULL_NF( "ERR_13851_CANNOT_PARSE_NULL_NF" ),
+    ERR_13852_NF_PARSING_FAILURE( "ERR_13852_NF_PARSING_FAILURE" ),
+    ERR_13853_NF_DESC_PARSING_FAILURE( "ERR_13853_NF_DESC_PARSING_FAILURE" ),
+    ERR_13854_CANNOT_PARSE_NULL_NORM( "ERR_13854_CANNOT_PARSE_NULL_NORM" ),
+    ERR_13855_NORM_PARSING_FAILURE( "ERR_13855_NORM_PARSING_FAILURE" ),
+    ERR_13856_NORM_DESC_PARSING_FAILURE( "ERR_13856_NORM_DESC_PARSING_FAILURE" ),
+    ERR_13857_CANNOT_PARSE_NULL_OC( "ERR_13857_CANNOT_PARSE_NULL_OC" ),
+    ERR_13858_OC_PARSING_FAILURE( "ERR_13858_OC_PARSING_FAILURE" ),
+    ERR_13859_OC_DESC_PARSING_FAILURE( "ERR_13859_OC_DESC_PARSING_FAILURE" ),
+    ERR_13860_CANNOT_PARSE_NULL_SC( "ERR_13860_CANNOT_PARSE_NULL_SC" ),
+    ERR_13861_SC_PARSING_FAILURE( "ERR_13861_SC_PARSING_FAILURE" ),
+    ERR_13862_SC_PARSING_FAILURE( "ERR_13862_SC_PARSING_FAILURE" ),
+    ERR_13863_MR_DOES_NOT_HAVE_A_COMP( "ERR_13863_MR_DOES_NOT_HAVE_A_COMP" ),
+    ERR_13864_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX( "ERR_13864_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX" ),
+    ERR_13865_ERROR_PARSING_AT( "ERR_13865_ERROR_PARSING_AT" ),
+
+    // api-ldap-model subtree          13900-13999
+    ERR_13900_INTEGER_TOKEN_NOT_INTEGER( "ERR_13900_INTEGER_TOKEN_NOT_INTEGER" ),
+    ERR_13901_MESSAGE( "ERR_13901_MESSAGE" ),
+    ERR_13902_FILTER_PARSER_FAILED( "ERR_13902_FILTER_PARSER_FAILED" ),
+    ERR_13903_DN_PARSER_FAILED( "ERR_13903_DN_PARSER_FAILED" ),
+    
     // api-ldap-net-mina                14000 - 14999
     ERR_14000_ERROR_ENCODING_MESSAGE( "ERR_14000_ERROR_ENCODING_MESSAGE" ),
 
@@ -1248,6 +1257,7 @@ public enum I18n
     MSG_06004_REGISTERED_CONTROL_FACTORY( "MSG_06004_REGISTERED_CONTROL_FACTORY" ),
     MSG_06005_EXTENDED_OP_FACTORY_ALREADY_LOADED( "MSG_06005_EXTENDED_OP_FACTORY_ALREADY_LOADED" ),
     MSG_06006_INTERMEDIATE_FACTORY_ALREADY_LOADED( "MSG_06006_INTERMEDIATE_FACTORY_ALREADY_LOADED" ),
+    MSG_06007_REGISTRED_INTERMEDIATE_RESP_FACTORY( "MSG_06007_REGISTRED_INTERMEDIATE_RESP_FACTORY" ),
 
     // api-ldap-extras-aci              7000-7999
     // none
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 2b765a7..8d4ee6a 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
@@ -633,6 +633,8 @@ ERR_13513_INVALID_PROXIED_AUTHZ_NO_DN_OR_U=Invalid proxied authz value: should s
 ERR_13514_UNKNOWN_SORT_RESPONSE_RESULT=Unknown sort response result code {0}
 ERR_13515_UNEXPECTED_MOD_OP=Unexpected ModificationOperation
 ERR_13516_UNEXPECTED_MESSAGE_TYPE=Unexpected MessageTypeEnum {0}
+ERR_13517_UNEXPECTED_ALIAS_DEREF_MODE=Unexpected aliasDerefMode {0}
+ERR_13518_CLASS_INVALID_ENULM_VALUE=Class has bug: check for valid enumeration values
 
 # api-ldap-model name            13600-13699
 ERR_13600_TYPE_IS_NULL_OR_EMPTY=The type cannot be empty or null
@@ -799,36 +801,43 @@ ERR_13831_ATTRIBUTE_TYPE_PARSING_FAILURE=Parser failure on attribute type descri
 ERR_13832_ATTRIBUTE_TYPE_DESC_PARSE_FAILURE=Parser failure on attribute type description:\n\t{0}\nAntlr message: {1}
 ERR_13833_CANNOT_PARSE_NULL_DCR=Cannot parse a null DITContentRule
 ERR_13834_DCR_PARSING_FAILURE=Parser failure on DIT content rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13385_DCR_DESC_PARSING_FAILURE=Parser failure on DIT content rule description:\n\t{0}\nAntlr message: {1}
-ERR_13386_CANNOT_PARSE_NULL_DSR=Cannot parse a null DITStructureRule description
-ERR_13387_DSR_PARSING_FAILURE=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}nAntlr column: {2}
-ERR_13388_DSR_DESC_PARSING_FAILURE=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}
-ERR_13389_CANNOT_PARSE_NULL_COMP=Cannot parse a null LdapComparator description
-ERR_13390_COMP_PARSING_FAILURE=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13391_COMP_DESC_PARSING_FAILURE=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}
-ERR_13392_CANNOT_PARSE_NULL_SYNTAX=Cannot parse a null LdapSyntax
-ERR_13393_SYNTAX_PARSING_FAILURE=Parser failure on LDAP syntax description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13394_SYNTAX_DESC_PARSING_FAILURE=Parser failure on LDAP syntax description:\n\t{0}\nAntlr message: {1}
-ERR_13395_CANNOT_PARSE_NULL_MR=Cannot parse a null MatchingRule
-ERR_13396_MR_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13397_MR_DESC_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
-ERR_13398_CANNOT_PARSE_NULL_MRU=Cannot parse a null MatchingRuleUse
-ERR_13399_MRU_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13400_MRU_DESC_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
-ERR_13401_CANNOT_PARSE_NULL_NF=Cannot parse a null NameForm
-ERR_13402_NF_PARSING_FAILURE=Parser failure on name form description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2} 
-ERR_13403_NF_DESC_PARSING_FAILURE=Parser failure on name form description:\n\t{0}\nAntlr message: {1}
-ERR_13404_CANNOT_PARSE_NULL_NORM=Cannot parse a null Normalizer description
-ERR_13405_NORM_PARSING_FAILURE=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13406_NORM_DESC_PARSING_FAILURE=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}
-ERR_13407_CANNOT_PARSE_NULL_OC=Cannot parse a null ObjectClass description
-ERR_13408_OC_PARSING_FAILURE=Parser failure on object class description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13409_OC_DESC_PARSING_FAILURE=Parser failure on object class description:\n\t{0}\nAntlr message: {1}
-ERR_13410_CANNOT_PARSE_NULL_SC=Cannot parse a null SyntaxChecker description
-ERR_13411_SC_PARSING_FAILURE=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_13412_SC_PARSING_FAILURE=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}
-ERR_13413_MR_DOES_NOT_HAVE_A_COMP=The MatchingRule {0} does not have a comparator. This is invalid
-ERR_13414_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX=The AttributeType {0} does not have a superior nor a Syntax. This is invalid
+ERR_13835_DCR_DESC_PARSING_FAILURE=Parser failure on DIT content rule description:\n\t{0}\nAntlr message: {1}
+ERR_13836_CANNOT_PARSE_NULL_DSR=Cannot parse a null DITStructureRule description
+ERR_13837_DSR_PARSING_FAILURE=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}nAntlr column: {2}
+ERR_13838_DSR_DESC_PARSING_FAILURE=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}
+ERR_13839_CANNOT_PARSE_NULL_COMP=Cannot parse a null LdapComparator description
+ERR_13840_COMP_PARSING_FAILURE=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13841_COMP_DESC_PARSING_FAILURE=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}
+ERR_13842_CANNOT_PARSE_NULL_SYNTAX=Cannot parse a null LdapSyntax
+ERR_13843_SYNTAX_PARSING_FAILURE=Parser failure on LDAP syntax description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13844_SYNTAX_DESC_PARSING_FAILURE=Parser failure on LDAP syntax description:\n\t{0}\nAntlr message: {1}
+ERR_13845_CANNOT_PARSE_NULL_MR=Cannot parse a null MatchingRule
+ERR_13846_MR_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13847_MR_DESC_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
+ERR_13848_CANNOT_PARSE_NULL_MRU=Cannot parse a null MatchingRuleUse
+ERR_13849_MRU_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13850_MRU_DESC_PARSING_FAILURE=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
+ERR_13851_CANNOT_PARSE_NULL_NF=Cannot parse a null NameForm
+ERR_13852_NF_PARSING_FAILURE=Parser failure on name form description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2} 
+ERR_13853_NF_DESC_PARSING_FAILURE=Parser failure on name form description:\n\t{0}\nAntlr message: {1}
+ERR_13854_CANNOT_PARSE_NULL_NORM=Cannot parse a null Normalizer description
+ERR_13855_NORM_PARSING_FAILURE=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13856_NORM_DESC_PARSING_FAILURE=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}
+ERR_13857_CANNOT_PARSE_NULL_OC=Cannot parse a null ObjectClass description
+ERR_13858_OC_PARSING_FAILURE=Parser failure on object class description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13859_OC_DESC_PARSING_FAILURE=Parser failure on object class description:\n\t{0}\nAntlr message: {1}
+ERR_13860_CANNOT_PARSE_NULL_SC=Cannot parse a null SyntaxChecker description
+ERR_13861_SC_PARSING_FAILURE=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
+ERR_13862_SC_PARSING_FAILURE=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}
+ERR_13863_MR_DOES_NOT_HAVE_A_COMP=The MatchingRule {0} does not have a comparator. This is invalid
+ERR_13864_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX=The AttributeType {0} does not have a superior nor a Syntax. This is invalid
+ERR_13865_ERROR_PARSING_AT=Error parsing attribute type {0}: {1}
+
+# api-ldap-model subtree          13900-13999
+ERR_13900_INTEGER_TOKEN_NOT_INTEGER=Value of INTEGER token {0} cannot be converted to an Integer
+ERR_13901_MESSAGE={0}
+ERR_13902_FILTER_PARSER_FAILED=filterParser failed. {0}
+ERR_13903_DN_PARSER_FAILED=dnParser failed for {0} {1}
 
 # 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 bb32351..d951511 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
@@ -258,6 +258,7 @@ MSG_06003_CONTROL_FACTORY_ALREADY_LOADED=Factory for control {0} was already loa
 MSG_06004_REGISTERED_CONTROL_FACTORY=Registered control factory: {0}
 MSG_06005_EXTENDED_OP_FACTORY_ALREADY_LOADED=Factory for extended operation {0} was already loaded
 MSG_06006_INTERMEDIATE_FACTORY_ALREADY_LOADED=Factory for Intermediate Response {0} was already loaded
+MSG_06007_REGISTRED_INTERMEDIATE_RESP_FACTORY=Registered pre-bundled Intermediate Response factory: {0}
 
 # api-ldap-extras-aci   7000-7999
 # none
diff --git a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
index e3408f1..76ed3d3 100644
--- a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
+++ b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
@@ -517,7 +517,7 @@ public class StandaloneLdapApiService extends DefaultLdapCodecService
 
         if ( LOG.isInfoEnabled() )
         {
-            LOG.info( "Registered pre-bundled Intermediate Response factory: {}", factory.getOid() );
+            LOG.info( I18n.msg( I18n.MSG_06007_REGISTRED_INTERMEDIATE_RESP_FACTORY, factory.getOid() ) );
         }
     }
 }
diff --git a/ldap/model/src/main/antlr/SubtreeSpecificationChecker.g b/ldap/model/src/main/antlr/SubtreeSpecificationChecker.g
index 991b26f..767a5df 100644
--- a/ldap/model/src/main/antlr/SubtreeSpecificationChecker.g
+++ b/ldap/model/src/main/antlr/SubtreeSpecificationChecker.g
@@ -23,6 +23,7 @@ header
 
 package org.apache.directory.api.ldap.model.subtree;
 
+import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.filter.ExprNode;
 import org.apache.directory.api.ldap.model.filter.LeafNode;
@@ -70,7 +71,7 @@ options
 // ----------------------------------------------------------------------------
 
 {
-    private static final Logger log = LoggerFactory.getLogger( AntlrSubtreeSpecificationChecker.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AntlrSubtreeSpecificationCheckerLexer.class );
     
     private ComponentsMonitor subtreeSpecificationComponentsMonitor = null;
     
@@ -98,9 +99,7 @@ options
         }
         catch ( NumberFormatException e )
         {
-            throw new RecognitionException( "Value of INTEGER token " +
-                                            token.getText() +
-                                            " cannot be converted to an Integer" );
+            throw new RecognitionException( I18n.err( I18n.ERR_13900_INTEGER_TOKEN_NOT_INTEGER, token.getText() ) );
         }
         
         return i;
@@ -114,14 +113,14 @@ options
 
 wrapperEntryPoint
 {
-    log.debug( "entered wrapperEntryPoint()" );
+    LOG.debug( "entered wrapperEntryPoint()" );
 } :
     subtreeSpecification "end"
     ;
 
 subtreeSpecification
 {
-    log.debug( "entered subtreeSpecification()" );
+    LOG.debug( "entered subtreeSpecification()" );
     subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor( 
             new String [] { "base", "specificExclusions", "minimum", "maximum", "specificationFilter" } );
 }
@@ -134,7 +133,7 @@ subtreeSpecification
 
 subtreeSpecificationComponent
 {
-    log.debug( "entered subtreeSpecification()" );
+    LOG.debug( "entered subtreeSpecification()" );
 }
     :
     ss_base
@@ -161,12 +160,12 @@ subtreeSpecificationComponent
     exception
     catch [IllegalArgumentException e]
     {
-        throw new RecognitionException( e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13901_MESSAGE, e.getMessage() ) );
     }
 
 ss_base
 {
-    log.debug( "entered ss_base()" );
+    LOG.debug( "entered ss_base()" );
 }
     :
     ID_base ( SP )+ distinguishedName
@@ -174,7 +173,7 @@ ss_base
 
 ss_specificExclusions
 {
-    log.debug( "entered ss_specificExclusions()" );
+    LOG.debug( "entered ss_specificExclusions()" );
 }
     :
     ID_specificExclusions ( SP )+ specificExclusions
@@ -182,7 +181,7 @@ ss_specificExclusions
 
 specificExclusions
 {
-    log.debug( "entered specificExclusions()" );
+    LOG.debug( "entered specificExclusions()" );
 }
     :
     OPEN_CURLY ( SP )*
@@ -194,7 +193,7 @@ specificExclusions
 
 specificExclusion
 {
-    log.debug( "entered specificExclusion()" );
+    LOG.debug( "entered specificExclusion()" );
 }
     :
     chopBefore | chopAfter
@@ -202,7 +201,7 @@ specificExclusion
 
 chopBefore
 {
-    log.debug( "entered chopBefore()" );
+    LOG.debug( "entered chopBefore()" );
 }
     :
     ID_chopBefore ( SP )* COLON ( SP )* distinguishedName
@@ -210,7 +209,7 @@ chopBefore
 
 chopAfter
 {
-    log.debug( "entered chopAfter()" );
+    LOG.debug( "entered chopAfter()" );
 }
     :
     ID_chopAfter ( SP )* COLON ( SP )* distinguishedName
@@ -218,7 +217,7 @@ chopAfter
 
 ss_minimum
 {
-    log.debug( "entered ss_minimum()" );
+    LOG.debug( "entered ss_minimum()" );
 }
     :
     ID_minimum ( SP )+ baseDistance
@@ -226,7 +225,7 @@ ss_minimum
 
 ss_maximum
 {
-    log.debug( "entered ss_maximum()" );
+    LOG.debug( "entered ss_maximum()" );
 }
     :
     ID_maximum ( SP )+ baseDistance
@@ -234,7 +233,7 @@ ss_maximum
 
 ss_specificationFilter
 {
-    log.debug( "entered ss_specificationFilter()" );
+    LOG.debug( "entered ss_specificationFilter()" );
 }
     :
     ID_specificationFilter 
@@ -248,7 +247,7 @@ ss_specificationFilter
     
 filter
 {
-    log.debug( "entered filter()" );
+    LOG.debug( "entered filter()" );
 }
     :
     ( filterToken:FILTER { FilterParser.parse( filterToken.getText() ); } )
@@ -256,30 +255,30 @@ filter
     exception
     catch [Exception e]
     {
-        throw new RecognitionException( "filterParser failed. " + e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13902_FILTER_PARSER_FAILED, e.getMessage() ) );
     }
 
     
 distinguishedName
 {
-    log.debug( "entered distinguishedName()" );
+    LOG.debug( "entered distinguishedName()" );
 }
     :
     token:SAFEUTF8STRING
     {
         new Dn( token.getText() );
-        log.debug( "recognized a DistinguishedName: " + token.getText() );
+        LOG.debug( "recognized a DistinguishedName: " + token.getText() );
     }
     ;
     exception
     catch [Exception e]
     {
-        throw new RecognitionException( "dnParser failed for " + token.getText() + " " + e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13903_DN_PARSER_FAILED, token.getText(), e.getMessage() ) );
     }
 
 baseDistance
 {
-    log.debug( "entered baseDistance()" );
+    LOG.debug( "entered baseDistance()" );
 }
     :
     token:INTEGER
@@ -290,20 +289,20 @@ baseDistance
 
 oid
 {
-    log.debug( "entered oid()" );
+    LOG.debug( "entered oid()" );
      Token token = null;
 }
     :
     { token = LT( 1 ); } // an interesting trick goes here ;-)
     ( DESCR | NUMERICOID )
     {
-        log.debug( "recognized an oid: " + token.getText() );
+        LOG.debug( "recognized an oid: " + token.getText() );
     }
     ;
 
 refinement
 {
-    log.debug( "entered refinement()" );
+    LOG.debug( "entered refinement()" );
 }
     :
     item | and | or | not
@@ -311,7 +310,7 @@ refinement
 
 item
 {
-    log.debug( "entered item()" );
+    LOG.debug( "entered item()" );
 }
     :
     ID_item ( SP )* COLON ( SP )* oid
@@ -319,7 +318,7 @@ item
 
 and
 {
-    log.debug( "entered and()" );
+    LOG.debug( "entered and()" );
 }
     :
     ID_and ( SP )* COLON ( SP )* refinements
@@ -327,7 +326,7 @@ and
 
 or
 {
-    log.debug( "entered or()" );
+    LOG.debug( "entered or()" );
 }
     :
     ID_or ( SP )* COLON ( SP )* refinements
@@ -335,7 +334,7 @@ or
 
 not
 {
-    log.debug( "entered not()" );
+    LOG.debug( "entered not()" );
 }
     :
     ID_not ( SP )* COLON ( SP )* refinement
@@ -343,7 +342,7 @@ not
 
 refinements
 {
-    log.debug( "entered refinements()" );
+    LOG.debug( "entered refinements()" );
 }
     :
     OPEN_CURLY ( SP )*
@@ -399,7 +398,7 @@ tokens
 //----------------------------------------------------------------------------
 
 {
-    private static final Logger log = LoggerFactory.getLogger( AntlrSubtreeSpecificationLexer.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AntlrSubtreeSpecificationLexer.class );
 }
 
 
@@ -409,17 +408,17 @@ tokens
 
 SP : ' ';
 
-COLON : ':' { log.debug( "matched COLON(':')" ); } ;
+COLON : ':' { LOG.debug( "matched COLON(':')" ); } ;
 
-OPEN_CURLY : '{' { log.debug( "matched LBRACKET('{')" ); } ;
+OPEN_CURLY : '{' { LOG.debug( "matched LBRACKET('{')" ); } ;
 
-CLOSE_CURLY : '}' { log.debug( "matched RBRACKET('}')" ); } ;
+CLOSE_CURLY : '}' { LOG.debug( "matched RBRACKET('}')" ); } ;
 
-SEP : ',' { log.debug( "matched SEP(',')" ); } ;
+SEP : ',' { LOG.debug( "matched SEP(',')" ); } ;
 
-SAFEUTF8STRING : '"'! ( SAFEUTF8CHAR )* '"'! { log.debug( "matched SAFEUTF8CHAR: \"" + getText() + "\"" ); } ;
+SAFEUTF8STRING : '"'! ( SAFEUTF8CHAR )* '"'! { LOG.debug( "matched SAFEUTF8CHAR: \"" + getText() + "\"" ); } ;
 
-DESCR : ALPHA ( ALPHA | DIGIT | '-' )* { log.debug( "matched DESCR" ); } ;
+DESCR : ALPHA ( ALPHA | DIGIT | '-' )* { LOG.debug( "matched DESCR" ); } ;
 
 INTEGER_OR_NUMERICOID
     :
@@ -434,9 +433,9 @@ INTEGER_OR_NUMERICOID
     }
     ;
 
-protected INTEGER: DIGIT | ( LDIGIT ( DIGIT )+ ) { log.debug( "matched INTEGER: " + getText() ); } ;
+protected INTEGER: DIGIT | ( LDIGIT ( DIGIT )+ ) { LOG.debug( "matched INTEGER: " + getText() ); } ;
 
-protected NUMERICOID: INTEGER ( DOT INTEGER )+ { log.debug( "matched NUMERICOID: " + getText() ); } ;
+protected NUMERICOID: INTEGER ( DOT INTEGER )+ { LOG.debug( "matched NUMERICOID: " + getText() ); } ;
 
 protected DOT: '.' ;
 
diff --git a/ldap/model/src/main/antlr/subtree-specification.g b/ldap/model/src/main/antlr/subtree-specification.g
index fe8d001..e5b1b36 100644
--- a/ldap/model/src/main/antlr/subtree-specification.g
+++ b/ldap/model/src/main/antlr/subtree-specification.g
@@ -29,6 +29,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 
+import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.filter.ExprNode;
 import org.apache.directory.api.ldap.model.filter.LeafNode;
@@ -85,7 +86,7 @@ options
 // ----------------------------------------------------------------------------
 
 {
-    private static final Logger log = LoggerFactory.getLogger( AntlrSubtreeSpecificationParser.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AntlrSubtreeSpecificationParser.class );
     
     private NormalizerMappingResolver resolver;
     
@@ -142,9 +143,7 @@ options
         }
         catch ( NumberFormatException e )
         {
-            throw new RecognitionException( "Value of INTEGER token " +
-                                            token.getText() +
-                                            " cannot be converted to an Integer" );
+            throw new RecognitionException( I18n.err( I18n.ERR_13900_INTEGER_TOKEN_NOT_INTEGER, token.getText() ) );
         }
         
         return i;
@@ -158,7 +157,7 @@ options
 
 wrapperEntryPoint returns [SubtreeSpecification ss]
 {
-    log.debug( "entered wrapperEntryPoint()" );
+    LOG.debug( "entered wrapperEntryPoint()" );
     ss = null;
     SubtreeSpecification tempSs = null;
 } :
@@ -170,7 +169,7 @@ wrapperEntryPoint returns [SubtreeSpecification ss]
 
 subtreeSpecification returns [SubtreeSpecification ss]
 {
-    log.debug( "entered subtreeSpecification()" );
+    LOG.debug( "entered subtreeSpecification()" );
     // clear out ss, ssModifier, subtreeSpecificationComponentsMonitor,
     // chopBeforeExclusions and chopAfterExclusions
     // in case something is left from the last parse
@@ -194,7 +193,7 @@ subtreeSpecification returns [SubtreeSpecification ss]
 
 subtreeSpecificationComponent
 {
-    log.debug( "entered subtreeSpecification()" );
+    LOG.debug( "entered subtreeSpecification()" );
 }
     :
     ss_base
@@ -221,12 +220,12 @@ subtreeSpecificationComponent
     exception
     catch [IllegalArgumentException e]
     {
-        throw new RecognitionException( e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13901_MESSAGE, e.getMessage() ) );
     }
 
 ss_base
 {
-    log.debug( "entered ss_base()" );
+    LOG.debug( "entered ss_base()" );
     Dn base = null;
 }
     :
@@ -238,7 +237,7 @@ ss_base
 
 ss_specificExclusions
 {
-    log.debug( "entered ss_specificExclusions()" );
+    LOG.debug( "entered ss_specificExclusions()" );
 }
     :
     ID_specificExclusions ( SP )+ specificExclusions
@@ -250,7 +249,7 @@ ss_specificExclusions
 
 specificExclusions
 {
-    log.debug( "entered specificExclusions()" );
+    LOG.debug( "entered specificExclusions()" );
 }
     :
     OPEN_CURLY ( SP )*
@@ -262,7 +261,7 @@ specificExclusions
 
 specificExclusion
 {
-    log.debug( "entered specificExclusion()" );
+    LOG.debug( "entered specificExclusion()" );
 }
     :
     chopBefore | chopAfter
@@ -270,7 +269,7 @@ specificExclusion
 
 chopBefore
 {
-    log.debug( "entered chopBefore()" );
+    LOG.debug( "entered chopBefore()" );
     Dn chopBeforeExclusion = null;
 }
     :
@@ -282,7 +281,7 @@ chopBefore
 
 chopAfter
 {
-    log.debug( "entered chopAfter()" );
+    LOG.debug( "entered chopAfter()" );
     Dn chopAfterExclusion = null;
 }
     :
@@ -294,7 +293,7 @@ chopAfter
 
 ss_minimum
 {
-    log.debug( "entered ss_minimum()" );
+    LOG.debug( "entered ss_minimum()" );
     int minimum = 0;
 }
     :
@@ -306,7 +305,7 @@ ss_minimum
 
 ss_maximum
 {
-    log.debug( "entered ss_maximum()" );
+    LOG.debug( "entered ss_maximum()" );
     int maximum = 0;
 }
     :
@@ -318,7 +317,7 @@ ss_maximum
 
 ss_specificationFilter
 {
-    log.debug( "entered ss_specificationFilter()" );
+    LOG.debug( "entered ss_specificationFilter()" );
     ExprNode filterExpr = null;
 }
     :
@@ -335,7 +334,7 @@ ss_specificationFilter
     
 filter returns [ ExprNode filterExpr = null ]
 {
-    log.debug( "entered filter()" );
+    LOG.debug( "entered filter()" );
 }
     :
     ( filterToken:FILTER { filterExpr=FilterParser.parse( schemaManager, filterToken.getText() ); } )
@@ -343,12 +342,12 @@ filter returns [ ExprNode filterExpr = null ]
     exception
     catch [Exception e]
     {
-        throw new RecognitionException( "filterParser failed. " + e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13902_FILTER_PARSER_FAILED, e.getMessage() ) );
     }
     
 distinguishedName returns [ Dn name ]
 {
-    log.debug( "entered distinguishedName()" );
+    LOG.debug( "entered distinguishedName()" );
     name = null;
 }
     :
@@ -356,18 +355,21 @@ distinguishedName returns [ Dn name ]
     {
         name = new Dn( schemaManager, token.getText() );
         
-        log.debug( "recognized a DistinguishedName: " + token.getText() );
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "recognized a DistinguishedName: {}", token.getText() );
+        }
     }
     ;
     exception
     catch [Exception e]
     {
-        throw new RecognitionException( "dnParser failed for " + token.getText() + " " + e.getMessage() );
+        throw new RecognitionException( I18n.err( I18n.ERR_13903_DN_PARSER_FAILED, token.getText(), e.getMessage() ) );
     }
 
 baseDistance returns [ int distance ]
 {
-    log.debug( "entered baseDistance()" );
+    LOG.debug( "entered baseDistance()" );
     distance = 0;
 }
     :
@@ -379,7 +381,7 @@ baseDistance returns [ int distance ]
 
 oid returns [ String result ]
 {
-    log.debug( "entered oid()" );
+    LOG.debug( "entered oid()" );
     result = null;
     Token token = null;
 }
@@ -388,13 +390,17 @@ oid returns [ String result ]
     ( DESCR | NUMERICOID )
     {
         result = token.getText();
-        log.debug( "recognized an oid: " + result );
+
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "recognized an oid: {}", result );
+        }
     }
     ;
 
 refinement returns [ ExprNode node ]
 {
-    log.debug( "entered refinement()" );
+    LOG.debug( "entered refinement()" );
     node = null;
 }
     :
@@ -403,7 +409,7 @@ refinement returns [ ExprNode node ]
 
 item returns [ LeafNode node ]
 {
-    log.debug( "entered item()" );
+    LOG.debug( "entered item()" );
     node = null;
     String oid = null;
     ObjectClass objectClass;
@@ -427,7 +433,7 @@ item returns [ LeafNode node ]
 
 and returns [ BranchNode node ]
 {
-    log.debug( "entered and()" );
+    LOG.debug( "entered and()" );
     node = null;
     List<ExprNode> children = null; 
 }
@@ -440,7 +446,7 @@ and returns [ BranchNode node ]
 
 or returns [ BranchNode node ]
 {
-    log.debug( "entered or()" );
+    LOG.debug( "entered or()" );
     node = null;
     List<ExprNode> children = null; 
 }
@@ -453,7 +459,7 @@ or returns [ BranchNode node ]
 
 not returns [ BranchNode node ]
 {
-    log.debug( "entered not()" );
+    LOG.debug( "entered not()" );
     node = null;
     ExprNode child = null;
 }
@@ -466,7 +472,7 @@ not returns [ BranchNode node ]
 
 refinements returns [ List<ExprNode> children ]
 {
-    log.debug( "entered refinements()" );
+    LOG.debug( "entered refinements()" );
     children = null;
     ExprNode child = null;
     List<ExprNode> tempChildren = new ArrayList<ExprNode>();
@@ -534,7 +540,7 @@ tokens
 //----------------------------------------------------------------------------
 
 {
-    private static final Logger log = LoggerFactory.getLogger( AntlrSubtreeSpecificationLexer.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AntlrSubtreeSpecificationLexer.class );
 }
 
 
@@ -544,17 +550,53 @@ tokens
 
 SP : ' ';
 
-COLON : ':' { log.debug( "matched COLON(':')" ); } ;
+COLON : ':' 
+    {
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched COLON(':')" ); 
+        }
+    } ;
 
-OPEN_CURLY : '{' { log.debug( "matched LBRACKET('{')" ); } ;
+OPEN_CURLY : '{' 
+    {
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched LBRACKET('{')" );
+        }
+    };
 
-CLOSE_CURLY : '}' { log.debug( "matched RBRACKET('}')" ); } ;
+CLOSE_CURLY : '}' 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched RBRACKET('}')" ); 
+        }
+    } ;
 
-SEP : ',' { log.debug( "matched SEP(',')" ); } ;
+SEP : ',' 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched SEP(',')" ); 
+        }
+    } ;
 
-SAFEUTF8STRING : '"'! ( SAFEUTF8CHAR )* '"'! { log.debug( "matched SAFEUTF8CHAR: \"" + getText() + "\"" ); } ;
+SAFEUTF8STRING : '"'! ( SAFEUTF8CHAR )* '"'! 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched SAFEUTF8CHAR: \"{}\"", getText() ); 
+        }
+    } ;
 
-DESCR : ALPHA ( ALPHA | DIGIT | '-' )* { log.debug( "matched DESCR" ); } ;
+DESCR : ALPHA ( ALPHA | DIGIT | '-' )* 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched DESCR" ); 
+        }
+    } ;
 
 INTEGER_OR_NUMERICOID
     :
@@ -569,9 +611,21 @@ INTEGER_OR_NUMERICOID
     }
     ;
 
-protected INTEGER: DIGIT | ( LDIGIT ( DIGIT )+ ) { log.debug( "matched INTEGER: " + getText() ); } ;
+protected INTEGER: DIGIT | ( LDIGIT ( DIGIT )+ ) 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched INTEGER: {}", getText() ); 
+        }
+    } ;
 
-protected NUMERICOID: INTEGER ( DOT INTEGER )+ { log.debug( "matched NUMERICOID: " + getText() ); } ;
+protected NUMERICOID: INTEGER ( DOT INTEGER )+ 
+    { 
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "matched NUMERICOID: {}", getText() );
+        }
+    } ;
 
 protected DOT: '.' ;
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java
index 1fec7e1..d93cb7e 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AliasDerefMode.java
@@ -182,7 +182,7 @@ public enum AliasDerefMode
                 return false;
 
             default:
-                throw new IllegalArgumentException( "Class has bug: check for valid enumeration values" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_13518_CLASS_INVALID_ENULM_VALUE ) );
         }
     }
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
index e0f97f3..df35473 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
@@ -593,7 +593,7 @@ public class SearchRequestImpl extends AbstractAbandonableRequest implements Sea
                 break;
 
             default:
-                throw new IllegalArgumentException( "Unexpected aliasDerefMode " + aliasDerefMode );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_13517_UNEXPECTED_ALIAS_DEREF_MODE, aliasDerefMode ) );
         }
 
         sb.append( '\n' );
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitContentRuleDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitContentRuleDescriptionSchemaParser.java
index 919006e..2439d00 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitContentRuleDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitContentRuleDescriptionSchemaParser.java
@@ -38,7 +38,7 @@ public class DitContentRuleDescriptionSchemaParser extends AbstractSchemaParser<
      */
     public DitContentRuleDescriptionSchemaParser()
     {
-        super( DitContentRule.class, I18n.ERR_13833_CANNOT_PARSE_NULL_DCR, I18n.ERR_13834_DCR_PARSING_FAILURE, I18n.ERR_13385_DCR_DESC_PARSING_FAILURE );
+        super( DitContentRule.class, I18n.ERR_13833_CANNOT_PARSE_NULL_DCR, I18n.ERR_13834_DCR_PARSING_FAILURE, I18n.ERR_13835_DCR_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitStructureRuleDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitStructureRuleDescriptionSchemaParser.java
index 14f5af6..b49288f 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitStructureRuleDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/DitStructureRuleDescriptionSchemaParser.java
@@ -39,7 +39,8 @@ public class DitStructureRuleDescriptionSchemaParser extends AbstractSchemaParse
      */
     public DitStructureRuleDescriptionSchemaParser()
     {
-        super( DitStructureRule.class, I18n.ERR_13386_CANNOT_PARSE_NULL_DSR, I18n.ERR_13387_DSR_PARSING_FAILURE, I18n.ERR_13388_DSR_DESC_PARSING_FAILURE );
+        super( DitStructureRule.class, I18n.ERR_13836_CANNOT_PARSE_NULL_DSR, I18n.ERR_13837_DSR_PARSING_FAILURE, 
+            I18n.ERR_13838_DSR_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java
index 5975fbe..d494d5b 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java
@@ -38,8 +38,8 @@ public class LdapComparatorDescriptionSchemaParser extends AbstractSchemaParser<
      */
     public LdapComparatorDescriptionSchemaParser()
     {
-        super( LdapComparatorDescription.class, I18n.ERR_13389_CANNOT_PARSE_NULL_COMP, I18n.ERR_13390_COMP_PARSING_FAILURE, 
-            I18n.ERR_13391_COMP_DESC_PARSING_FAILURE );
+        super( LdapComparatorDescription.class, I18n.ERR_13839_CANNOT_PARSE_NULL_COMP, I18n.ERR_13840_COMP_PARSING_FAILURE, 
+            I18n.ERR_13841_COMP_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
index 51a9a74..b7bca6b 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
@@ -39,7 +39,8 @@ public class LdapSyntaxDescriptionSchemaParser extends AbstractSchemaParser<Ldap
      */
     public LdapSyntaxDescriptionSchemaParser()
     {
-        super( LdapSyntax.class, I18n.ERR_13392_CANNOT_PARSE_NULL_SYNTAX, I18n.ERR_13393_SYNTAX_PARSING_FAILURE, I18n.ERR_13394_SYNTAX_DESC_PARSING_FAILURE );
+        super( LdapSyntax.class, I18n.ERR_13842_CANNOT_PARSE_NULL_SYNTAX, I18n.ERR_13843_SYNTAX_PARSING_FAILURE, 
+            I18n.ERR_13844_SYNTAX_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
index fe9c545..5ca71b9 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
@@ -38,7 +38,8 @@ public class MatchingRuleDescriptionSchemaParser extends AbstractSchemaParser<Ma
      */
     public MatchingRuleDescriptionSchemaParser()
     {
-        super( MatchingRule.class, I18n.ERR_13395_CANNOT_PARSE_NULL_MR, I18n.ERR_13396_MR_PARSING_FAILURE, I18n.ERR_13397_MR_DESC_PARSING_FAILURE );
+        super( MatchingRule.class, I18n.ERR_13845_CANNOT_PARSE_NULL_MR, I18n.ERR_13846_MR_PARSING_FAILURE, 
+            I18n.ERR_13847_MR_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
index 1801b07..4cf3ce6 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
@@ -39,7 +39,8 @@ public class MatchingRuleUseDescriptionSchemaParser extends AbstractSchemaParser
      */
     public MatchingRuleUseDescriptionSchemaParser()
     {
-        super( MatchingRuleUse.class, I18n.ERR_13398_CANNOT_PARSE_NULL_MRU, I18n.ERR_13399_MRU_PARSING_FAILURE, I18n.ERR_13400_MRU_DESC_PARSING_FAILURE );
+        super( MatchingRuleUse.class, I18n.ERR_13848_CANNOT_PARSE_NULL_MRU, I18n.ERR_13849_MRU_PARSING_FAILURE, 
+            I18n.ERR_13850_MRU_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java
index b425bf8..eb3e10d 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java
@@ -39,7 +39,8 @@ public class NameFormDescriptionSchemaParser extends AbstractSchemaParser<NameFo
      */
     public NameFormDescriptionSchemaParser()
     {
-        super( NameForm.class, I18n.ERR_13401_CANNOT_PARSE_NULL_NF, I18n.ERR_13402_NF_PARSING_FAILURE, I18n.ERR_13403_NF_DESC_PARSING_FAILURE );
+        super( NameForm.class, I18n.ERR_13851_CANNOT_PARSE_NULL_NF, I18n.ERR_13852_NF_PARSING_FAILURE, 
+            I18n.ERR_13853_NF_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java
index f016f99..64ce563 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java
@@ -38,7 +38,8 @@ public class NormalizerDescriptionSchemaParser extends AbstractSchemaParser<Norm
      */
     public NormalizerDescriptionSchemaParser()
     {
-        super( NormalizerDescription.class, I18n.ERR_13404_CANNOT_PARSE_NULL_NORM, I18n.ERR_13405_NORM_PARSING_FAILURE, I18n.ERR_13406_NORM_DESC_PARSING_FAILURE );
+        super( NormalizerDescription.class, I18n.ERR_13854_CANNOT_PARSE_NULL_NORM, I18n.ERR_13855_NORM_PARSING_FAILURE,
+            I18n.ERR_13856_NORM_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java
index b633045..288c06e 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java
@@ -39,7 +39,8 @@ public class ObjectClassDescriptionSchemaParser extends AbstractSchemaParser<Obj
      */
     public ObjectClassDescriptionSchemaParser()
     {
-        super( ObjectClass.class, I18n.ERR_13407_CANNOT_PARSE_NULL_OC, I18n.ERR_13408_OC_PARSING_FAILURE, I18n.ERR_13409_OC_DESC_PARSING_FAILURE );
+        super( ObjectClass.class, I18n.ERR_13857_CANNOT_PARSE_NULL_OC, I18n.ERR_13858_OC_PARSING_FAILURE, 
+            I18n.ERR_13859_OC_DESC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
index c54322c..2e8f935 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
@@ -2818,7 +2818,7 @@ public class OpenLdapSchemaParser
         catch ( IOException | LdapSchemaException e )
         {
             // This exception is not passed as a cause in ParseException. Therefore at least log in, so it won't be lost.
-            LOG.trace( "Error parsing attribute type {}: {}", attributeTypeDescription, e.getMessage(), e );
+            LOG.trace( I18n.err( I18n.ERR_13865_ERROR_PARSING_AT, attributeTypeDescription, e.getMessage() ), e );
             throw new ParseException( e.getMessage(), 0 );
         }
     }
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
index 1e5e887..7e48d49 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
@@ -38,7 +38,8 @@ public class SyntaxCheckerDescriptionSchemaParser extends AbstractSchemaParser<S
      */
     public SyntaxCheckerDescriptionSchemaParser()
     {
-        super( SyntaxCheckerDescription.class, I18n.ERR_13410_CANNOT_PARSE_NULL_SC, I18n.ERR_13411_SC_PARSING_FAILURE, I18n.ERR_13412_SC_PARSING_FAILURE );
+        super( SyntaxCheckerDescription.class, I18n.ERR_13860_CANNOT_PARSE_NULL_SC, I18n.ERR_13861_SC_PARSING_FAILURE, 
+            I18n.ERR_13862_SC_PARSING_FAILURE );
     }
 
 
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
index 0d4e9b2..74d2365 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
@@ -1017,8 +1017,9 @@ public class Registries implements SchemaLoaderListener, Cloneable
         if ( comparator == null )
         {
             // Ok, no comparator, this is an error
-            LdapSchemaViolationException error = new LdapSchemaViolationException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
-                I18n.ERR_13413_MR_DOES_NOT_HAVE_A_COMP, matchingRule.getOid() ) );
+            LdapSchemaViolationException error = new LdapSchemaViolationException( 
+                ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, 
+                I18n.err( I18n.ERR_13863_MR_DOES_NOT_HAVE_A_COMP, matchingRule.getOid() ) );
             errorHandler.handle( LOG, error.getMessage(), error );
         }
     }
@@ -1097,8 +1098,9 @@ public class Registries implements SchemaLoaderListener, Cloneable
             {
                 // This is an error. if the AT does not have a Syntax,
                 // then it must have a superior, which syntax is get from.
-                LdapSchemaViolationException error = new LdapSchemaViolationException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
-                    I18n.ERR_13414_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX, attributeType.getOid() ) );
+                LdapSchemaViolationException error = new LdapSchemaViolationException( 
+                    ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, 
+                    I18n.err( I18n.ERR_13864_AT_DOES_NOT_HAVE_A_SUPERIOR_NOR_SYNTAX, attributeType.getOid() ) );
                 errorHandler.handle( LOG, error.getMessage(), error );
             }
         }


Mime
View raw message