directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r901657 [4/4] - in /directory/apacheds/trunk: ./ avl-partition/ avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ core-annotations/ core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/...
Date Thu, 21 Jan 2010 11:27:21 GMT
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Thu Jan 21 11:27:15 2010
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.message.AbandonListener;
@@ -101,7 +102,7 @@
         }
         catch ( NamingException e )
         {
-            LOG.error( "failed to properly abandon this persistent search", e );
+            LOG.error( I18n.err( I18n.ERR_164 ), e );
         }
     }
     

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Thu Jan 21 11:27:15 2010
@@ -26,6 +26,7 @@
 
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -217,7 +218,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( "Bad URL ({}) for ref in {}.  Reference will be ignored.", ref, referralAncestor );
+                LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
             
             LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
@@ -316,7 +317,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( "Bad URL ({}) for ref in {}.  Reference will be ignored.", ref, referralAncestor );
+                LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
             
             // Normalize the DN to check for same dn
@@ -388,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/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java Thu Jan 21 11:27:15 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.server.core.event.DirectoryListener;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
@@ -93,8 +94,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( "Failed to close the search cursor for message {} on abandon request.", 
-                req.getMessageId(), e );
+            LOG.error( I18n.err( I18n.ERR_166, req.getMessageId() ), e );
         }
     }
 }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Thu Jan 21 11:27:15 2010
@@ -38,6 +38,7 @@
 import org.apache.directory.server.core.event.NotificationCriteria;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
@@ -187,8 +188,7 @@
                 if ( hasRootDSE )
                 {
                     // This is an error ! We should never find more than one rootDSE !
-                    LOG.error( "Got back more than one entry for search on RootDSE which means " +
-                            "Cursor is not functioning properly!" );
+                    LOG.error( I18n.err( I18n.ERR_167 ) );
                 }
                 else
                 {
@@ -212,7 +212,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( "failed on list.close()", e );
+                    LOG.error( I18n.err( I18n.ERR_168 ), e );
                 }
             }
         }
@@ -577,7 +577,7 @@
                     }
                     catch ( NamingException e )
                     {
-                        LOG.error( "failed on list.close()", e );
+                        LOG.error( I18n.err( I18n.ERR_168 ), e );
                     }
                 }
                 
@@ -670,7 +670,7 @@
                 }
                 catch ( NamingException ne )
                 {
-                    LOG.error( "failed on list.close()", ne );
+                    LOG.error( I18n.err( I18n.ERR_168 ), ne );
                 }
             }
         }
@@ -742,7 +742,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( "failed on list.close()", e );
+                    LOG.error( I18n.err( I18n.ERR_168 ), e );
                 }
             }
         }
@@ -792,7 +792,7 @@
                 }
                 catch ( LdapURLEncodingException e )
                 {
-                    LOG.error( "Bad URL ({}) for ref in {}.  Reference will be ignored.", url, entry );
+                    LOG.error( I18n.err( I18n.ERR_165, url, entry ) );
                 }
 
                 switch( req.getScope() )
@@ -1175,7 +1175,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( "Bad URL ({}) for ref in {}.  Reference will be ignored.", refstr, entry );
+                LOG.error( I18n.err( I18n.ERR_165, refstr, entry ) );
                 continue;
             }
             

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java Thu Jan 21 11:27:15 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.ldap.handlers;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 
@@ -51,7 +52,7 @@
         }
         catch ( Throwable t )
         {
-            LOG.error( "failed to unbind session properly", t );
+            LOG.error( I18n.err( I18n.ERR_169 ), t );
         }
     }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Thu Jan 21 11:27:15 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/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Thu Jan 21 11:27:15 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/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java Thu Jan 21 11:27:15 2010
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.LdapSession;
@@ -152,7 +153,7 @@
         }
         else
         {
-            LOG.error( "Failed to write GracefulShutdownResponse to client: " + requestor.getRemoteAddress() );
+            LOG.error( I18n.err( I18n.ERR_159, requestor.getRemoteAddress() ) );
         }
         requestor.close( true );
     }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java Thu Jan 21 11:27:15 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.ldap.replication;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
@@ -93,7 +94,7 @@
             }
             catch( Exception e )
             {
-                LOG.error( "Failed to send a search request with RefreshAndPersist mode", e );
+                LOG.error( I18n.err( I18n.ERR_170 ), e );
             }
         }
     }

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Thu Jan 21 11:27:15 2010
@@ -39,6 +39,12 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Thu Jan 21 11:27:15 2010
@@ -31,6 +31,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -229,11 +230,11 @@
         }
         catch ( FileNotFoundException fnfe )
         {
-            log.error( "LDIF file does not exist." );
+            log.error( I18n.err( I18n.ERR_173 ) );
         }
         catch ( Exception ioe )
         {
-            log.error( "Failed to import LDIF into backing store.", ioe );
+            log.error( I18n.err( I18n.ERR_174 ), ioe );
         }
         finally
         {
@@ -245,7 +246,7 @@
                 }
                 catch ( Exception e )
                 {
-                    log.error( "failed to close stream", e );
+                    log.error( I18n.err( I18n.ERR_175 ), e );
                 }
             }
         }

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Thu Jan 21 11:27:15 2010
@@ -40,6 +40,11 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
       <version>${pom.version}</version>
     </dependency>  

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Thu Jan 21 11:27:15 2010
@@ -35,6 +35,7 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
@@ -276,7 +277,7 @@
         }
         catch ( IOException e )
         {
-            LOG.error( "could not get canonical path", e );
+            LOG.error( I18n.err( I18n.ERR_179 ), e );
             return null;
         }
 
@@ -364,9 +365,7 @@
             {
                 // If the file can't be read, log the error, and stop
                 // loading LDIFs.
-                LOG.error( "Cannot load the ldif file '{}', error : ",
-                    ldifDirectory.getAbsolutePath(), 
-                    ne.getMessage() );
+                LOG.error( I18n.err( I18n.ERR_180, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage() ) );
                 throw ne;
             }
         }
@@ -402,9 +401,7 @@
                 {
                     // If the file can't be read, log the error, and stop
                     // loading LDIFs.
-                    LOG.error( "Cannot load the ldif file '{}', error : {}", 
-                        ldifFile.getAbsolutePath(), 
-                        ne.getMessage() );
+                    LOG.error( I18n.err( I18n.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage() ) );
                     throw ne;
                 }
             }

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java Thu Jan 21 11:27:15 2010
@@ -26,6 +26,7 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.directory.daemon.InstanceLayout;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -47,7 +48,7 @@
 
         if ( args.length == 0 )
         {
-            System.err.println( "Type " + tools.getProductCommand() + " help for usage." );
+            System.err.println( I18n.err( I18n.ERR_184, tools.getProductCommand() ) );
             System.exit( 1 );
         }
 
@@ -76,8 +77,8 @@
         ToolCommand cmd = ( ToolCommand ) tools.getCommands().get( command );
         if ( cmd == null )
         {
-            System.err.println( "Unknown command: " + args[0] );
-            System.err.println( "Type " + tools.getProductCommand() + " help for usage." );
+            System.err.println( I18n.err( I18n.ERR_185, args[0] ) );
+            System.err.println( I18n.err( I18n.ERR_184, tools.getProductCommand() ) );
             System.exit( 1 );
         }
 
@@ -100,7 +101,7 @@
         }
         else if ( cmdline.hasOption( 'c' ) )
         {
-            System.err.println( "forced configuration load (-c) requires the -i option" );
+            System.err.println( I18n.err( I18n.ERR_186 ) );
             System.exit( 1 );
         }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java Thu Jan 21 11:27:15 2010
@@ -37,6 +37,7 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.cli.UnrecognizedOptionException;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -145,31 +146,27 @@
         }
         catch ( AlreadySelectedException ase )
         {
-            System.err.println( "Command line parsing failed for " + command + ".  Reason: already selected "
-                + ase.getMessage() );
+            System.err.println( I18n.err( I18n.ERR_187, command, ase.getLocalizedMessage() ) );
             System.exit( 1 );
         }
         catch ( MissingArgumentException mae )
         {
-            System.err.println( "Command line parsing failed for " + command + ".  Reason: missing argument "
-                + mae.getMessage() );
+            System.err.println( I18n.err( I18n.ERR_188, command, mae.getLocalizedMessage() ) );
             System.exit( 1 );
         }
         catch ( MissingOptionException moe )
         {
-            System.err.println( "Command line parsing failed for " + command + ".  Reason: missing option "
-                + moe.getMessage() );
+            System.err.println( I18n.err( I18n.ERR_189, command, moe.getLocalizedMessage() ) );
             System.exit( 1 );
         }
         catch ( UnrecognizedOptionException uoe )
         {
-            System.err.println( "Command line parsing failed for " + command + ".  Reason: unrecognized option"
-                + uoe.getMessage() );
+            System.err.println( I18n.err( I18n.ERR_190, command, uoe.getLocalizedMessage() ) );
             System.exit( 1 );
         }
         catch ( ParseException pe )
         {
-            System.err.println( "Command line parsing failed for " + command + ".  Reason: " + pe.getClass() );
+            System.err.println( I18n.err( I18n.ERR_191, command, pe.getClass() ) );
             System.exit( 1 );
         }
 
@@ -236,7 +233,7 @@
         }
         else
         {
-            System.err.println( command + ": unknown command" );
+            System.err.println( I18n.err( I18n.ERR_192, command ) );
             System.exit( 1 );
         }
     }

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java Thu Jan 21 11:27:15 2010
@@ -37,6 +37,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -198,20 +199,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "port value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is larger than max port number: "
-                    + AvailablePortFinder.MAX_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_194, val, AvailablePortFinder.MAX_PORT_NUMBER ) );
                 System.exit( 1 );
             }
             else if ( port < AvailablePortFinder.MIN_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is smaller than the minimum port number: "
-                    + AvailablePortFinder.MIN_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER ) );
                 System.exit( 1 );
             }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java Thu Jan 21 11:27:15 2010
@@ -28,6 +28,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiRequest;
 
 
@@ -106,20 +107,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "port value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is larger than max port number: "
-                    + AvailablePortFinder.MAX_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_194, val, AvailablePortFinder.MAX_PORT_NUMBER ) );
                 System.exit( 1 );
             }
             else if ( port < AvailablePortFinder.MIN_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is smaller than the minimum port number: "
-                    + AvailablePortFinder.MIN_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER ) );
                 System.exit( 1 );
             }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java Thu Jan 21 11:27:15 2010
@@ -35,6 +35,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.message.extended.GracefulDisconnect;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
@@ -112,7 +113,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 );
     }
@@ -204,20 +205,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "port value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is larger than max port number: "
-                    + AvailablePortFinder.MAX_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_194, val, AvailablePortFinder.MAX_PORT_NUMBER ) );
                 System.exit( 1 );
             }
             else if ( port < AvailablePortFinder.MIN_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is smaller than the minimum port number: "
-                    + AvailablePortFinder.MIN_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER ) );
                 System.exit( 1 );
             }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Thu Jan 21 11:27:15 2010
@@ -44,6 +44,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.MultiException;
 import org.apache.directory.shared.ldap.cursor.Cursor;
@@ -194,7 +195,7 @@
     {
         if ( !partitionDirectory.exists() )
         {
-            System.err.println( "Partition directory " + partitionDirectory + " does not exist!" );
+            System.err.println( I18n.err( I18n.ERR_196, partitionDirectory ) );
             System.exit( 1 );
         }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java Thu Jan 21 11:27:15 2010
@@ -30,6 +30,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest;
 
 
@@ -115,7 +116,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 )
             {
@@ -198,20 +199,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "port value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is larger than max port number: "
-                    + AvailablePortFinder.MAX_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_194, val, AvailablePortFinder.MAX_PORT_NUMBER ) );
                 System.exit( 1 );
             }
             else if ( port < AvailablePortFinder.MIN_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is smaller than the minimum port number: "
-                    + AvailablePortFinder.MIN_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER ) );
                 System.exit( 1 );
             }
 
@@ -283,19 +282,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "delay value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_197, val ) );
                 System.exit( 1 );
             }
 
             if ( delay > DELAY_MAX )
             {
-                System.err.println( "delay value of '" + val + "' is larger than max delay (seconds) allowed: "
-                    + DELAY_MAX );
+                System.err.println( I18n.err( I18n.ERR_198, val, DELAY_MAX ) );
                 System.exit( 1 );
             }
             else if ( delay < 0 )
             {
-                System.err.println( "delay value of '" + val + "' is less than zero and makes no sense" );
+                System.err.println( I18n.err( I18n.ERR_199, val ) );
                 System.exit( 1 );
             }
 
@@ -322,19 +320,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "timeOffline value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_200, val ) );
                 System.exit( 1 );
             }
 
             if ( timeOffline > TIME_OFFLINE_MAX )
             {
-                System.err.println( "timeOffline value of '" + val
-                    + "' is larger than max timeOffline (minutes) allowed: " + TIME_OFFLINE_MAX );
+                System.err.println( I18n.err( I18n.ERR_201, val, TIME_OFFLINE_MAX ) );
                 System.exit( 1 );
             }
             else if ( timeOffline < 0 )
             {
-                System.err.println( "timeOffline value of '" + val + "' is less than zero and makes no sense" );
+                System.err.println( I18n.err( I18n.ERR_202, val ) );
                 System.exit( 1 );
             }
 

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Thu Jan 21 11:27:15 2010
@@ -35,6 +35,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.directory.daemon.AvailablePortFinder;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.IAsn1Container;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
@@ -270,8 +271,7 @@
         }
         else
         {
-            System.err.println( "Add of entry " + entry.getDn()
-                + " failed for the following reasons provided by the server:\n" + result.getErrorMessage() );
+            System.err.println( I18n.err( I18n.ERR_203, entry.getDn(), result.getErrorMessage() ) );
 
             return IMPORT_ERROR;
         }
@@ -330,8 +330,7 @@
         }
         else
         {
-            System.err.println( "Delete of entry " + entry.getDn()
-                + " failed for the following reasons provided by the server:\n" + result.getErrorMessage() );
+            System.err.println( I18n.err( I18n.ERR_204, entry.getDn(), result.getErrorMessage() ) );
             return IMPORT_ERROR;
         }
     }
@@ -396,8 +395,7 @@
         }
         else
         {
-            System.err.println( "ModifyDn of entry " + entry.getDn()
-                + " failed for the following reasons provided by the server:\n" + result.getErrorMessage() );
+            System.err.println( I18n.err( I18n.ERR_205, entry.getDn(), result.getErrorMessage() ) );
             return IMPORT_ERROR;
         }
     }
@@ -465,8 +463,7 @@
         }
         else
         {
-            System.err.println( "Modify of entry " + entry.getDn()
-                + " failed for the following reasons provided by the server:\n" + result.getErrorMessage() );
+            System.err.println( I18n.err( I18n.ERR_206, entry.getDn(), result.getErrorMessage() ) );
             return IMPORT_ERROR;
         }
     }
@@ -553,8 +550,7 @@
         }
         else
         {
-            System.err.println( "Binding of user " + user
-                + " failed for the following reasons provided by the server:\n" + result.getErrorMessage() );
+            System.err.println( I18n.err( I18n.ERR_207, user, result.getErrorMessage() ) );
             System.exit( 1 );
         }
     }
@@ -634,13 +630,13 @@
                 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 )
                     {
                         unbind( messageId );
 
-                        System.err.println( "Import failed..." );
+                        System.err.println( I18n.err( I18n.ERR_208 ) );
                         System.exit( 1 );
                     }
                 }
@@ -649,7 +645,7 @@
                 {
                     unbind( messageId );
 
-                    System.err.println( "Import failed..." );
+                    System.err.println( I18n.err( I18n.ERR_208 ) );
                     System.exit( 1 );
                 }
 
@@ -683,13 +679,13 @@
                 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 )
                     {
                         unbind( messageId );
 
-                        System.err.println( "Import failed..." );
+                        System.err.println( I18n.err( I18n.ERR_208 ) );
                         System.exit( 1 );
                     }
                 }
@@ -698,7 +694,7 @@
                 {
                     unbind( messageId );
 
-                    System.err.println( "Import failed..." );
+                    System.err.println( I18n.err( I18n.ERR_208 ) );
                     System.exit( 1 );
                 }
 
@@ -777,20 +773,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( "port value of '" + val + "' is not a number" );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is larger than max port number: "
-                    + AvailablePortFinder.MAX_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_194, val, AvailablePortFinder.MAX_PORT_NUMBER ) );
                 System.exit( 1 );
             }
             else if ( port < AvailablePortFinder.MIN_PORT_NUMBER )
             {
-                System.err.println( "port value of '" + val + "' is smaller than the minimum port number: "
-                    + AvailablePortFinder.MIN_PORT_NUMBER );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER ) );
                 System.exit( 1 );
             }
 
@@ -897,13 +891,13 @@
 
             if ( ldifFile.exists() == false )
             {
-                System.err.println( "ldif file '" + ldifFileName + "' does not exist" );
+                System.err.println( I18n.err( I18n.ERR_209, ldifFileName ) );
                 System.exit( 1 );
             }
 
             if ( ldifFile.canRead() == false )
             {
-                System.err.println( "ldif file '" + ldifFileName + "' can't be read" );
+                System.err.println( I18n.err( I18n.ERR_210, ldifFileName ) );
                 System.exit( 1 );
             }
 
@@ -921,7 +915,7 @@
         }
         else
         {
-            System.err.println( "ldif file name must be provided" );
+            System.err.println( I18n.err( I18n.ERR_211 ) );
             System.exit( 1 );
         }
     }

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Thu Jan 21 11:27:15 2010
@@ -36,6 +36,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.tools.IndexUtils;
 import org.apache.directory.shared.ldap.cursor.Cursor;
@@ -116,7 +117,7 @@
     {
         if ( !partitionDirectory.exists() )
         {
-            System.err.println( "Partition directory " + partitionDirectory + " does not exist!" );
+            System.err.println( I18n.err( I18n.ERR_196, partitionDirectory ) );
             System.exit( 1 );
         }
 

Modified: directory/apacheds/trunk/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/pom.xml?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/pom.xml (original)
+++ directory/apacheds/trunk/test-framework/pom.xml Thu Jan 21 11:27:15 2010
@@ -28,6 +28,12 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-annotations</artifactId>
       <version>${pom.version}</version>
     </dependency>  

Modified: directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original)
+++ directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Thu Jan 21 11:27:15 2010
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
 import org.apache.directory.server.core.factory.DirectoryServiceFactory;
 import org.apache.directory.server.factory.ServerAnnotationProcessor;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.protocol.shared.transport.Transport;
@@ -247,8 +248,8 @@
         }
         catch ( Exception e )
         {
-            LOG.error( "Failed to run the class {}", getTestClass().getName() );
-            LOG.error( e.getMessage() );
+            LOG.error( I18n.err( I18n.ERR_181, getTestClass().getName() ) );
+            LOG.error( e.getLocalizedMessage() );
             e.printStackTrace();
         }
     }
@@ -379,7 +380,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( "Failed to run the method {}", method );
+            LOG.error( I18n.err( I18n.ERR_182, method ) );
             LOG.error( "", e );
             e.printStackTrace();
         }

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Thu Jan 21 11:27:15 2010
@@ -38,6 +38,11 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-base</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Thu Jan 21 11:27:15 2010
@@ -199,7 +199,7 @@
         }
         catch ( Exception e )
         {
-            buf.append( "ERROR: " + e.getMessage() );
+            buf.append( "ERROR: " + e.getLocalizedMessage() );
         }
 
         if ( children.size() > 0 )

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Thu Jan 21 11:27:15 2010
@@ -44,6 +44,7 @@
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
@@ -389,8 +390,7 @@
                 msg = msg.substring( 0, 1024 ) + "\n. . . TRUNCATED . . .";
             }
 
-            msg = "Error while scanning index " + "on attribute " + index.getAttribute() + " using a " + scanType
-                + " cursor type with a key constraint of '" + key + "':\n" + msg;
+            msg = I18n.err( I18n.ERR_183, index.getAttribute(), scanType, key, msg );
 
             LOG.error( msg, e );
             JTextArea area = new JTextArea();

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Thu Jan 21 11:27:15 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 )
             {

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=901657&r1=901656&r2=901657&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Thu Jan 21 11:27:15 2010
@@ -48,6 +48,7 @@
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.apache.directory.shared.ldap.NotImplementedException;
@@ -391,8 +392,7 @@
                 msg = msg.substring( 0, 1024 ) + "\n. . . TRUNCATED . . .";
             }
 
-            msg = "Error while scanning index " + "on attribute " + index.getAttribute() + " using a " + scanType
-                + " cursor type with a key constraint of '" + key + "':\n" + msg;
+            msg = I18n.err( I18n.ERR_183, index.getAttribute(), scanType, key, msg );
 
             LOG.error( msg, e );
             JTextArea area = new JTextArea();



Mime
View raw message