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 2018/06/17 06:53:17 UTC
[directory-ldap-api] 03/03: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/directory-ldap-api
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
commit 202d310ed09b3a21084083bb28329b922992a0a4
Merge: d1dee6d ff07452
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sun Jun 17 08:53:05 2018 +0200
Merge branch 'master' of
https://gitbox.apache.org/repos/asf/directory-ldap-api
# Conflicts:
# i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
# i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
i18n/src/main/java/org/apache/directory/api/i18n/I18n.java | 4 ----
.../main/resources/org/apache/directory/api/i18n/errors.properties | 1 -
2 files changed, 5 deletions(-)
diff --cc i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
index 4c000e3,ceee9e7..b64cfb2
--- a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
@@@ -145,10 -145,58 +145,8 @@@ public enum I18
// dsml-engine
ERR_03101_MISSING_CONNECTION_TO( "ERR_03101_MISSING_CONNECTION_TO" ),
- // ldap-client
-
- // ldap
- ERR_04230( "ERR_04230" ),
- ERR_04231( "ERR_04231" ),
- ERR_04232( "ERR_04232" ),
- ERR_04233( "ERR_04233" ),
- ERR_04234( "ERR_04234" ),
- ERR_04235( "ERR_04235" ),
- ERR_04236( "ERR_04236" ),
- ERR_04237( "ERR_04237" ),
- ERR_04238( "ERR_04238" ),
- ERR_04239( "ERR_04239" ),
- ERR_04240( "ERR_04240" ),
- ERR_04241( "ERR_04241" ),
- ERR_04242( "ERR_04242" ),
- ERR_04243( "ERR_04243" ),
- ERR_04244( "ERR_04244" ),
- ERR_04245( "ERR_04245" ),
- ERR_04246( "ERR_04246" ),
- ERR_04247( "ERR_04247" ),
- ERR_04248( "ERR_04248" ),
- ERR_04249( "ERR_04249" ),
- ERR_04250( "ERR_04250" ),
- ERR_04251( "ERR_04251" ),
- ERR_04252( "ERR_04252" ),
- ERR_04253( "ERR_04253" ),
- ERR_04254( "ERR_04254" ),
- ERR_04255( "ERR_04255" ),
- ERR_04256( "ERR_04256" ),
- ERR_04259( "ERR_04259" ),
- ERR_04260( "ERR_04260" ),
- ERR_04296( "ERR_04296" ),
- ERR_04298( "ERR_04298" ),
-
- ERR_04408( "ERR_04408" ),
- ERR_04409( "ERR_04409" ),
-
- ERR_04467( "ERR_04467" ),
- ERR_04468( "ERR_04468" ),
- ERR_04469( "ERR_04469" ),
- ERR_04470( "ERR_04470" ),
- ERR_04471( "ERR_04471" ),
- ERR_04473_NOT_VALID_VALUE( "ERR_04473_NOT_VALID_VALUE" ),
- ERR_04474( "ERR_04474" ),
- ERR_04475( "ERR_04475" ),
- ERR_04476( "ERR_04476" ),
- ERR_04479_INVALID_SYNTAX_VALUE( "ERR_04479_INVALID_SYNTAX_VALUE" ),
- ERR_04480_END_OF_STREAM( "ERR_04480_END_OF_STREAM" ),
-
// api-ldap-client-api 4000-4999
// api-ldap-client-api <> 4000-4100
- // None
-
// api-ldap-client-api api 4100-4200
ERR_04100_UNABLE_TO_UNBIND( "ERR_04100_UNABLE_TO_UNBIND" ),
ERR_04101_CANNOT_CREATE_LDAP_CONNECTION_FACTORY( "ERR_04101_CANNOT_CREATE_LDAP_CONNECTION_FACTORY" ),
@@@ -810,41 -857,7 +808,39 @@@
ERR_13830_CANNOT_PARSE_NULL_ATTR_TYPE( "ERR_13830_CANNOT_PARSE_NULL_ATTR_TYPE" ),
ERR_13831_ATTRIBUTE_TYPE_PARSING_FAILURE( "ERR_13831_ATTRIBUTE_TYPE_PARSING_FAILURE" ),
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" ),
+
-
-
// api-ldap-net-mina 14000 - 14999
// api-ldap-schema-converter 15000 - 15999
diff --cc i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index adfbd79,81ed716..25a1efd
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@@ -112,8 -112,54 +112,7 @@@ ERR_03101_MISSING_CONNECTION_TO BIND=Mi
# ldap-client
# ldap
-ERR_04230=Cannot parse a null DITContentRule
-ERR_04231=Parser failure on DIT content rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04232=Parser failure on DIT content rule description:\n\t{0}\nAntlr message: {1}
-ERR_04233=Cannot parse a null DITStructureRule description
-ERR_04234=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}nAntlr column: {2}
-ERR_04235=Parser failure on DIT structure rule description:\n\t{0}\nAntlr message: {1}
-ERR_04236=Cannot parse a null LdapComparator description
-ERR_04237=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04238=Parser failure on comparator description:\n\t{0}\nAntlr message: {1}
-ERR_04239=Cannot parse a null LdapSyntax
-ERR_04240=Parser failure on LDAP syntay description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04241=Parser failure on LDAP syntay description:\n\t{0}\nAntlr message: {1}
-ERR_04242=Cannot parse a null MatchingRule
-ERR_04243=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04244=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
-ERR_04245=Cannot parse a null MatchingRuleUse
-ERR_04246=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04247=Parser failure on matching rule description:\n\t{0}\nAntlr message: {1}
-ERR_04248=Cannot parse a null NameForm
-ERR_04249=Parser failure on name form description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04250=Parser failure on name form description:\n\t{0}\nAntlr message: {1}
-ERR_04251=Cannot parse a null Normalizer description
-ERR_04252=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04253=Parser failure on normalizer description:\n\t{0}\nAntlr message: {1}
-ERR_04254=Cannot parse a null LdapComparator description
-ERR_04255=Parser failure on object class description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04256=Parser failure on object class description:\n\t{0}\nAntlr message: {1}
-ERR_04259=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}\nAntlr column: {2}
-ERR_04260=Parser failure on syntax checker description:\n\t{0}\nAntlr message: {1}
-ERR_04296=The MatchingRule {0} does not have a comparator. This is invalid
-ERR_04298=The AttributeType {0} does not have a superior nor a Syntax. This is invalid
-
-ERR_04408=The string is empty: this is not a valid LdapURL.
-ERR_04409=Bad Ldap URL: {0}
-
-ERR_04467=The AttributeType list should not contain null values
-ERR_04468=Cannot use standard serialization for a ServerAttribute
-ERR_04469=Cannot use standard serialization for a ServerEntry
-ERR_04470=Cannot read the attribute as it''s OID (''{0}'') does not exist
-ERR_04471=Cannot serialize a Modification with no attribute
-ERR_04473_NOT_VALID_VALUE=Not a valid value ''{0}'' for the AttributeType ''{1}''
-ERR_04474=Expected string to normalize
-ERR_04475=Expected byte[] to normalize
-ERR_04476=Cannot set an AttributeType {0} when another one ({1}) is already present
-ERR_04479_INVALID_SYNTAX_VALUE= The value ''{0}'' does not respect the AttributeType ''{1}'' syntax
-ERR_04480_END_OF_STREAM=End of stream
-
-
# api-ldap-client-api 4000-4999
# api-ldap-client-api <> 4000-4100
# api-ldap-client-api api 4100-4200
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.