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/03/24 14:46:50 UTC
[directory-ldap-api] 03/03: Resolve a merge conflict
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 2e23b5aa94dc8cef8858eddc6e61299599f89220
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sat Mar 24 15:46:37 2018 +0100
Resolve a merge conflict
---
.../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 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 17f28cd..26af843 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
@@ -290,11 +290,6 @@ public enum I18n
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" ),
@@ -658,7 +653,6 @@ public enum I18n
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" ),
@@ -756,87 +750,7 @@ 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" ),
-=======
->>>>>>> 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
@@ -1123,10 +1037,7 @@ public enum I18n
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 --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 3ab4209..72dbe9c 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
@@ -173,10 +173,6 @@ ERR_04051=failed to decode the changeTypes for PSearchControl
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
@@ -259,11 +255,6 @@ ERR_04140_UNACCEPTABLE_RESULT_CODE=Unacceptable result code for this exception t
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
@@ -700,10 +691,6 @@ ERR_13463_ERROR_WHILE_READING_LDIF_LINE=Error while reading ldif lines
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
@@ -714,7 +701,6 @@ ERR_13473_MODDN_WITH_ATTRIBUTES=Invalid Entry: a modifyDN operation entry should
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}
@@ -733,8 +719,6 @@ 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}
-=======
->>>>>>> 19a17b1b95a5052fe2d3863beeb7e122a55d790d
# api-ldap-net-mina 14000-14999
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 25b5040..85fc91c 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
@@ -139,11 +139,8 @@ MSG_13412_NEXT_RETURNING_LDIF=next(): -- returning ldif {0}\n
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.