directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r901583 - in /directory/sandbox/felixk/apacheds-i18n: i18n/src/main/resources/org/apache/directory/server/i18n/ protocol-changepw/ protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ protocol-changepw/src/main/jav...
Date Thu, 21 Jan 2010 07:36:08 GMT
Author: felixk
Date: Thu Jan 21 07:33:32 2010
New Revision: 901583

URL: http://svn.apache.org/viewvc?rev=901583&view=rev
Log:
Some i18n extractions ...

Modified:
    directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/sandbox/felixk/apacheds-i18n/protocol-changepw/pom.xml
    directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
    directory/sandbox/felixk/apacheds-i18n/protocol-dns/pom.xml
    directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java
    directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java
    directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
    directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/pom.xml
    directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
    directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
    directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/pom.xml
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
    directory/sandbox/felixk/apacheds-i18n/protocol-shared/pom.xml
    directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/sandbox/felixk/apacheds-i18n/server-integ/pom.xml
    directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
    directory/sandbox/felixk/apacheds-i18n/server-jndi/pom.xml
    directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
    directory/sandbox/felixk/apacheds-i18n/test-framework/pom.xml
    directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/sandbox/felixk/apacheds-i18n/xdbm-tools/pom.xml
    directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
    directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties Thu Jan 21 07:33:32 2010
@@ -169,38 +169,38 @@
 ERR\ 149=More than one server entry found for kerberos principal name {0}: 
 ERR\ 150=Cannot initialize a partition without a valid suffix
 ERR\ 151=The {0} can't be created : {1}
-ERR\ 152=
-ERR\ 153=
-ERR\ 154=
-ERR\ 155=
-ERR\ 156=
-ERR\ 157=
-ERR\ 158=
-ERR\ 159=
-ERR\ 160=
-ERR\ 161=
-ERR\ 162=
-ERR\ 163=
-ERR\ 164=
-ERR\ 165=
-ERR\ 166=
-ERR\ 167=
-ERR\ 168=
-ERR\ 169=
-ERR\ 170=
-ERR\ 171=
-ERR\ 172=
-ERR\ 173=
-ERR\ 174=
-ERR\ 175=
-ERR\ 176=
-ERR\ 177=
-ERR\ 178=
-ERR\ 179=
-ERR\ 180=
-ERR\ 181=
-ERR\ 182=
-ERR\ 183=
+ERR\ 152=Unexpected exception: {0}
+ERR\ 153=Error in request monitor
+ERR\ 154=Error in context monitor
+ERR\ 155=Error in reply monitor
+ERR\ 156=Failed to get catalog context 
+ERR\ 157=Failed to get initial context 
+ERR\ 158=failed to rebind ldap service
+ERR\ 159=Failed to write GracefulShutdownResponse to client: {0}
+ERR\ 160=Bind error : {0} mechanism not supported. Please check the server.xml configuration file (supportedMechanisms field)
+ERR\ 161=Handler unavailable for {0}
+ERR\ 162=Bind error : Only LDAP v3 is supported.
+ERR\ 163=Only LDAP v3 is supported.
+ERR\ 164=failed to properly abandon this persistent search
+ERR\ 165=Bad URL ({0}) for ref in {1}.  Reference will be ignored.
+ERR\ 166=Failed to close the search cursor for message {0} on abandon request.
+ERR\ 167=Got back more than one entry for search on RootDSE which means Cursor is not functioning properly!
+ERR\ 168=failed on list.close()
+ERR\ 169=failed to unbind session properly
+ERR\ 170=Failed to send a search request with RefreshAndPersist mode
+ERR\ 171=Failed to bind an LDAP service ({0}) to the service registry.
+ERR\ 172=Failing on cursor close : {0}
+ERR\ 173=LDIF file does not exist.
+ERR\ 174=Failed to import LDIF into backing store.
+ERR\ 175=failed to close stream
+ERR\ 176=Error closing NamingEnumeration on PSearchListener
+ERR\ 177=Error closing connection on PSearchListener
+ERR\ 178=PSearchListener encountered error
+ERR\ 179=could not get canonical path
+ERR\ 180=Cannot load the ldif file '{0}', error : {1} 
+ERR\ 181=Failed to run the class {0}
+ERR\ 182=Failed to run the method {0}
+ERR\ 183=Error while scanning index on attribute {0} using a {1} cursor type with a key constraint of '{2}':\n" + {3}
 ERR\ 184=
 ERR\ 185=
 ERR\ 186=

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-changepw/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-changepw/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-changepw/pom.xml Thu Jan 21 07:33:32 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-kerberos-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Thu Jan 21 07:33:32 2010
@@ -35,6 +35,7 @@
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
 import org.apache.directory.server.changepw.service.ChangePasswordContext;
 import org.apache.directory.server.changepw.service.ChangePasswordService;
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
 import org.apache.directory.server.kerberos.shared.messages.ErrorMessageModifier;
@@ -159,7 +160,7 @@
         }
         catch ( Exception e )
         {
-            log.error( "Unexpected exception:  " + e.getMessage(), e );
+            log.error( Err.i18n( Err.ERR_152, e.getLocalizedMessage() ), e );
 
             session.write( getErrorMessage( config.getServicePrincipal(), new ChangePasswordException(
                 ErrorType.KRB5_KPASSWD_UNKNOWN_ERROR ) ) );

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Thu Jan 21 07:33:32 2010
@@ -36,6 +36,7 @@
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
 import org.apache.directory.server.changepw.value.ChangePasswordData;
 import org.apache.directory.server.changepw.value.ChangePasswordDataModifier;
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.kerberos.shared.KerberosUtils;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
@@ -144,7 +145,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in request monitor", e );
+            LOG.error( Err.i18n( Err.ERR_152 ), e );
         }
     }
     
@@ -341,7 +342,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in context monitor", e );
+            LOG.error( Err.i18n( Err.ERR_154 ), e );
         }
     }
     
@@ -429,7 +430,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in reply monitor", e );
+            LOG.error( Err.i18n( Err.ERR_155 ), e );
         }
     }
 }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/pom.xml Thu Jan 21 07:33:32 2010
@@ -37,6 +37,12 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
     <!-- TODO remove dependency on JNDI core -->
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java Thu Jan 21 07:33:32 2010
@@ -34,6 +34,7 @@
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.messages.ResponseCode;
 import org.apache.directory.server.dns.store.RecordStore;
+import org.apache.directory.server.i18n.Err;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +85,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in request monitor", e );
+            LOG.error( Err.i18n( Err.ERR_153 ), e );
         }
     }
     
@@ -146,7 +147,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in context monitor", e );
+            LOG.error( Err.i18n( Err.ERR_154 ), e );
         }
     }
     
@@ -188,7 +189,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in reply monitor", e );
+            LOG.error( Err.i18n( Err.ERR_155 ), e );
         }
     }
     

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java Thu Jan 21 07:33:32 2010
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.store.RecordStore;
+import org.apache.directory.server.i18n.Err;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.handler.chain.IoHandlerCommand;
 import org.slf4j.Logger;
@@ -62,7 +63,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                log.error( "Error in context monitor", e );
+                log.error( Err.i18n( Err.ERR_154 ), e );
             }
         }
 

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java Thu Jan 21 07:33:32 2010
@@ -28,6 +28,7 @@
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.messages.ResponseCode;
 import org.apache.directory.server.dns.store.jndi.operations.GetRecords;
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
 import org.apache.directory.server.protocol.shared.catalog.Catalog;
 import org.apache.directory.server.protocol.shared.catalog.GetCatalog;
@@ -70,8 +71,8 @@
         }
         catch ( Exception e )
         {
-            LOG.error( e.getMessage(), e );
-            String message = "Failed to get catalog context " + catalogBaseDn;
+            LOG.error( e.getLocalizedMessage(), e );
+            String message = Err.i18n( Err.ERR_156, catalogBaseDn );
             throw new ServiceConfigurationException( message, e );
         }
     }
@@ -95,8 +96,8 @@
         }
         catch ( NamingException ne )
         {
-            LOG.error( ne.getMessage(), ne );
-            String message = "Failed to get initial context " + question.getDomainName();
+            LOG.error( ne.getLocalizedMessage(), ne );
+            String message = Err.i18n( Err.ERR_157, question.getDomainName() );
             throw new ServiceConfigurationException( message, ne );
         }
         catch ( Exception e )

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/pom.xml Thu Jan 21 07:33:32 2010
@@ -41,6 +41,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-kerberos-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java Thu Jan 21 07:33:32 2010
@@ -28,6 +28,7 @@
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.kerberos.kdc.KdcContext;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.kerberos.sam.SamException;
@@ -635,7 +636,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                LOG.error( "Error in request monitor", e );
+                LOG.error( Err.i18n( Err.ERR_153 ), e );
             }
         }
     }
@@ -684,7 +685,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in context monitor", e );
+            LOG.error( Err.i18n( Err.ERR_154 ), e );
         }
     }
     
@@ -722,7 +723,7 @@
                 catch ( Exception e )
                 {
                     // This is a monitor.  No exceptions should bubble up.
-                    LOG.error( "Error in reply monitor", e );
+                    LOG.error( Err.i18n( Err.ERR_155 ), e );
                 }
             }
         }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java Thu Jan 21 07:33:32 2010
@@ -28,6 +28,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.kerberos.kdc.KdcContext;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.kerberos.shared.KerberosConstants;
@@ -160,7 +161,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in request monitor", e );
+            LOG.error( Err.i18n( Err.ERR_153 ), e );
         }
     }
     
@@ -484,7 +485,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( "Error in context monitor", e );
+            LOG.error( Err.i18n( Err.ERR_154 ), e );
         }
     }
 
@@ -520,7 +521,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                LOG.error( "Error in reply monitor", e );
+                LOG.error( Err.i18n( Err.ERR_155 ), e );
             }
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Thu Jan 21 07:33:32 2010
@@ -25,6 +25,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext;
 import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationService;
@@ -192,7 +193,7 @@
         catch ( Exception e )
         {
         e.printStackTrace();
-            log.error( "Unexpected exception:  " + e.getMessage(), e );
+            log.error( Err.i18n( Err.ERR_152, e.getLocalizedMessage() ), e );
 
             session.write( getErrorMessage( config.getServicePrincipal(), new KerberosException(
                 ErrorType.KDC_ERR_SVC_UNAVAILABLE ) ) );
@@ -245,7 +246,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            log.error( "Error in reply monitor", e );
+            log.error( Err.i18n( Err.ERR_155 ), e );
         }
     }
 }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/pom.xml Thu Jan 21 07:33:32 2010
@@ -38,6 +38,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-kerberos-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Thu Jan 21 07:33:32 2010
@@ -40,6 +40,7 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.security.CoreKeyStoreSpi;
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.ldap.handlers.AbandonHandler;
 import org.apache.directory.server.ldap.handlers.AddHandler;
 import org.apache.directory.server.ldap.handlers.BindHandler;
@@ -577,7 +578,7 @@
         }
         catch ( IOException e )
         {
-            String msg = "Failed to bind an LDAP service (" + transport.getPort() + ") to the service registry.";
+            String msg = Err.i18n( Err.ERR_171, transport.getPort() );
             LdapConfigurationException lce = new LdapConfigurationException( msg );
             lce.setRootCause( e );
             LOG.error( msg, e );

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Thu Jan 21 07:33:32 2010
@@ -29,6 +29,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
 import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.BindStatus;
@@ -408,7 +409,7 @@
                     }
                     catch ( Exception e )
                     {
-                        LOG.error( "Failing on cursor close : {}", e.getMessage() );
+                        LOG.error( Err.i18n( Err.ERR_172, e.getLocalizedMessage() ) );
                     }
                 }
             }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java Thu Jan 21 07:33:32 2010
@@ -45,6 +45,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.apache.directory.server.i18n.Err;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler;
@@ -837,7 +838,7 @@
                     }
                     catch ( IOException e1 )
                     {
-                        LOG.error( "failed to rebind ldap service", e1 );
+                        LOG.error( Err.i18n( Err.ERR_158 ), e1 );
                         JOptionPane.showMessageDialog( SessionsFrame.this, e1.getMessage(), "Error encountered!",
                             JOptionPane.ERROR_MESSAGE );
                     }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -32,6 +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.ldap.LdapProtocolUtils;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
@@ -235,8 +236,7 @@
         // Guard clause:  Reject unsupported SASL mechanisms.
         if ( !ldapServer.getSupportedMechanisms().contains( saslMechanism ) )
         {
-            LOG.error( "Bind error : {} mechanism not supported. Please check the server.xml "
-                + "configuration file (supportedMechanisms field)", saslMechanism );
+            LOG.error( Err.i18n( Err.ERR_160, saslMechanism ) );
 
             return false;
         }
@@ -370,7 +370,7 @@
 
         if ( e != null )
         {
-            message = ResultCodeEnum.INVALID_CREDENTIALS + ": " + e.getMessage();
+            message = ResultCodeEnum.INVALID_CREDENTIALS + ": " + e.getLocalizedMessage();
         }
         else
         {
@@ -445,7 +445,7 @@
 
         if ( mechanismHandler == null )
         {
-            String message = "Handler unavailable for " + saslMechanism;
+            String message = Err.i18n( Err.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( "Bind error : Only LDAP v3 is supported." );
+            LOG.error( Err.i18n( Err.ERR_162 ) );
             InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
             bindResult.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
-            bindResult.setErrorMessage( "Only LDAP v3 is supported." );
+            bindResult.setErrorMessage( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.ERR_167 ) );
                 }
                 else
                 {
@@ -212,7 +212,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( "failed on list.close()", e );
+                    LOG.error( Err.i18n( Err.ERR_168 ), e );
                 }
             }
         }
@@ -577,7 +577,7 @@
                     }
                     catch ( NamingException e )
                     {
-                        LOG.error( "failed on list.close()", e );
+                        LOG.error( Err.i18n( Err.ERR_168 ), e );
                     }
                 }
                 
@@ -670,7 +670,7 @@
                 }
                 catch ( NamingException ne )
                 {
-                    LOG.error( "failed on list.close()", ne );
+                    LOG.error( Err.i18n( Err.ERR_168 ), ne );
                 }
             }
         }
@@ -742,7 +742,7 @@
                 }
                 catch ( NamingException e )
                 {
-                    LOG.error( "failed on list.close()", e );
+                    LOG.error( Err.i18n( Err.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( Err.i18n( Err.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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.ldap.handlers;
 
 
+import org.apache.directory.server.i18n.Err;
 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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.server.i18n.Err;
 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( Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.ldap.replication;
 
 
+import org.apache.directory.server.i18n.Err;
 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( Err.i18n( Err.ERR_170 ), e );
             }
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/protocol-shared/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/protocol-shared/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/protocol-shared/pom.xml Thu Jan 21 07:33:32 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/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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.ERR_173 ) );
         }
         catch ( Exception ioe )
         {
-            log.error( "Failed to import LDIF into backing store.", ioe );
+            log.error( Err.i18n( Err.ERR_174 ), ioe );
         }
         finally
         {
@@ -245,7 +246,7 @@
                 }
                 catch ( Exception e )
                 {
-                    log.error( "failed to close stream", e );
+                    log.error( Err.i18n( Err.ERR_175 ), e );
                 }
             }
         }

Modified: directory/sandbox/felixk/apacheds-i18n/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-integ/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-integ/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-integ/pom.xml Thu Jan 21 07:33:32 2010
@@ -49,6 +49,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-interceptor-kerberos</artifactId>
       <version>${pom.version}</version>
     </dependency>  

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=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -52,6 +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.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;
@@ -547,7 +548,7 @@
                 }
                 catch ( Exception e )
                 {
-                    LOG.error( "Error closing NamingEnumeration on PSearchListener", e );
+                    LOG.error( Err.i18n( Err.ERR_176 ), e );
                 }
             }
             
@@ -560,7 +561,7 @@
                 }
                 catch ( Exception e )
                 {
-                    LOG.error( "Error closing connection on PSearchListener", e );
+                    LOG.error( Err.i18n( Err.ERR_177 ), e );
                 }
             }
         }
@@ -614,7 +615,7 @@
             }
             catch ( Exception e )
             {
-                LOG.error( "PSearchListener encountered error", e );
+                LOG.error( Err.i18n( Err.ERR_178 ), e );
             }
             finally
             {

Modified: directory/sandbox/felixk/apacheds-i18n/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/server-jndi/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/server-jndi/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/server-jndi/pom.xml Thu Jan 21 07:33:32 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/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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.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( Err.i18n( Err.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( Err.i18n( Err.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage() ) );
                     throw ne;
                 }
             }

Modified: directory/sandbox/felixk/apacheds-i18n/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/test-framework/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/test-framework/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/test-framework/pom.xml Thu Jan 21 07:33:32 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/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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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( Err.i18n( Err.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( Err.i18n( Err.ERR_182, method ) );
             LOG.error( "", e );
             e.printStackTrace();
         }

Modified: directory/sandbox/felixk/apacheds-i18n/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/xdbm-tools/pom.xml?rev=901583&r1=901582&r2=901583&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/xdbm-tools/pom.xml (original)
+++ directory/sandbox/felixk/apacheds-i18n/xdbm-tools/pom.xml Thu Jan 21 07:33:32 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/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=901583&r1=901582&r2=901583&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 07:33:32 2010
@@ -44,6 +44,7 @@
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 
+import org.apache.directory.server.i18n.Err;
 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 = Err.i18n( Err.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=901583&r1=901582&r2=901583&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 07:33:32 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.Err;
 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 = Err.i18n( Err.ERR_183, index.getAttribute(), scanType, key, msg );
 
             LOG.error( msg, e );
             JTextArea area = new JTextArea();



Mime
View raw message