directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r992908 [2/2] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/ shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ shared/trunk/asn1/src/main/java/org/apache/directory/shared/a...
Date Sun, 05 Sep 2010 22:52:55 GMT
Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=992908&r1=992907&r2=992908&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
(original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
Sun Sep  5 22:52:54 2010
@@ -19,65 +19,65 @@
 #
 
 # asn1
-ERR_BAD_TRANSITION_FROM_STATE_00001=Bad transition from state {0}, tag {1}
-ERR_BAD_TRANSITION_00002=Bad transition !
-ERR_CANNOT_PUT_PDU_IN_NULL_BUFFER_00003=Cannot put a PDU in a null buffer !
-ERR_PDU_BUFFER_SIZE_TOO_SMALL_00004=The PDU buffer size is too small !
-ERR_LENGTH_OVERFLOW_00005=Overflow : can't have more than 4 bytes long length
-ERR_LENGTH_EXTENSION_RESERVED_00006=Length reserved extension used
-ERR_TLV_NULL_00007=The current container TLV is null.
-ERR_VALUE_LENGTH_ABOVE_EXPECTED_LENGTH_00008=The current Value length {0} is above the expected
length {1}
-ERR_MORE_TLV_EXPECTED_00009=The PDU is decoded, but we should have had more TLVs
-ERR_TRUNCATED_PDU_00010=Truncated PDU. Some elements are lacking, accordingly to the grammar
-ERR_LENGTH_TOO_LONG_FOR_DEFINITE_FORM_00011=Length above 126 bytes are not allowed for a
definite form Length
-ERR_ODD_NUM_OF_CHARS_00013=Odd number of characters.
-ERR_ILLEGAL_HEX_CHAR_00014=Illegal hexadecimal character {0} at index {1}
-ERR_END_OF_STREAM_00016=End of stream.
-ERR_EOF_FOUND_LENGTH_EXPECTED_00017=EOF found when length expected.
-ERR_DER_LENGTH_ABOVE_4_BYTES_00018=DER length more than 4 bytes.
-ERR_EOF_FOUND_IN_LENGTH_00019=EOF found reading length.
-ERR_CORRUPTED_STREAM_00020=Corrupted steam - negative length found.
-ERR_EOF_FOUND_IN_OBJECT_00021=EOF encountered in middle of object.
-ERR_READ_PAST_END_OF_FILE_00022=Attempt to read past end of file.
-ERR_UNKNOWN_BER_OBJECT_00023=Unknown BER object encountered.
-ERR_OBJECT_NOT_DER_ENCODABLE_00024=Object not DEREncodable.
-ERR_DER_OCTET_STRING_EXPECTED_00025={0} found in input should only contain DEROctetString.
-ERR_CANNOT_CONVERT_OCTETS_00026=Exception converting octets {0}
-ERR_NOT_IMPLEMENTED_00027=Not implemented: {0}
-ERR_INTERNAL_ERROR_ENCODING_BITSTRING_00028=Internal error encoding BitString.
-ERR_NULL_OR_NEG_LENGTH_NOT_ALLOWED_00029=Null or negative length are not allowed
-ERR_BIT_NUMBER_OUT_OF_BOUND_00030=Bad bit number : out of bound
-ERR_CANNOT_FIND_BIT_00031=Cannot get a bit at position {0} when the BitString contains only
{1} ints
-ERR_NULL_OID_00032=Null OID
-ERR_INVALID_OID_00033=Invalid OID : {0}
-ERR_0_BYTES_LONG_BOOLEAN_00034=The value is 0 byte long. This is not allowed for a boolean
-ERR_N_BYTES_LONG_BOOLEAN_00035=The value is not 1 byte long. This is not allowed for a boolean
-ERR_0_BYTES_LONG_INTEGER_00036=The value is 0 byte long. This is not allowed for an integer
-ERR_ABOVE_4_BYTES_INTEGER_00037=The value is more than 4 bytes long. This is not allowed
for an integer
-ERR_VALUE_NOT_IN_RANGE_00038=The value is not in the range [{0}, {1}]
-ERR_0_BYTES_LONG_LONG_00039=The value is 0 byte long. This is not allowed for a long
-ERR_CURRENT_LENGTH_EXCEED_EXPECTED_LENGTH_00041=Current Length is above expected Length
-ERR_PDU_SIZE_TOO_LONG_00042=The PDU current size ({1}) exceeds the maximum allowed PDU size
({2})
-ERR_REMAINING_BYTES_FOR_DECODED_PDU_00043=The PDU has been fully decoded but there are still
bytes in the buffer.
+ERR_00001_BAD_TRANSITION_FROM_STATE=Bad transition from state {0}, tag {1}
+ERR_00002_BAD_TRANSITION=Bad transition !
+ERR_00003_CANNOT_PUT_PDU_IN_NULL_BUFFER=Cannot put a PDU in a null buffer !
+ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL=The PDU buffer size is too small !
+ERR_00005_LENGTH_OVERFLOW=Overflow : can't have more than 4 bytes long length
+ERR_00006_LENGTH_EXTENSION_RESERVED=Length reserved extension used
+ERR_00007_TLV_NULL=The current container TLV is null.
+ERR_00008_VALUE_LENGTH_ABOVE_EXPECTED_LENGTH=The current Value length {0} is above the expected
length {1}
+ERR_00009_MORE_TLV_EXPECTED=The PDU is decoded, but we should have had more TLVs
+ERR_00010_TRUNCATED_PDU=Truncated PDU. Some elements are lacking, accordingly to the grammar
+ERR_00011_LENGTH_TOO_LONG_FOR_DEFINITE_FORM=Length above 126 bytes are not allowed for a
definite form Length
+ERR_00013_ODD_NUM_OF_CHARS=Odd number of characters.
+ERR_00014_ILLEGAL_HEX_CHAR=Illegal hexadecimal character {0} at index {1}
+ERR_00016_END_OF_STREAM=End of stream.
+ERR_00017_EOF_FOUND_LENGTH_EXPECTED=EOF found when length expected.
+ERR_00018_DER_LENGTH_ABOVE_4_BYTES=DER length more than 4 bytes.
+ERR_00019_EOF_FOUND_IN_LENGTH=EOF found reading length.
+ERR_00020_CORRUPTED_STREAM=Corrupted steam - negative length found.
+ERR_00021_EOF_FOUND_IN_OBJECT=EOF encountered in middle of object.
+ERR_00022_READ_PAST_END_OF_FILE=Attempt to read past end of file.
+ERR_00023_UNKNOWN_BER_OBJECT=Unknown BER object encountered.
+ERR_00024_OBJECT_NOT_DER_ENCODABLE=Object not DEREncodable.
+ERR_00025_DER_OCTET_STRING_EXPECTED={0} found in input should only contain DEROctetString.
+ERR_00020_CANNOT_CONVERT_OCTETS=Exception converting octets {0}
+ERR_00020_NOT_IMPLEMENTED=Not implemented: {0}
+ERR_00020_INTERNAL_ERROR_ENCODING_BITSTRING_00028=Internal error encoding BitString.
+ERR_00020_NULL_OR_NEG_LENGTH_NOT_ALLOWED=Null or negative length are not allowed
+ERR_00030_BIT_NUMBER_OUT_OF_BOUND=Bad bit number : out of bound
+ERR_00031_CANNOT_FIND_BIT=Cannot get a bit at position {0} when the BitString contains only
{1} ints
+ERR_00032_NULL_OID=Null OID
+ERR_00033_INVALID_OID=Invalid OID : {0}
+ERR_00034_0_BYTES_LONG_BOOLEAN=The value is 0 byte long. This is not allowed for a boolean
+ERR_00035_N_BYTES_LONG_BOOLEAN=The value is not 1 byte long. This is not allowed for a boolean
+ERR_00036_0_BYTES_LONG_INTEGER=The value is 0 byte long. This is not allowed for an integer
+ERR_00037_ABOVE_4_BYTES_INTEGER=The value is more than 4 bytes long. This is not allowed
for an integer
+ERR_00038_VALUE_NOT_IN_RANGE=The value is not in the range [{0}, {1}]
+ERR_00039_0_BYTES_LONG_LONG=The value is 0 byte long. This is not allowed for a long
+ERR_00041_CURRENT_LENGTH_EXCEED_EXPECTED_LENGTH=Current Length is above expected Length
+ERR_00042_PDU_SIZE_TOO_LONG=The PDU current size ({1}) exceeds the maximum allowed PDU size
({2})
+ERR_00043_REMAINING_BYTES_FOR_DECODED_PDU=The PDU has been fully decoded but there are still
bytes in the buffer.
 
 
 # asn1-codec
 ERR_01001=Encoded result is not a ByteBuffer: {0}
 
 # cursor
-ERR_02001=monitor
-ERR_02002=Failure on underlying Cursor.
-ERR_02003=Underlying Cursor does not support removal.
-ERR_02004=This cursor is empty and cannot return elements!
-ERR_02005=start index ''{0}'' out of range
-ERR_02006=end index ''{0}'' out of range
-ERR_02007=start index ''{0}'' greater than or equal to end index ''{1}'' just does not make
sense
+ERR_02001_MONITOR=monitor
+ERR_02002_FAILURE_ON_UNDERLYING_CURSOR=Failure on underlying Cursor.
+ERR_02003_REMOVAL_NOT_SUPPORTED=Underlying Cursor does not support removal.
+ERR_02004_EMPTY_CURSOR=This cursor is empty and cannot return elements!
+ERR_02005_START_INDEX_OUT_OF_RANGE=start index ''{0}'' out of range
+ERR_02006_END_INDEX_OUT_OF_RANGE=end index ''{0}'' out of range
+ERR_02007_START_INDEX_ABOVE_END_INDEX=start index ''{0}'' greater than or equal to end index
''{1}'' just does not make sense
 ERR_02008=don't know if list is sorted and checking that is not worth it
-ERR_02009=Cursor not positioned at an element
-ERR_02010=Without a comparator I cannot advance to just before the specified element.
-ERR_02011=Without a comparator I cannot advance to just after the specified element.
-ERR_02012=Cannot access element if positioned before first.
-ERR_02013=Cannot access element if positioned after last.
+ERR_02009_CURSOR_NOT_POSITIONED=Cursor not positioned at an element
+ERR_02010_NO_COMPARATOR_CANT_MOVE_BEFORE=Without a comparator I cannot advance to just before
the specified element.
+ERR_02011_NO_COMPARATOR_CANT_MOVE_AFTER=Without a comparator I cannot advance to just after
the specified element.
+ERR_02012_CANNOT_ACCESS_IF_BEFORE_FIRST=Cannot access element if positioned before first.
+ERR_02013_CANNOT_ACCESS_IF_AFTER_LAST=Cannot access element if positioned after last.
 ERR_02014_UNSUPPORTED_OPERATION=The method method {0} is not supported
 
 # dsml-parser

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java?rev=992908&r1=992907&r2=992908&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java
Sun Sep  5 22:52:54 2010
@@ -96,11 +96,13 @@ public class ACIItemChecker
         }
         catch ( TokenStreamException e )
         {
-            throw new ParseException( I18n.err( I18n.ERR_PDU_BUFFER_SIZE_TOO_SMALL_00004,
spec, e.getLocalizedMessage() ), 0 );
+            throw new ParseException( I18n
+                .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage()
), 0 );
         }
         catch ( RecognitionException e )
         {
-            throw new ParseException( I18n.err( I18n.ERR_PDU_BUFFER_SIZE_TOO_SMALL_00004,
spec, e.getLocalizedMessage() ), e.getColumn() );
+            throw new ParseException( I18n
+                .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage()
), e.getColumn() );
         }
     }
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java?rev=992908&r1=992907&r2=992908&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
Sun Sep  5 22:52:54 2010
@@ -117,11 +117,13 @@ public class ACIItemParser
         }
         catch ( TokenStreamException e )
         {
-            throw new ParseException( I18n.err( I18n.ERR_PDU_BUFFER_SIZE_TOO_SMALL_00004,
spec, e.getLocalizedMessage() ), 0 );
+            throw new ParseException( I18n
+                .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage()
), 0 );
         }
         catch ( RecognitionException e )
         {
-            throw new ParseException( I18n.err( I18n.ERR_PDU_BUFFER_SIZE_TOO_SMALL_00004,
spec, e.getLocalizedMessage() ), e.getColumn() );
+            throw new ParseException( I18n
+                .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage()
), e.getColumn() );
         }
 
         return aCIItem;



Mime
View raw message