directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r901635 [3/3] - in /directory/sandbox/felixk/apacheds-i18n: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/src/main/java/org/apac...
Date Thu, 21 Jan 2010 10:20:26 GMT
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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapProtocolUtils;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
@@ -236,7 +236,7 @@
         // Guard clause:  Reject unsupported SASL mechanisms.
         if ( !ldapServer.getSupportedMechanisms().contains( saslMechanism ) )
         {
-            LOG.error( Err.i18n( Err.ERR_160, saslMechanism ) );
+            LOG.error( I18n.err( I18n.ERR_160, saslMechanism ) );
 
             return false;
         }
@@ -445,7 +445,7 @@
 
         if ( mechanismHandler == null )
         {
-            String message = Err.i18n( Err.ERR_161, saslMechanism );
+            String message = I18n.err( I18n.ERR_161, saslMechanism );
 
             // Clear the saslProperties, and move to the anonymous state
             ldapSession.clearSaslProperties();
@@ -576,10 +576,10 @@
         // Guard clause:  LDAP version 3
         if ( !bindRequest.getVersion3() )
         {
-            LOG.error( Err.i18n( Err.ERR_162 ) );
+            LOG.error( I18n.err( I18n.ERR_162 ) );
             InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
             bindResult.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
-            bindResult.setErrorMessage( Err.i18n( Err.ERR_163 ) );
+            bindResult.setErrorMessage( I18n.err( I18n.ERR_163 ) );
             ldapSession.getIoSession().write( bindRequest.getResultResponse() );
             return;
         }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Thu Jan 21 10:20:06 2010
@@ -30,7 +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.Err;
+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;
@@ -102,7 +102,7 @@
         }
         catch ( NamingException e )
         {
-            LOG.error( Err.i18n( Err.ERR_164 ), e );
+            LOG.error( I18n.err( I18n.ERR_164 ), e );
         }
     }
     

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -26,7 +26,7 @@
 
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -218,7 +218,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( Err.i18n( Err.ERR_165, ref, referralAncestor ) );
+                LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
             
             LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
@@ -317,7 +317,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( Err.i18n( Err.ERR_165, ref, referralAncestor ) );
+                LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
             
             // Normalize the DN to check for same dn

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
Thu Jan 21 10:20:06 2010
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.event.DirectoryListener;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -94,7 +94,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_166, req.getMessageId() ), e );
+            LOG.error( I18n.err( I18n.ERR_166, req.getMessageId() ), e );
         }
     }
 }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Thu Jan 21 10:20:06 2010
@@ -38,7 +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.Err;
+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;
@@ -188,7 +188,7 @@
                 if ( hasRootDSE )
                 {
                     // This is an error ! We should never find more than one rootDSE !
-                    LOG.error( Err.i18n( Err.ERR_167 ) );
+                    LOG.error( I18n.err( I18n.ERR_167 ) );
                 }
                 else
                 {
@@ -212,7 +212,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( Err.i18n( Err.ERR_168 ), e );
+                    LOG.error( I18n.err( I18n.ERR_168 ), e );
                 }
             }
         }
@@ -577,7 +577,7 @@
                     }
                     catch ( NamingException e )
                     {
-                        LOG.error( Err.i18n( Err.ERR_168 ), e );
+                        LOG.error( I18n.err( I18n.ERR_168 ), e );
                     }
                 }
                 
@@ -670,7 +670,7 @@
                 }
                 catch ( NamingException ne )
                 {
-                    LOG.error( Err.i18n( Err.ERR_168 ), ne );
+                    LOG.error( I18n.err( I18n.ERR_168 ), ne );
                 }
             }
         }
@@ -742,7 +742,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( Err.i18n( Err.ERR_168 ), e );
+                    LOG.error( I18n.err( I18n.ERR_168 ), e );
                 }
             }
         }
@@ -792,7 +792,7 @@
                 }
                 catch ( LdapURLEncodingException e )
                 {
-                    LOG.error( Err.i18n( Err.ERR_165, url, entry ) );
+                    LOG.error( I18n.err( I18n.ERR_165, url, entry ) );
                 }
 
                 switch( req.getScope() )
@@ -1175,7 +1175,7 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                LOG.error( Err.i18n( Err.ERR_165, refstr, entry ) );
+                LOG.error( I18n.err( I18n.ERR_165, refstr, entry ) );
                 continue;
             }
             

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
Thu Jan 21 10:20:06 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.ldap.handlers;
 
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 
@@ -52,7 +52,7 @@
         }
         catch ( Throwable t )
         {
-            LOG.error( Err.i18n( Err.ERR_169 ), t );
+            LOG.error( I18n.err( I18n.ERR_169 ), t );
         }
     }
 }
\ No newline at end of file

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
Thu Jan 21 10:20:06 2010
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.server.i18n.Err;
+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;
@@ -153,7 +153,7 @@
         }
         else
         {
-            LOG.error( Err.i18n( Err.ERR_159, requestor.getRemoteAddress() ) );
+            LOG.error( I18n.err( I18n.ERR_159, requestor.getRemoteAddress() ) );
         }
         requestor.close( true );
     }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
Thu Jan 21 10:20:06 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.ldap.replication;
 
 
-import org.apache.directory.server.i18n.Err;
+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;
@@ -94,7 +94,7 @@
             }
             catch( Exception e )
             {
-                LOG.error( Err.i18n( Err.ERR_170 ), e );
+                LOG.error( I18n.err( I18n.ERR_170 ), e );
             }
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
Thu Jan 21 10:20:06 2010
@@ -31,7 +31,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -230,11 +230,11 @@
         }
         catch ( FileNotFoundException fnfe )
         {
-            log.error( Err.i18n( Err.ERR_173 ) );
+            log.error( I18n.err( I18n.ERR_173 ) );
         }
         catch ( Exception ioe )
         {
-            log.error( Err.i18n( Err.ERR_174 ), ioe );
+            log.error( I18n.err( I18n.ERR_174 ), ioe );
         }
         finally
         {
@@ -246,7 +246,7 @@
                 }
                 catch ( Exception e )
                 {
-                    log.error( Err.i18n( Err.ERR_175 ), e );
+                    log.error( I18n.err( I18n.ERR_175 ), e );
                 }
             }
         }

Modified: directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
Thu Jan 21 10:20:06 2010
@@ -52,7 +52,7 @@
 import org.apache.directory.server.core.event.RegistrationEntry;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
@@ -548,7 +548,7 @@
                 }
                 catch ( Exception e )
                 {
-                    LOG.error( Err.i18n( Err.ERR_176 ), e );
+                    LOG.error( I18n.err( I18n.ERR_176 ), e );
                 }
             }
             
@@ -561,7 +561,7 @@
                 }
                 catch ( Exception e )
                 {
-                    LOG.error( Err.i18n( Err.ERR_177 ), e );
+                    LOG.error( I18n.err( I18n.ERR_177 ), e );
                 }
             }
         }
@@ -615,7 +615,7 @@
             }
             catch ( Exception e )
             {
-                LOG.error( Err.i18n( Err.ERR_178 ), e );
+                LOG.error( I18n.err( I18n.ERR_178 ), e );
             }
             finally
             {

Modified: directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Thu Jan 21 10:20:06 2010
@@ -35,7 +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.Err;
+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;
@@ -277,7 +277,7 @@
         }
         catch ( IOException e )
         {
-            LOG.error( Err.i18n( Err.ERR_179 ), e );
+            LOG.error( I18n.err( I18n.ERR_179 ), e );
             return null;
         }
 
@@ -365,7 +365,7 @@
             {
                 // If the file can't be read, log the error, and stop
                 // loading LDIFs.
-                LOG.error( Err.i18n( Err.ERR_180, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage()
) );
+                LOG.error( I18n.err( I18n.ERR_180, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage()
) );
                 throw ne;
             }
         }
@@ -401,7 +401,7 @@
                 {
                     // If the file can't be read, log the error, and stop
                     // loading LDIFs.
-                    LOG.error( Err.i18n( Err.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage()
) );
+                    LOG.error( I18n.err( I18n.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage()
) );
                     throw ne;
                 }
             }

Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
Thu Jan 21 10:20:06 2010
@@ -26,7 +26,7 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.directory.daemon.InstanceLayout;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -48,7 +48,7 @@
 
         if ( args.length == 0 )
         {
-            System.err.println( Err.i18n( Err.ERR_184, tools.getProductCommand() ) );
+            System.err.println( I18n.err( I18n.ERR_184, tools.getProductCommand() ) );
             System.exit( 1 );
         }
 
@@ -77,8 +77,8 @@
         ToolCommand cmd = ( ToolCommand ) tools.getCommands().get( command );
         if ( cmd == null )
         {
-            System.err.println( Err.i18n( Err.ERR_185, args[0] ) );
-            System.err.println( Err.i18n( Err.ERR_184, tools.getProductCommand() ) );
+            System.err.println( I18n.err( I18n.ERR_185, args[0] ) );
+            System.err.println( I18n.err( I18n.ERR_184, tools.getProductCommand() ) );
             System.exit( 1 );
         }
 
@@ -101,7 +101,7 @@
         }
         else if ( cmdline.hasOption( 'c' ) )
         {
-            System.err.println( Err.i18n( Err.ERR_186 ) );
+            System.err.println( I18n.err( I18n.ERR_186 ) );
             System.exit( 1 );
         }
 

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -37,7 +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.Err;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -146,27 +146,27 @@
         }
         catch ( AlreadySelectedException ase )
         {
-            System.err.println( Err.i18n( Err.ERR_187, command, ase.getLocalizedMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_187, command, ase.getLocalizedMessage()
) );
             System.exit( 1 );
         }
         catch ( MissingArgumentException mae )
         {
-            System.err.println( Err.i18n( Err.ERR_188, command, mae.getLocalizedMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_188, command, mae.getLocalizedMessage()
) );
             System.exit( 1 );
         }
         catch ( MissingOptionException moe )
         {
-            System.err.println( Err.i18n( Err.ERR_189, command, moe.getLocalizedMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_189, command, moe.getLocalizedMessage()
) );
             System.exit( 1 );
         }
         catch ( UnrecognizedOptionException uoe )
         {
-            System.err.println( Err.i18n( Err.ERR_190, command, uoe.getLocalizedMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_190, command, uoe.getLocalizedMessage()
) );
             System.exit( 1 );
         }
         catch ( ParseException pe )
         {
-            System.err.println( Err.i18n( Err.ERR_191, command, pe.getClass() ) );
+            System.err.println( I18n.err( I18n.ERR_191, command, pe.getClass() ) );
             System.exit( 1 );
         }
 
@@ -233,7 +233,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_192, command ) );
+            System.err.println( I18n.err( I18n.ERR_192, command ) );
             System.exit( 1 );
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
Thu Jan 21 10:20:06 2010
@@ -37,7 +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.Err;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -199,18 +199,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_193, val ) );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( Err.i18n( Err.ERR_194, val, 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( Err.i18n( Err.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
                 System.exit( 1 );
             }
 

Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
Thu Jan 21 10:20:06 2010
@@ -28,7 +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.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiRequest;
 
 
@@ -107,18 +107,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_193, val ) );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( Err.i18n( Err.ERR_194, val, 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( Err.i18n( Err.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
                 System.exit( 1 );
             }
 

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -35,7 +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.Err;
+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;
@@ -205,18 +205,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_193, val ) );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( Err.i18n( Err.ERR_194, val, 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( Err.i18n( Err.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
                 System.exit( 1 );
             }
 

Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
Thu Jan 21 10:20:06 2010
@@ -44,7 +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.Err;
+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;
@@ -195,7 +195,7 @@
     {
         if ( !partitionDirectory.exists() )
         {
-            System.err.println( Err.i18n( Err.ERR_196, partitionDirectory ) );
+            System.err.println( I18n.err( I18n.ERR_196, partitionDirectory ) );
             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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -30,7 +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.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest;
 
 
@@ -199,18 +199,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_193, val ) );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( Err.i18n( Err.ERR_194, val, 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( Err.i18n( Err.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
                 System.exit( 1 );
             }
 
@@ -282,18 +282,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_197, val ) );
+                System.err.println( I18n.err( I18n.ERR_197, val ) );
                 System.exit( 1 );
             }
 
             if ( delay > DELAY_MAX )
             {
-                System.err.println( Err.i18n( Err.ERR_198, val, DELAY_MAX ) );
+                System.err.println( I18n.err( I18n.ERR_198, val, DELAY_MAX ) );
                 System.exit( 1 );
             }
             else if ( delay < 0 )
             {
-                System.err.println( Err.i18n( Err.ERR_199, val ) );
+                System.err.println( I18n.err( I18n.ERR_199, val ) );
                 System.exit( 1 );
             }
 
@@ -320,18 +320,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_200, val ) );
+                System.err.println( I18n.err( I18n.ERR_200, val ) );
                 System.exit( 1 );
             }
 
             if ( timeOffline > TIME_OFFLINE_MAX )
             {
-                System.err.println( Err.i18n( Err.ERR_201, val, 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( Err.i18n( Err.ERR_202, val ) );
+                System.err.println( I18n.err( I18n.ERR_202, val ) );
                 System.exit( 1 );
             }
 

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -35,7 +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.Err;
+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;
@@ -271,7 +271,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_203, entry.getDn(), result.getErrorMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_203, entry.getDn(), result.getErrorMessage()
) );
 
             return IMPORT_ERROR;
         }
@@ -330,7 +330,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_204, entry.getDn(), result.getErrorMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_204, entry.getDn(), result.getErrorMessage()
) );
             return IMPORT_ERROR;
         }
     }
@@ -395,7 +395,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_205, entry.getDn(), result.getErrorMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_205, entry.getDn(), result.getErrorMessage()
) );
             return IMPORT_ERROR;
         }
     }
@@ -463,7 +463,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_206, entry.getDn(), result.getErrorMessage()
) );
+            System.err.println( I18n.err( I18n.ERR_206, entry.getDn(), result.getErrorMessage()
) );
             return IMPORT_ERROR;
         }
     }
@@ -550,7 +550,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_207, user, result.getErrorMessage() ) );
+            System.err.println( I18n.err( I18n.ERR_207, user, result.getErrorMessage() )
);
             System.exit( 1 );
         }
     }
@@ -636,7 +636,7 @@
                     {
                         unbind( messageId );
 
-                        System.err.println( Err.i18n( Err.ERR_208 ) );
+                        System.err.println( I18n.err( I18n.ERR_208 ) );
                         System.exit( 1 );
                     }
                 }
@@ -645,7 +645,7 @@
                 {
                     unbind( messageId );
 
-                    System.err.println( Err.i18n( Err.ERR_208 ) );
+                    System.err.println( I18n.err( I18n.ERR_208 ) );
                     System.exit( 1 );
                 }
 
@@ -685,7 +685,7 @@
                     {
                         unbind( messageId );
 
-                        System.err.println( Err.i18n( Err.ERR_208 ) );
+                        System.err.println( I18n.err( I18n.ERR_208 ) );
                         System.exit( 1 );
                     }
                 }
@@ -694,7 +694,7 @@
                 {
                     unbind( messageId );
 
-                    System.err.println( Err.i18n( Err.ERR_208 ) );
+                    System.err.println( I18n.err( I18n.ERR_208 ) );
                     System.exit( 1 );
                 }
 
@@ -773,18 +773,18 @@
             }
             catch ( NumberFormatException e )
             {
-                System.err.println( Err.i18n( Err.ERR_193, val ) );
+                System.err.println( I18n.err( I18n.ERR_193, val ) );
                 System.exit( 1 );
             }
 
             if ( port > AvailablePortFinder.MAX_PORT_NUMBER )
             {
-                System.err.println( Err.i18n( Err.ERR_194, val, 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( Err.i18n( Err.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
+                System.err.println( I18n.err( I18n.ERR_195, val, AvailablePortFinder.MIN_PORT_NUMBER
) );
                 System.exit( 1 );
             }
 
@@ -891,13 +891,13 @@
 
             if ( ldifFile.exists() == false )
             {
-                System.err.println( Err.i18n( Err.ERR_209, ldifFileName ) );
+                System.err.println( I18n.err( I18n.ERR_209, ldifFileName ) );
                 System.exit( 1 );
             }
 
             if ( ldifFile.canRead() == false )
             {
-                System.err.println( Err.i18n( Err.ERR_210, ldifFileName ) );
+                System.err.println( I18n.err( I18n.ERR_210, ldifFileName ) );
                 System.exit( 1 );
             }
 
@@ -915,7 +915,7 @@
         }
         else
         {
-            System.err.println( Err.i18n( Err.ERR_211 ) );
+            System.err.println( I18n.err( I18n.ERR_211 ) );
             System.exit( 1 );
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
Thu Jan 21 10:20:06 2010
@@ -36,7 +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.Err;
+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;
@@ -117,7 +117,7 @@
     {
         if ( !partitionDirectory.exists() )
         {
-            System.err.println( Err.i18n( Err.ERR_196, partitionDirectory ) );
+            System.err.println( I18n.err( I18n.ERR_196, partitionDirectory ) );
             System.exit( 1 );
         }
 

Modified: directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
Thu Jan 21 10:20:06 2010
@@ -30,7 +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.Err;
+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;
@@ -248,7 +248,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_181, getTestClass().getName() ) );
+            LOG.error( I18n.err( I18n.ERR_181, getTestClass().getName() ) );
             LOG.error( e.getLocalizedMessage() );
             e.printStackTrace();
         }
@@ -380,7 +380,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_182, method ) );
+            LOG.error( I18n.err( I18n.ERR_182, method ) );
             LOG.error( "", e );
             e.printStackTrace();
         }

Modified: directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.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/IndexDialog.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
Thu Jan 21 10:20:06 2010
@@ -44,7 +44,7 @@
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 
-import org.apache.directory.server.i18n.Err;
+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;
@@ -390,7 +390,7 @@
                 msg = msg.substring( 0, 1024 ) + "\n. . . TRUNCATED . . .";
             }
 
-            msg = Err.i18n( Err.ERR_183, index.getAttribute(), scanType, key, msg );
+            msg = I18n.err( I18n.ERR_183, index.getAttribute(), scanType, key, msg );
 
             LOG.error( msg, e );
             JTextArea area = new JTextArea();

Modified: directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
(original)
+++ directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
Thu Jan 21 10:20:06 2010
@@ -48,7 +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.Err;
+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;
@@ -392,7 +392,7 @@
                 msg = msg.substring( 0, 1024 ) + "\n. . . TRUNCATED . . .";
             }
 
-            msg = Err.i18n( Err.ERR_183, index.getAttribute(), scanType, key, msg );
+            msg = I18n.err( I18n.ERR_183, index.getAttribute(), scanType, key, msg );
 
             LOG.error( msg, e );
             JTextArea area = new JTextArea();



Mime
View raw message