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 2010/09/24 12:07:31 UTC
svn commit: r1000788 - in /directory/shared/trunk:
i18n/src/main/java/org/apache/directory/shared/i18n/
i18n/src/main/resources/org/apache/directory/shared/i18n/
ldap/src/main/java/org/apache/directory/shared/ldap/aci/
Author: elecharny
Date: Fri Sep 24 10:07:31 2010
New Revision: 1000788
URL: http://svn.apache.org/viewvc?rev=1000788&view=rev
Log:
Fixed an error message which was innapropriately used
Modified:
directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=1000788&r1=1000787&r2=1000788&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Fri Sep 24 10:07:31 2010
@@ -138,7 +138,7 @@ public enum I18n
ERR_04001_NULL_IDENTIFICATION_TAG( "ERR_04001_NULL_IDENTIFICATION_TAG" ),
ERR_04002_BAD_PRECENDENCE( "ERR_04002_BAD_PRECENDENCE" ),
ERR_04003_NULL_AUTHENTICATION_LEVEL( "ERR_04003_NULL_AUTHENTICATION_LEVEL" ),
- ERR_04004( "ERR_04004" ),
+ ERR_04004_PARSER_FAILURE_ACI_ITEM("ERR_04004_PARSER_FAILURE_ACI_ITEM"),
ERR_04005( "ERR_04005" ),
ERR_04006( "ERR_04006" ),
ERR_04007( "ERR_04007" ),
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=1000788&r1=1000787&r2=1000788&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 Fri Sep 24 10:07:31 2010
@@ -126,7 +126,7 @@ ERR_03040=unable to find the batch reque
ERR_04001_NULL_IDENTIFICATION_TAG=identificationTag parameter is null
ERR_04002_BAD_PRECENDENCE=precedence parameter not in [0-255] : {0}
ERR_04003_NULL_AUTHENTICATION_LEVEL=authenticationLevel parameter is null
-ERR_04004=Parser failure on ACIItem\:\n\t{0}\nAntlr exception trace\:\n{1}
+ERR_04004_PARSER_FAILURE_ACI_ITEM=Parser failure on ACIItem\:\n\t{0}\nAntlr exception trace\:\n{1}
ERR_04005=The PDU buffer size is too small !
ERR_04006=The And filter PDU must not be empty
ERR_04007=The attribute description is empty
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=1000788&r1=1000787&r2=1000788&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 Fri Sep 24 10:07:31 2010
@@ -97,12 +97,12 @@ public class ACIItemChecker
catch ( TokenStreamException e )
{
throw new ParseException( I18n
- .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage() ), 0 );
+ .err( I18n.ERR_04004_PARSER_FAILURE_ACI_ITEM, spec, e.getLocalizedMessage() ), 0 );
}
catch ( RecognitionException e )
{
throw new ParseException( I18n
- .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage() ), e.getColumn() );
+ .err( I18n.ERR_04004_PARSER_FAILURE_ACI_ITEM, 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=1000788&r1=1000787&r2=1000788&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 Fri Sep 24 10:07:31 2010
@@ -118,12 +118,12 @@ public class ACIItemParser
catch ( TokenStreamException e )
{
throw new ParseException( I18n
- .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage() ), 0 );
+ .err( I18n.ERR_04004_PARSER_FAILURE_ACI_ITEM, spec, e.getLocalizedMessage() ), 0 );
}
catch ( RecognitionException e )
{
throw new ParseException( I18n
- .err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL, spec, e.getLocalizedMessage() ), e.getColumn() );
+ .err( I18n.ERR_04004_PARSER_FAILURE_ACI_ITEM, spec, e.getLocalizedMessage() ), e.getColumn() );
}
return aCIItem;