You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/01/21 09:08:35 UTC
svn commit: r901588 - in /directory/sandbox/felixk/apacheds-i18n:
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-entry/src/main/java/org/apache/directory/server/core/entry/
core-jndi/src/main/java/org/apache/directory/ser...
Author: felixk
Date: Thu Jan 21 08:07:28 2010
New Revision: 901588
URL: http://svn.apache.org/viewvc?rev=901588&view=rev
Log:
Use getLocalizedMessage for Exceptions where available
Modified:
directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java
directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/RecordManagerFactory.java
directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/btree/BPage.java
directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/helper/WrappedRuntimeException.java
directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java
directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
Modified: directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Thu Jan 21 08:07:28 2010
@@ -261,7 +261,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_80, ldifFile, e.getMessage() ) );
+ LOG.error( Err.i18n( Err.ERR_80, ldifFile, e.getLocalizedMessage() ) );
}
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Thu Jan 21 08:07:28 2010
@@ -423,7 +423,7 @@
catch ( NamingException ne )
{
// Just discard the AttributeType
- LOG.error( Err.i18n( Err.ERR_100, upId, ne.getMessage() ) );
+ LOG.error( Err.i18n( Err.ERR_100, upId, ne.getLocalizedMessage() ) );
}
}
@@ -1184,7 +1184,7 @@
}
catch ( NamingException ne )
{
- String message = ne.getMessage();
+ String message = ne.getLocalizedMessage();
LOG.error( message );
return null;
}
@@ -1618,7 +1618,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getMessage() );
+ String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1650,7 +1650,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getMessage() );
+ String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1681,7 +1681,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getMessage() );
+ String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -2203,12 +2203,12 @@
}
catch ( NamingException ne )
{
- LOG.warn( "Trying to add a bad attribute type '{}', error : ", upId, ne.getMessage() );
+ LOG.warn( "Trying to add a bad attribute type '{}', error : ", upId, ne.getLocalizedMessage() );
continue;
}
catch ( IllegalArgumentException iae )
{
- LOG.warn( "Trying to add a bad attribute type '{}', error : ", upId, iae.getMessage() );
+ LOG.warn( "Trying to add a bad attribute type '{}', error : ", upId, iae.getLocalizedMessage() );
continue;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Thu Jan 21 08:07:28 2010
@@ -227,7 +227,7 @@
}
catch ( NamingException ne )
{
- String message = "Cannot normalize the value :" + ne.getMessage();
+ String message = "Cannot normalize the value :" + ne.getLocalizedMessage();
LOG.warn( message );
normalized = false;
}
@@ -262,7 +262,7 @@
}
catch ( NamingException ne )
{
- String message = "Cannot normalize the value :" + ne.getMessage();
+ String message = "Cannot normalize the value :" + ne.getLocalizedMessage();
LOG.warn( message );
normalized = false;
}
@@ -295,7 +295,7 @@
}
catch ( NamingException ne )
{
- String message = "Cannot normalize the value :" + ne.getMessage();
+ String message = "Cannot normalize the value :" + ne.getLocalizedMessage();
LOG.warn( message );
normalized = false;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Thu Jan 21 08:07:28 2010
@@ -225,7 +225,7 @@
}
catch ( NamingException ne )
{
- throw new InvalidAttributeIdentifierException( ne.getMessage() );
+ throw new InvalidAttributeIdentifierException( ne.getLocalizedMessage() );
}
}
else
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Thu Jan 21 08:07:28 2010
@@ -230,7 +230,7 @@
}
catch ( NamingException ne )
{
- String message = "Cannot normalize the value :" + ne.getMessage();
+ String message = "Cannot normalize the value :" + ne.getLocalizedMessage();
LOG.warn( message );
normalized = false;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Thu Jan 21 08:07:28 2010
@@ -93,7 +93,7 @@
catch ( Exception e )
{
NamingException ne = new NamingException( "De-serialization of '" + className + "' instance failed:\n"
- + e.getMessage() );
+ + e.getLocalizedMessage() );
ne.setRootCause( e );
throw ne;
}
@@ -135,7 +135,7 @@
}
catch ( Exception e )
{
- NamingException ne = new NamingException( "Serialization of '" + obj + "' failed:\n" + e.getMessage() );
+ NamingException ne = new NamingException( "Serialization of '" + obj + "' failed:\n" + e.getLocalizedMessage() );
ne.setRootCause( e );
throw ne;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java Thu Jan 21 08:07:28 2010
@@ -37,7 +37,7 @@
throw ( NamingException ) t;
}
- NamingException ne = new NamingException( t.getMessage() );
+ NamingException ne = new NamingException( t.getLocalizedMessage() );
ne.setRootCause( t );
throw ne;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Thu Jan 21 08:07:28 2010
@@ -143,7 +143,7 @@
}
catch ( NamingException e )
{
- throw new NoSuchElementException( e.getMessage() );
+ throw new NoSuchElementException( e.getLocalizedMessage() );
}
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Thu Jan 21 08:07:28 2010
@@ -613,8 +613,8 @@
}
catch ( Exception cause )
{
- LOG.error( Err.i18n( Err.ERR_6, cause.getMessage() ) );
- LdapAuthenticationException e = new LdapAuthenticationException( cause.getMessage() );
+ LOG.error( Err.i18n( Err.ERR_6, cause.getLocalizedMessage() ) );
+ LdapAuthenticationException e = new LdapAuthenticationException( cause.getLocalizedMessage() );
e.setRootCause( e );
throw e;
}
@@ -725,7 +725,7 @@
catch ( NoSuchAlgorithmException nsae )
{
LOG.error( Err.i18n( Err.ERR_7, algorithm ) );
- throw new IllegalArgumentException( nsae.getMessage() );
+ throw new IllegalArgumentException( nsae.getLocalizedMessage() );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java Thu Jan 21 08:07:28 2010
@@ -156,7 +156,7 @@
}
catch ( NamingException ne )
{
- log.warn( "Failed to normalize filter value: {}", ne.getMessage(), ne );
+ log.warn( "Failed to normalize filter value: {}", ne.getLocalizedMessage(), ne );
return null;
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Jan 21 08:07:28 2010
@@ -431,7 +431,7 @@
}
catch ( KerberosException ke )
{
- log.debug( ke.getMessage(), ke );
+ log.debug( ke.getLocalizedMessage(), ke );
return null;
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Thu Jan 21 08:07:28 2010
@@ -156,7 +156,7 @@
}
catch ( ClassNotFoundException cnfe )
{
- LOG.error( Err.i18n( Err.ERR_134, cnfe.getMessage() ) );
+ LOG.error( Err.i18n( Err.ERR_134, cnfe.getLocalizedMessage() ) );
return null;
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/RecordManagerFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/RecordManagerFactory.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/RecordManagerFactory.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/RecordManagerFactory.java Thu Jan 21 08:07:28 2010
@@ -108,7 +108,7 @@
throw new IllegalArgumentException( "Invalid record manager provider: "
+ provider
+ "\n[" + except.getClass().getName()
- + ": " + except.getMessage()
+ + ": " + except.getLocalizedMessage()
+ "]" );
}
return factory.createRecordManager( name, options );
Modified: directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/btree/BPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/btree/BPage.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/btree/BPage.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/btree/BPage.java Thu Jan 21 08:07:28 2010
@@ -985,7 +985,7 @@
}
}
} catch ( ClassNotFoundException except ) {
- throw new IOException( except.getMessage() );
+ throw new IOException( except.getLocalizedMessage() );
}
if ( bpage._isLeaf ) {
@@ -1002,7 +1002,7 @@
}
}
} catch ( ClassNotFoundException except ) {
- throw new IOException( except.getMessage() );
+ throw new IOException( except.getLocalizedMessage() );
}
} else {
bpage._children = new long[ _btree._pageSize ];
Modified: directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/helper/WrappedRuntimeException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/helper/WrappedRuntimeException.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/helper/WrappedRuntimeException.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/helper/WrappedRuntimeException.java Thu Jan 21 08:07:28 2010
@@ -94,7 +94,7 @@
*/
public WrappedRuntimeException( Exception except )
{
- super( except == null || except.getMessage() == null ? "No message available" : except.getMessage() );
+ super( except == null || except.getLocalizedMessage() == null ? "No message available" : except.getLocalizedMessage() );
if ( except instanceof WrappedRuntimeException &&
( (WrappedRuntimeException) except )._except != null )
Modified: directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm/src/main/java/jdbm/recman/CacheRecordManager.java Thu Jan 21 08:07:28 2010
@@ -224,7 +224,7 @@
_cache.put( id, new CacheEntry( recid, obj, serializer, true ) );
}
} catch ( CacheEvictionException except ) {
- throw new IOException( except.getMessage() );
+ throw new IOException( except.getLocalizedMessage() );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java Thu Jan 21 08:07:28 2010
@@ -199,7 +199,7 @@
}
catch ( ParseException pe )
{
- LOG.error( Err.i18n( Err.ERR_135, serverPrincipal, pe.getMessage() ) );
+ LOG.error( Err.i18n( Err.ERR_135, serverPrincipal, pe.getLocalizedMessage() ) );
throw new InvalidTicketException( ErrorType.KRB_ERR_GENERIC, Err.i18n( Err.ERR_136, pe.getLocalizedMessage() ) );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Thu Jan 21 08:07:28 2010
@@ -144,11 +144,11 @@
{
if ( log.isDebugEnabled() )
{
- log.warn( ke.getMessage(), ke );
+ log.warn( ke.getLocalizedMessage(), ke );
}
else
{
- log.warn( ke.getMessage() );
+ log.warn( ke.getLocalizedMessage() );
}
ErrorMessage errorMessage = getErrorMessage( config.getServicePrincipal(), ke );
@@ -190,7 +190,7 @@
KerberosTime now = new KerberosTime();
modifier.setErrorCode( exception.getErrorCode() );
- modifier.setExplanatoryText( exception.getMessage() );
+ modifier.setExplanatoryText( exception.getLocalizedMessage() );
modifier.setServerPrincipal( principal );
modifier.setServerTime( now );
modifier.setServerMicroSecond( 0 );
@@ -211,11 +211,11 @@
{
try
{
- resultString = exception.getMessage().getBytes( "UTF-8" );
+ resultString = exception.getLocalizedMessage().getBytes( "UTF-8" );
}
catch ( UnsupportedEncodingException uee )
{
- log.error( uee.getMessage() );
+ log.error( uee.getLocalizedMessage() );
}
}
else
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java Thu Jan 21 08:07:28 2010
@@ -152,7 +152,7 @@
}
catch ( IOException ioe )
{
- log.error( ioe.getMessage(), ioe );
+ log.error( ioe.getLocalizedMessage(), ioe );
}
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java Thu Jan 21 08:07:28 2010
@@ -132,7 +132,7 @@
}
catch ( Exception e )
{
- LOG.error( e.getMessage(), e );
+ LOG.error( e.getLocalizedMessage(), e );
DnsMessage request = ( DnsMessage ) message;
DnsException de = ( DnsException ) e;
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Thu Jan 21 08:07:28 2010
@@ -170,7 +170,7 @@
}
catch ( KerberosException ke )
{
- String messageText = ke.getMessage() + " (" + ke.getErrorCode() + ")";
+ String messageText = ke.getLocalizedMessage() + " (" + ke.getErrorCode() + ")";
if ( log.isDebugEnabled() )
{
@@ -217,7 +217,7 @@
KerberosTime now = new KerberosTime();
modifier.setErrorCode( exception.getErrorCode() );
- modifier.setExplanatoryText( exception.getMessage() );
+ modifier.setExplanatoryText( exception.getLocalizedMessage() );
modifier.setServerPrincipal( principal );
modifier.setServerTime( now );
modifier.setServerMicroSecond( 0 );
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java Thu Jan 21 08:07:28 2010
@@ -839,7 +839,7 @@
catch ( IOException e1 )
{
LOG.error( Err.i18n( Err.ERR_158 ), e1 );
- JOptionPane.showMessageDialog( SessionsFrame.this, e1.getMessage(), "Error encountered!",
+ JOptionPane.showMessageDialog( SessionsFrame.this, e1.getLocalizedMessage(), "Error encountered!",
JOptionPane.ERROR_MESSAGE );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Thu Jan 21 08:07:28 2010
@@ -200,7 +200,7 @@
result.setResultCode( code );
}
- String msg = code.toString() + ": Bind failed: " + e.getMessage();
+ String msg = code.toString() + ": Bind failed: " + e.getLocalizedMessage();
if ( LOG.isDebugEnabled() )
{
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Thu Jan 21 08:07:28 2010
@@ -227,7 +227,7 @@
* exception into the message if we are in debug mode. Note we
* embed the result code name into the message.
*/
- String msg = code.toString() + ": failed for " + req + ": " + e.getMessage();
+ String msg = code.toString() + ": failed for " + req + ": " + e.getLocalizedMessage();
if ( LOG.isDebugEnabled() )
{
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Thu Jan 21 08:07:28 2010
@@ -389,7 +389,7 @@
* exception into the message if we are in debug mode. Note we
* embed the result code name into the message.
*/
- String msg = code.toString() + ": failed for " + req + ": " + e.getMessage();
+ String msg = code.toString() + ": failed for " + req + ": " + e.getLocalizedMessage();
LOG.debug( msg, e );
if ( IS_DEBUG )
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Thu Jan 21 08:07:28 2010
@@ -256,7 +256,7 @@
result.setResultCode( code );
}
- String msg = "Bind failed: " + e.getMessage();
+ String msg = "Bind failed: " + e.getLocalizedMessage();
if ( LOG.isDebugEnabled() )
{
Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Thu Jan 21 08:07:28 2010
@@ -102,7 +102,7 @@
result.setResultCode( code );
}
- String msg = "Bind failed: " + e.getMessage();
+ String msg = "Bind failed: " + e.getLocalizedMessage();
if ( LOG.isDebugEnabled() )
{
Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java Thu Jan 21 08:07:28 2010
@@ -146,25 +146,25 @@
catch ( AlreadySelectedException ase )
{
System.err.println( "Command line parsing failed for " + command + ". Reason: already selected "
- + ase.getMessage() );
+ + ase.getLocalizedMessage() );
System.exit( 1 );
}
catch ( MissingArgumentException mae )
{
System.err.println( "Command line parsing failed for " + command + ". Reason: missing argument "
- + mae.getMessage() );
+ + mae.getLocalizedMessage() );
System.exit( 1 );
}
catch ( MissingOptionException moe )
{
System.err.println( "Command line parsing failed for " + command + ". Reason: missing option "
- + moe.getMessage() );
+ + moe.getLocalizedMessage() );
System.exit( 1 );
}
catch ( UnrecognizedOptionException uoe )
{
System.err.println( "Command line parsing failed for " + command + ". Reason: unrecognized option"
- + uoe.getMessage() );
+ + uoe.getLocalizedMessage() );
System.exit( 1 );
}
catch ( ParseException pe )
Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java Thu Jan 21 08:07:28 2010
@@ -112,7 +112,7 @@
public void namingExceptionThrown( NamingExceptionEvent evt )
{
canceled = true;
- System.out.println( "Got an excption event: " + evt.getException().getMessage() );
+ System.out.println( "Got an excption event: " + evt.getException().getLocalizedMessage() );
System.out.println( "Process shutting down abruptly." );
System.exit( 1 );
}
Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java Thu Jan 21 08:07:28 2010
@@ -115,7 +115,7 @@
{
new InitialLdapContext( env, null );
isSuccess = false;
- System.err.print( "shutdown request failed with error: " + t.getMessage() );
+ System.err.print( "shutdown request failed with error: " + t.getLocalizedMessage() );
}
catch ( CommunicationException e )
{
Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Thu Jan 21 08:07:28 2010
@@ -634,7 +634,7 @@
if ( ldifReader.hasError() )
{
System.err
- .println( "Found an error while persing an entry : " + ldifReader.getError().getMessage() );
+ .println( "Found an error while persing an entry : " + ldifReader.getError().getLocalizedMessage() );
if ( ignoreErrors == false )
{
@@ -683,7 +683,7 @@
if ( ldifReader.hasError() )
{
System.err
- .println( "Found an error while persing an entry : " + ldifReader.getError().getMessage() );
+ .println( "Found an error while persing an entry : " + ldifReader.getError().getLocalizedMessage() );
if ( ignoreErrors == false )
{
Modified: directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Thu Jan 21 08:07:28 2010
@@ -199,7 +199,7 @@
}
catch ( Exception e )
{
- buf.append( "ERROR: " + e.getMessage() );
+ buf.append( "ERROR: " + e.getLocalizedMessage() );
}
if ( children.size() > 0 )
Modified: directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=901588&r1=901587&r2=901588&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Thu Jan 21 08:07:28 2010
@@ -623,7 +623,7 @@
{
e.printStackTrace();
JTextArea text = new JTextArea();
- String msg = e.getMessage();
+ String msg = e.getLocalizedMessage();
if ( msg.length() > 1024 )
{
@@ -764,7 +764,7 @@
catch ( Exception e )
{
JTextArea text = new JTextArea();
- String msg = e.getMessage();
+ String msg = e.getLocalizedMessage();
if ( msg.length() > 1024 )
{