directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-ldap-api] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-ldap-api
Date Sat, 24 Mar 2018 14:46:49 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

commit 5b9b40978883dbb5703bd8fabae22e70e69b8673
Merge: d3535b1 19a17b1
Author: Emmanuel L├ęcharny <elecharny@symas.com>
AuthorDate: Sat Mar 24 15:46:18 2018 +0100

    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/resources/org/apache/directory/api/i18n/messages.properties

 .../java/org/apache/directory/api/i18n/I18n.java   | 89 ++++++++++++++++++++++
 .../apache/directory/api/i18n/errors.properties    | 16 ++++
 .../apache/directory/api/i18n/messages.properties  |  3 +
 3 files changed, 108 insertions(+)

diff --cc i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
index 26af843,4a4a0f3..17f28cd
--- a/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
@@@ -290,6 -291,8 +290,11 @@@ public enum I18
      ERR_04142( "ERR_04142" ),
      ERR_04143( "ERR_04143" ),
      ERR_04156( "ERR_04156" ),
++<<<<<<< HEAD
++=======
+     ERR_04160( "ERR_04160" ),
+     ERR_04161( "ERR_04161" ),
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
      ERR_04163( "ERR_04163" ),
      ERR_04164( "ERR_04164" ),
      ERR_04165_PAYLOAD_DECODING_ERROR( "ERR_04165_PAYLOAD_DECODING_ERROR" ),
@@@ -653,104 -662,85 +658,185 @@@
      ERR_13316_EMPTY_FILTER( "ERR_13316_EMPTY_FILTER" ),
      ERR_13317_NO_MORE_THAN_ONE_ELEM_IN_NOT( "ERR_13317_NO_MORE_THAN_ONE_ELEM_IN_NOT" ),
      ERR_13318_INVALID_ATTR_IN_REFINEMENT( "ERR_13318_INVALID_ATTR_IN_REFINEMENT" ),
++<<<<<<< HEAD
 +
 +    //   ldif           13400 - 13499
 +    ERR_13400_ENTRY_WITH_TWO_DNS( "ERR_13400_ENTRY_WITH_TWO_DNS" ),
 +    ERR_13401_CHANGE_NOT_ALLOWED( "ERR_13401_CHANGE_NOT_ALLOWED" ),
 +    ERR_13402_EXPECTING_ATTRIBUTE_TYPE( "ERR_13402_EXPECTING_ATTRIBUTE_TYPE" ),
 +    ERR_13403_CANNOT_PARSE_LDIF_BUFFER( "ERR_13403_CANNOT_PARSE_LDIF_BUFFER" ),
 +    ERR_13404_EMPTY_DN_NOT_ALLOWED( "ERR_13404_EMPTY_DN_NOT_ALLOWED" ),
 +    ERR_13405_DN_EXPECTED( "ERR_13405_DN_EXPECTED" ),
 +    ERR_13406_FILE_NOT_FOUND( "ERR_13406_FILE_NOT_FOUND" ),
 +    ERR_13407_ERROR_READING_FILE( "ERR_13407_ERROR_READING_FILE" ),
 +    ERR_13408_BAD_PROTOCOL( "ERR_13408_BAD_PROTOCOL" ),
 +    ERR_13409_CONTROL_WITHOUT_OID( "ERR_13409_CONTROL_WITHOUT_OID" ),
 +    ERR_13410_INVALID_CRITICALITY( "ERR_13410_INVALID_CRITICALITY" ),
 +    ERR_13411_BAD_MODRDN_OPERATION( "ERR_13411_BAD_MODRDN_OPERATION" ),
 +    ERR_13412_NO_DELETEOLDRDN( "ERR_13412_NO_DELETEOLDRDN" ),
 +    ERR_13413_BAD_MODIFY_SEPARATOR( "ERR_13413_BAD_MODIFY_SEPARATOR" ),
 +    ERR_13414_BAD_MODIFY_SEPARATOR_2( "ERR_13414_BAD_MODIFY_SEPARATOR_2" ),
 +    ERR_13415_MOD_ATTR_AND_VALUE_SPEC_NOT_EQUAL( "ERR_13415_MOD_ATTR_AND_VALUE_SPEC_NOT_EQUAL"
),
 +    ERR_13416_NEW_SUPERIOR_NEEDED( "ERR_13416_NEW_SUPERIOR_NEEDED" ),
 +    ERR_13417_UNKNOWN_OPERATION( "ERR_13417_UNKNOWN_OPERATION" ),
 +    ERR_13418_CONTROL_ALREADY_FOUND( "ERR_13418_CONTROL_ALREADY_FOUND" ),
 +    ERR_13419_CHANGETYPE_ALREADY_FOUND( "ERR_13419_CHANGETYPE_ALREADY_FOUND" ),
 +    ERR_13420_AT_VALUE_NOT_ALLOWED_AFTER_CONTROL( "ERR_13420_AT_VALUE_NOT_ALLOWED_AFTER_CONTROL"
),
 +    ERR_13421_ATTRIBUTE_TYPE_EXPECTED( "ERR_13421_ATTRIBUTE_TYPE_EXPECTED" ),
 +    ERR_13422_UNKNOWN_ENTRY_TYPE( "ERR_13422_UNKNOWN_ENTRY_TYPE" ),
 +    ERR_13423_VERSION_NOT_A_NUMBER( "ERR_13423_VERSION_NOT_A_NUMBER" ),
 +    ERR_13424_EMPTY_CONTINUATION_LINE( "ERR_13424_EMPTY_CONTINUATION_LINE" ),
 +    ERR_13425_EMPTY_FILE_NAME( "ERR_13425_EMPTY_FILE_NAME" ),
 +    ERR_13426_CANNOT_PARSE_INEXISTANT_FILE( "ERR_13426_CANNOT_PARSE_INEXISTANT_FILE" ),
 +    ERR_13427_CANNOT_FIND_FILE( "ERR_13427_CANNOT_FIND_FILE" ),
 +    ERR_13428_CANNOT_PARSE_LDIF(" ERR_13428_CANNOT_PARSE_LDIF" ),
 +    ERR_13429_ERROR_PARSING_LDIF( "ERR_13429_ERROR_PARSING_LDIF" ),
 +    ERR_13430_PREMATURE_LDIF_ITERATOR_TERMINATION( "ERR_13430_PREMATURE_LDIF_ITERATOR_TERMINATION"
),
 +    ERR_13431_UNEXPECTED_CHANGETYPE( "ERR_13431_UNEXPECTED_CHANGETYPE" ),
 +    ERR_13432_NULL_ADDED_CONTROL( "ERR_13432_NULL_ADDED_CONTROL" ),
 +    ERR_13433_SEE_DIRSERVER_1547( "ERR_13433_SEE_DIRSERVER_1547" ),
 +    ERR_13434_UNEXPECTED_MOD_OPERATION( "ERR_13434_UNEXPECTED_MOD_OPERATION" ),
 +    ERR_13435_CANNOT_COMPUTE_NEW_VALUE( "ERR_13435_CANNOT_COMPUTE_NEW_VALUE" ),
 +    ERR_13436_ERROR_ANONYMIZING_VALUE( "ERR_13436_ERROR_ANONYMIZING_VALUE" ),
 +    ERR_13437_OVERFLOW( "ERR_13437_OVERFLOW" ),
 +    ERR_13438_UNKNOWN_CHANGE_TYPE( "ERR_13438_UNKNOWN_CHANGE_TYPE" ),
 +    ERR_13439_LDIF_ENTRY_WITH_TWO_DNS( "ERR_13439_LDIF_ENTRY_WITH_TWO_DNS" ),
 +    ERR_13440_NO_CHANGE( "ERR_13440_NO_CHANGE" ),
 +    ERR_13441_BAD_ATTRIBUTE( "ERR_13441_BAD_ATTRIBUTE" ),
 +    ERR_13442_ERROR_PARSING_LDIF_BUFFER( "ERR_13442_ERROR_PARSING_LDIF_BUFFER" ),
 +    ERR_13443_CANNOT_FIND_FILE( "ERR_13443_CANNOT_FIND_FILE" ),
 +    ERR_13444_CANNOT_READ_FILE( "ERR_13444_CANNOT_READ_FILE" ),
 +    ERR_13445_NO_DN( "ERR_13445_NO_DN" ),
 +    ERR_13446_INVALID_DN( "ERR_13446_INVALID_DN" ),
 +    ERR_13447_BAD_URL_FILE_NOT_FOUND( "ERR_13447_BAD_URL_FILE_NOT_FOUND" ),
 +    ERR_13448_FILE_TOO_BIG( "ERR_13448_FILE_TOO_BIG" ),
 +    ERR_13449_ERROR_READING_BAD_URL( "ERR_13449_ERROR_READING_BAD_URL" ),
 +    ERR_13450_CANNOT_CLOSE_FILE( "ERR_13450_CANNOT_CLOSE_FILE" ),
 +    ERR_13451_UNSUPPORTED_PROTOCOL( "ERR_13451_UNSUPPORTED_PROTOCOL" ),
 +    ERR_13452_BAD_URL( "ERR_13452_BAD_URL" ),
 +    ERR_13453_INVALID_OID( "ERR_13453_INVALID_OID" ),
 +    ERR_13454_BAD_MODIFY_ATTRIBUTE( "ERR_13454_BAD_MODIFY_ATTRIBUTE" ),
 +    ERR_13455_BAD_MODDN_NO_SUPERIOR( "ERR_13455_BAD_MODDN_NO_SUPERIOR" ),
 +    ERR_13456_BAD_OPERATION( "ERR_13456_BAD_OPERATION" ),
 +    ERR_13457_MISPLACED_CONTROL( "ERR_13457_MISPLACED_CONTROL" ),
 +    ERR_13458_MISPLACED_CHANGETYPE( "ERR_13458_MISPLACED_CHANGETYPE" ),
 +    ERR_13459_MISPLACED_ATTRIBUTETYPE( "ERR_13459_MISPLACED_ATTRIBUTETYPE" ),
 +    ERR_13460_BAD_ATTRIBUTE( "ERR_13460_BAD_ATTRIBUTE" ),
 +    ERR_13461_UNKNOWN_ENTRY( "ERR_13461_UNKNOWN_ENTRY" ),
 +    ERR_13462_LDIF_PARSING_ERROR( "ERR_13462_LDIF_PARSING_ERROR" ),
 +    ERR_13463_ERROR_WHILE_READING_LDIF_LINE( "ERR_13463_ERROR_WHILE_READING_LDIF_LINE" ),
 +    ERR_13464_FILENAME_NOT_FOUND( "ERR_13464_FILENAME_NOT_FOUND" ),
 +    ERR_13465_CANT_DEDUCE_REVERSE_FOR_MOD( "ERR_13465_CANT_DEDUCE_REVERSE_FOR_MOD" ),
 +    ERR_13466_NEW_SUPERIOR_DN_NULL( "ERR_13466_NEW_SUPERIOR_DN_NULL" ),
 +    ERR_13467_NULL_MODIFIED_DN( "ERR_13467_NULL_MODIFIED_DN" ),
 +    ERR_13468_DONT_MOVE_ROOTDSE( "ERR_13468_DONT_MOVE_ROOTDSE" ),
 +    ERR_13469_NULL_READ_DN( "ERR_13469_NULL_READ_DN" ),
 +    ERR_13470_DONT_RENAME_ROOTDSE( "ERR_13470_DONT_RENAME_ROOTDSE" ),
 +    ERR_13471_DELETED_ENTRY_WITH_ATTRIBUTES( "ERR_13471_DELETED_ENTRY_WITH_ATTRIBUTES" ),
 +    ERR_13472_ENTRY_WITH_NO_ATTRIBUTE( "ERR_13472_ENTRY_WITH_NO_ATTRIBUTE" ),
 +    ERR_13473_MODDN_WITH_ATTRIBUTES( "ERR_13473_MODDN_WITH_ATTRIBUTES" ),
 +    ERR_13474_LINE_LENGTH_TOO_SHORT( "ERR_13474_LINE_LENGTH_TOO_SHORT" ),
 +    ERR_13475_UNKNOWN_ATTRIBUTETYPE( "ERR_13475_UNKNOWN_ATTRIBUTETYPE" ),
 +    
 +    //   message        13500 - 13599
 +    ERR_13500_UNDEFINED_CHANGETYPE( "ERR_13500_UNDEFINED_CHANGETYPE" ),
 +    ERR_13501_UNKNOWN_JNDI_SCOPE( "ERR_13501_UNKNOWN_JNDI_SCOPE" ),
 +    ERR_13502_UNKNOWN_LDAP_URL_SCOPE( "ERR_13502_UNKNOWN_LDAP_URL_SCOPE" ),
 +    ERR_13503_RESULT_CODE_SHOULD_BE_IN( "ERR_13503_RESULT_CODE_SHOULD_BE_IN" ),
 +    ERR_13504_FIX_OID( "ERR_13504_FIX_OID" ),
 +    ERR_13505_HARDCODED_ZERO_LENGTH_RESPONSE( "ERR_13505_HARDCODED_ZERO_LENGTH_RESPONSE"
),
 +    ERR_13506_CANNOT_ABANDON_OPERATION( "ERR_13506_CANNOT_ABANDON_OPERATION" ),
 +    ERR_13507_UNRECOGNIZED_JNDI_PROPERTY_VALUE( "ERR_13507_UNRECOGNIZED_JNDI_PROPERTY_VALUE"
),
 +    ERR_13508_INVALID_FILTER( "ERR_13508_INVALID_FILTER" ),
 +    ERR_13509_UNEXPECTED_SCOPE( "ERR_13509_UNEXPECTED_SCOPE" ),
 +    ERR_13510_UNKNOWN_DEREF_MODE( "ERR_13510_UNKNOWN_DEREF_MODE" ),
 +    ERR_13511_INVALID_PROXIED_AUTHZ_NULL( "ERR_13511_INVALID_PROXIED_AUTHZ_NULL" ),
 +    ERR_13512_INVALID_PROXIED_AUTHZ_BAD_DN( "ERR_13512_INVALID_PROXIED_AUTHZ_BAD_DN" ),
 +    ERR_13513_INVALID_PROXIED_AUTHZ_NO_DN_OR_U( "ERR_13513_INVALID_PROXIED_AUTHZ_NO_DN_OR_U"
),
 +    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" ),
++=======
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  
+     //   ldif           13400 - 13499
+     ERR_13400_ENTRY_WITH_TWO_DNS( "ERR_13400_ENTRY_WITH_TWO_DNS" ),
+     ERR_13401_CHANGE_NOT_ALLOWED( "ERR_13401_CHANGE_NOT_ALLOWED" ),
+     ERR_13402_EXPECTING_ATTRIBUTE_TYPE( "ERR_13402_EXPECTING_ATTRIBUTE_TYPE" ),
+     ERR_13403_CANNOT_PARSE_LDIF_BUFFER( "ERR_13403_CANNOT_PARSE_LDIF_BUFFER" ),
+     ERR_13404_EMPTY_DN_NOT_ALLOWED( "ERR_13404_EMPTY_DN_NOT_ALLOWED" ),
+     ERR_13405_DN_EXPECTED( "ERR_13405_DN_EXPECTED" ),
+     ERR_13406_FILE_NOT_FOUND( "ERR_13406_FILE_NOT_FOUND" ),
+     ERR_13407_ERROR_READING_FILE( "ERR_13407_ERROR_READING_FILE" ),
+     ERR_13408_BAD_PROTOCOL( "ERR_13408_BAD_PROTOCOL" ),
+     ERR_13409_CONTROL_WITHOUT_OID( "ERR_13409_CONTROL_WITHOUT_OID" ),
+     ERR_13410_INVALID_CRITICALITY( "ERR_13410_INVALID_CRITICALITY" ),
+     ERR_13411_BAD_MODRDN_OPERATION( "ERR_13411_BAD_MODRDN_OPERATION" ),
+     ERR_13412_NO_DELETEOLDRDN( "ERR_13412_NO_DELETEOLDRDN" ),
+     ERR_13413_BAD_MODIFY_SEPARATOR( "ERR_13413_BAD_MODIFY_SEPARATOR" ),
+     ERR_13414_BAD_MODIFY_SEPARATOR_2( "ERR_13414_BAD_MODIFY_SEPARATOR_2" ),
+     ERR_13415_MOD_ATTR_AND_VALUE_SPEC_NOT_EQUAL( "ERR_13415_MOD_ATTR_AND_VALUE_SPEC_NOT_EQUAL"
),
+     ERR_13416_NEW_SUPERIOR_NEEDED( "ERR_13416_NEW_SUPERIOR_NEEDED" ),
+     ERR_13417_UNKNOWN_OPERATION( "ERR_13417_UNKNOWN_OPERATION" ),
+     ERR_13418_CONTROL_ALREADY_FOUND( "ERR_13418_CONTROL_ALREADY_FOUND" ),
+     ERR_13419_CHANGETYPE_ALREADY_FOUND( "ERR_13419_CHANGETYPE_ALREADY_FOUND" ),
+     ERR_13420_AT_VALUE_NOT_ALLOWED_AFTER_CONTROL( "ERR_13420_AT_VALUE_NOT_ALLOWED_AFTER_CONTROL"
),
+     ERR_13421_ATTRIBUTE_TYPE_EXPECTED( "ERR_13421_ATTRIBUTE_TYPE_EXPECTED" ),
+     ERR_13422_UNKNOWN_ENTRY_TYPE( "ERR_13422_UNKNOWN_ENTRY_TYPE" ),
+     ERR_13423_VERSION_NOT_A_NUMBER( "ERR_13423_VERSION_NOT_A_NUMBER" ),
+     ERR_13424_EMPTY_CONTINUATION_LINE( "ERR_13424_EMPTY_CONTINUATION_LINE" ),
+     ERR_13425_EMPTY_FILE_NAME( "ERR_13425_EMPTY_FILE_NAME" ),
+     ERR_13426_CANNOT_PARSE_INEXISTANT_FILE( "ERR_13426_CANNOT_PARSE_INEXISTANT_FILE" ),
+     ERR_13427_CANNOT_FIND_FILE( "ERR_13427_CANNOT_FIND_FILE" ),
+     ERR_13428_CANNOT_PARSE_LDIF(" ERR_13428_CANNOT_PARSE_LDIF" ),
+     ERR_13429_ERROR_PARSING_LDIF( "ERR_13429_ERROR_PARSING_LDIF" ),
+     ERR_13430_PREMATURE_LDIF_ITERATOR_TERMINATION( "ERR_13430_PREMATURE_LDIF_ITERATOR_TERMINATION"
),
+     ERR_13431_UNEXPECTED_CHANGETYPE( "ERR_13431_UNEXPECTED_CHANGETYPE" ),
+     ERR_13432_NULL_ADDED_CONTROL( "ERR_13432_NULL_ADDED_CONTROL" ),
+     ERR_13433_SEE_DIRSERVER_1547( "ERR_13433_SEE_DIRSERVER_1547" ),
+     ERR_13434_UNEXPECTED_MOD_OPERATION( "ERR_13434_UNEXPECTED_MOD_OPERATION" ),
+     ERR_13435_CANNOT_COMPUTE_NEW_VALUE( "ERR_13435_CANNOT_COMPUTE_NEW_VALUE" ),
+     ERR_13436_ERROR_ANONYMIZING_VALUE( "ERR_13436_ERROR_ANONYMIZING_VALUE" ),
+     ERR_13437_OVERFLOW( "ERR_13437_OVERFLOW" ),
+     ERR_13438_UNKNOWN_CHANGE_TYPE( "ERR_13438_UNKNOWN_CHANGE_TYPE" ),
+     ERR_13439_LDIF_ENTRY_WITH_TWO_DNS( "ERR_13439_LDIF_ENTRY_WITH_TWO_DNS" ),
+     ERR_13440_NO_CHANGE( "ERR_13440_NO_CHANGE" ),
+     ERR_13441_BAD_ATTRIBUTE( "ERR_13441_BAD_ATTRIBUTE" ),
+     ERR_13442_ERROR_PARSING_LDIF_BUFFER( "ERR_13442_ERROR_PARSING_LDIF_BUFFER" ),
+     ERR_13443_CANNOT_FIND_FILE( "ERR_13443_CANNOT_FIND_FILE" ),
+     ERR_13444_CANNOT_READ_FILE( "ERR_13444_CANNOT_READ_FILE" ),
+     ERR_13445_NO_DN( "ERR_13445_NO_DN" ),
+     ERR_13446_INVALID_DN( "ERR_13446_INVALID_DN" ),
+     ERR_13447_BAD_URL_FILE_NOT_FOUND( "ERR_13447_BAD_URL_FILE_NOT_FOUND" ),
+     ERR_13448_FILE_TOO_BIG( "ERR_13448_FILE_TOO_BIG" ),
+     ERR_13449_ERROR_READING_BAD_URL( "ERR_13449_ERROR_READING_BAD_URL" ),
+     ERR_13450_CANNOT_CLOSE_FILE( "ERR_13450_CANNOT_CLOSE_FILE" ),
+     ERR_13451_UNSUPPORTED_PROTOCOL( "ERR_13451_UNSUPPORTED_PROTOCOL" ),
+     ERR_13452_BAD_URL( "ERR_13452_BAD_URL" ),
+     ERR_13453_INVALID_OID( "ERR_13453_INVALID_OID" ),
+     ERR_13454_BAD_MODIFY_ATTRIBUTE( "ERR_13454_BAD_MODIFY_ATTRIBUTE" ),
+     ERR_13455_BAD_MODDN_NO_SUPERIOR( "ERR_13455_BAD_MODDN_NO_SUPERIOR" ),
+     ERR_13456_BAD_OPERATION( "ERR_13456_BAD_OPERATION" ),
+     ERR_13457_MISPLACED_CONTROL( "ERR_13457_MISPLACED_CONTROL" ),
+     ERR_13458_MISPLACED_CHANGETYPE( "ERR_13458_MISPLACED_CHANGETYPE" ),
+     ERR_13459_MISPLACED_ATTRIBUTETYPE( "ERR_13459_MISPLACED_ATTRIBUTETYPE" ),
+     ERR_13460_BAD_ATTRIBUTE( "ERR_13460_BAD_ATTRIBUTE" ),
+     ERR_13461_UNKNOWN_ENTRY( "ERR_13461_UNKNOWN_ENTRY" ),
+     ERR_13462_LDIF_PARSING_ERROR( "ERR_13462_LDIF_PARSING_ERROR" ),
+     ERR_13463_ERROR_WHILE_READING_LDIF_LINE( "ERR_13463_ERROR_WHILE_READING_LDIF_LINE" ),
+     ERR_13464_FILENAME_NOT_FOUND( "ERR_13464_FILENAME_NOT_FOUND" ),
+     ERR_13465_CANT_DEDUCE_REVERSE_FOR_MOD( "ERR_13465_CANT_DEDUCE_REVERSE_FOR_MOD" ),
+     ERR_13466_NEW_SUPERIOR_DN_NULL( "ERR_13466_NEW_SUPERIOR_DN_NULL" ),
+     ERR_13467_NULL_MODIFIED_DN( "ERR_13467_NULL_MODIFIED_DN" ),
+     ERR_13468_DONT_MOVE_ROOTDSE( "ERR_13468_DONT_MOVE_ROOTDSE" ),
+     ERR_13469_NULL_READ_DN( "ERR_13469_NULL_READ_DN" ),
+     ERR_13470_DONT_RENAME_ROOTDSE( "ERR_13470_DONT_RENAME_ROOTDSE" ),
+     ERR_13471_DELETED_ENTRY_WITH_ATTRIBUTES( "ERR_13471_DELETED_ENTRY_WITH_ATTRIBUTES" ),
+     ERR_13472_ENTRY_WITH_NO_ATTRIBUTE( "ERR_13472_ENTRY_WITH_NO_ATTRIBUTE" ),
+     ERR_13473_MODDN_WITH_ATTRIBUTES( "ERR_13473_MODDN_WITH_ATTRIBUTES" ),
+     ERR_13474_LINE_LENGTH_TOO_SHORT( "ERR_13474_LINE_LENGTH_TOO_SHORT" ),
+     ERR_13475_UNKNOWN_ATTRIBUTETYPE( "ERR_13475_UNKNOWN_ATTRIBUTETYPE" ),
+     
      // api-ldap-net-mina 14000 - 14999
  
      // api-ldap-schema-converter    15000 - 15999
@@@ -1037,7 -1027,6 +1123,10 @@@
      MSG_13414_LDIF_FILE_EMPTY( "MSG_13414_LDIF_FILE_EMPTY" ),
  
      //   message        13500 - 13599
++<<<<<<< HEAD
 +    MSG_13500_ATTRIBUTE_NOT_IN_SCHEMA( "MSG_13500_ATTRIBUTE_NOT_IN_SCHEMA" ),
++=======
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
      
      //   name           13600 - 13699
  
diff --cc i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
index 72dbe9c,c2f66c0..3ab4209
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
@@@ -173,6 -173,7 +173,10 @@@ ERR_04051=failed to decode the changeTy
  ERR_04052=failed to decode the changesOnly for PSearchControl
  ERR_04053=failed to decode the returnECs for PSearchControl
  ERR_04054=The visibility flag {0} is invalid: {1}. It should be 0 or 255
++<<<<<<< HEAD
++=======
+ ERR_04055=Undefined changeType value: {0}
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  ERR_04056=Cannot have a null matching rule and a null type
  ERR_04057=Cannot have more than one Filter within a Not Filter
  ERR_04058=Cannot have a null initial, any and final substring
@@@ -255,6 -256,8 +259,11 @@@ ERR_04140_UNACCEPTABLE_RESULT_CODE=Unac
  ERR_04141={0} is not an acceptable result code.
  ERR_04142=Only UNWILLING_TO_PERFORM and UNAVAILABLE_CRITICAL_EXTENSION result codes are
allowed to be used with this exception
  ERR_04143=Only the following LDAP result codes can be used: {0}
++<<<<<<< HEAD
++=======
+ ERR_04160=Unknown JNDI scope constant value: {0}
+ ERR_04161=Unknown LDAP URL scope value: {0}
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  ERR_04163=Unknown SyncStateTypeEnum value {0}
  ERR_04164=Failed to encode payload GracefulShutdownRequest
  ERR_04165_PAYLOAD_DECODING_ERROR=failed to decode payload
@@@ -691,6 -699,7 +700,10 @@@ ERR_13463_ERROR_WHILE_READING_LDIF_LINE
  ERR_13464_FILENAME_NOT_FOUND=Filename {0} not found.
  ERR_13465_CANT_DEDUCE_REVERSE_FOR_MOD=Could not deduce reverse modifications from provided
modifications: {0}
  ERR_13466_NEW_SUPERIOR_DN_NULL=newSuperiorDn must not be null
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  ERR_13467_NULL_MODIFIED_DN=modifiedDn must not be null
  ERR_13468_DONT_MOVE_ROOTDSE=Don''t think about moving the rootDSE.
  ERR_13469_NULL_READ_DN=The newRdn must not be null
@@@ -701,24 -710,6 +714,27 @@@ ERR_13473_MODDN_WITH_ATTRIBUTES=Invali
  ERR_13474_LINE_LENGTH_TOO_SHORT=The length of each line must be at least 2 chars long
  ERR_13475_UNKNOWN_ATTRIBUTETYPE=The AttributeType is unknonw for this attribute: {0}
  
++<<<<<<< HEAD
 +#   message         13500-13599
 +ERR_13500_UNDEFINED_CHANGETYPE=Undefined changeType value: {0}
 +ERR_13501_UNKNOWN_JNDI_SCOPE=Unknown JNDI scope constant value: {0}
 +ERR_13502_UNKNOWN_LDAP_URL_SCOPE=Unknown LDAP URL scope value: {0}
 +ERR_13503_RESULT_CODE_SHOULD_BE_IN=The result code can only be one of: {0}, {1}, {2}
 +ERR_13504_FIX_OID=the OID is fixed: {0}
 +ERR_13505_HARDCODED_ZERO_LENGTH_RESPONSE=the response is hardcoded as zero length array
 +ERR_13506_CANNOT_ABANDON_OPERATION=RFC 2251 [Section 4.11]: Abandon, Bind, Unbind, and StartTLS
operations cannot be abandoned.
 +ERR_13507_UNRECOGNIZED_JNDI_PROPERTY_VALUE=Unrecognized value ''{0}'' for {1} JNDI property.\nExpected
a value of either always, never, searching, or finding.
 +ERR_13508_INVALID_FILTER=The filter {0} is invalid.
 +ERR_13509_UNEXPECTED_SCOPE=Unexpected scope {0}
 +ERR_13510_UNKNOWN_DEREF_MODE=Unknown derefmode {0}
 +ERR_13511_INVALID_PROXIED_AUTHZ_NULL=Invalid proxied authz value: cannot be null
 +ERR_13512_INVALID_PROXIED_AUTHZ_BAD_DN=Invalid proxied authz value: the DN is not valid
 +ERR_13513_INVALID_PROXIED_AUTHZ_NO_DN_OR_U=Invalid proxied authz value: should start with
'dn:' or 'u:'
 +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}
++=======
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  
  # api-ldap-net-mina 14000-14999
  
diff --cc i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
index 85fc91c,6454323..25b5040
--- a/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
+++ b/i18n/src/main/resources/org/apache/directory/api/i18n/messages.properties
@@@ -139,8 -139,6 +139,11 @@@ MSG_13412_NEXT_RETURNING_LDIF=next(): -
  MSG_13413_NO_VERSION_ASSUMING_1=No version information: assuming version: 1
  MSG_13414_LDIF_FILE_EMPTY=The ldif file is empty
  
++<<<<<<< HEAD
 +#   message      13500-13599
 +MSG_13500_ATTRIBUTE_NOT_IN_SCHEMA=Requested attribute {0} does not exist in the schema,
it will be ignored
++=======
++>>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
  
  # api-ldap-net-mina 14000-14999
  MSG_14000_DECODING_PDU=Decoding the PDU:

-- 
To stop receiving notification emails like this one, please contact
elecharny@apache.org.

Mime
View raw message