directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r901635 [2/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/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Thu Jan 21 10:20:06 2010
@@ -31,7 +31,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -124,7 +124,7 @@
         }
         catch ( Exception e )
         {
-            log.error( Err.i18n( Err.ERR_69, name ), e );
+            log.error( I18n.err( I18n.ERR_69, name ), e );
         }
 
         throw new ClassNotFoundException();
@@ -205,7 +205,7 @@
         }
         catch ( Exception e ) 
         {
-            String msg = Err.i18n( Err.ERR_70, name );
+            String msg = I18n.err( I18n.ERR_70, name );
             log.error( msg, e );
             throw new ClassNotFoundException( msg );
         }

Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Jan 21 10:20:06 2010
@@ -57,7 +57,7 @@
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
 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.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -1039,7 +1039,7 @@
             }
             catch ( Exception e )
             {
-                String msg = Err.i18n( Err.ERR_71 );
+                String msg = I18n.err( I18n.ERR_71 );
                 LOG.error( msg, e );
                 throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
             }

Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Thu Jan 21 10:20:06 2010
@@ -46,7 +46,7 @@
 import org.apache.directory.server.core.sp.StoredProcExecutionManager;
 import org.apache.directory.server.core.sp.java.JavaStoredProcEngineConfig;
 import org.apache.directory.server.core.subtree.SubentryInterceptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -178,7 +178,7 @@
             }
             catch ( ParseException e )
             {
-                String msg = Err.i18n( Err.ERR_72, triggerString );
+                String msg = I18n.err( I18n.ERR_72, triggerString );
                 LOG.error( msg, e );
                 throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
             }

Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Thu Jan 21 10:20:06 2010
@@ -43,7 +43,7 @@
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 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.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -185,7 +185,7 @@
             }
             catch ( ParseException e )
             {
-                String msg = Err.i18n( Err.ERR_73, item );
+                String msg = I18n.err( I18n.ERR_73, item );
                 LOG.error( msg, e );
             }
             

Modified: directory/sandbox/felixk/apacheds-i18n/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Thu Jan 21 10:20:06 2010
@@ -26,7 +26,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.mortbay.jetty.Connector;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
@@ -100,7 +100,7 @@
             }
             catch ( Exception e )
             {
-                LOG.error( Err.i18n( Err.ERR_120 ) );
+                LOG.error( I18n.err( I18n.ERR_120 ) );
                 throw e;
             }
         }
@@ -151,7 +151,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_121 ), e );
+            LOG.error( I18n.err( I18n.ERR_121 ), e );
         }
 
     }

Added: directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.eclipse.jdt.core.prefs?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.eclipse.jdt.core.prefs (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.eclipse.jdt.core.prefs Thu Jan 21 10:20:06 2010
@@ -0,0 +1,6 @@
+#Thu Jan 21 10:14:47 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5

Added: directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.maven.ide.eclipse.prefs
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.maven.ide.eclipse.prefs?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.maven.ide.eclipse.prefs (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.maven.ide.eclipse.prefs Thu Jan 21 10:20:06 2010
@@ -0,0 +1,9 @@
+#Thu Jan 21 10:14:34 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Copied: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java (from r901606, directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/Err.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?p2=directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java&p1=directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/Err.java&r1=901606&r2=901635&rev=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/Err.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java Thu Jan 21 10:20:06 2010
@@ -22,6 +22,7 @@
 
 
 import java.text.MessageFormat;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 
@@ -31,9 +32,12 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class Err
+public class I18n
 {
-    private final static ResourceBundle res = ResourceBundle.getBundle( "org/apache/directory/server/i18n/errors" );
+    private final static ResourceBundle errBundle = ResourceBundle
+        .getBundle( "org/apache/directory/server/i18n/errors" );
+    private final static ResourceBundle msgBundle = ResourceBundle
+        .getBundle( "org/apache/directory/server/i18n/messages" );
 
     public static String ERR_1 = "ERR_1";
     public static String ERR_2 = "ERR_2";
@@ -268,17 +272,17 @@
 
     /**
      * 
-     * Translate an error code with parameter
+     * Translate an error code with argument(s)
      *
      * @param err The error code
-     * @param argArray The parameters
+     * @param args The argument(s)
      * @return
      */
-    public static String i18n( String err, Object... args )
+    public static String err( String err, Object... args )
     {
         try
         {
-            return err + " " + MessageFormat.format( res.getString( err ), args );
+            return err + " " + MessageFormat.format( errBundle.getString( err ), args );
         }
         catch ( Exception e )
         {
@@ -299,4 +303,47 @@
             return err + " (" + sb.toString() + ")";
         }
     }
+
+
+    /**
+     * 
+     * Translate a message with argument(s)
+     *
+     * @param msg The message
+     * @param args The argument(s)
+     * @return
+     */
+    public static String msg( String msg, Object... args )
+    {
+        try
+        {
+            return MessageFormat.format( msgBundle.getString( msg ), args );
+        }
+        catch ( MissingResourceException mre )
+        {
+            try
+            {
+                return MessageFormat.format( msg, args );
+            }
+            catch ( Exception e )
+            {
+                StringBuffer sb = new StringBuffer();
+                boolean comma = false;
+                for ( Object obj : args )
+                {
+                    if ( comma )
+                    {
+                        sb.append( "," );
+                    }
+                    else
+                    {
+                        comma = true;
+                    }
+                    sb.append( obj );
+                }
+                return msg + " (" + sb.toString() + ")";
+            }
+        }
+    }
+
 }

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -18,6 +18,10 @@
 #
 #
 
+#
+# Default error code translations comes here 
+#
+
 ERR_1=Failed to identify OID for: {0}
 ERR_2=A system index on attribute {0} ({1}) does not exist!
 ERR_3=A user index on attribute {0} ({1}) does not exist!
@@ -101,7 +105,7 @@
 ERR_81=Schema entity containers of objectClass organizationalUnit should be 3 name components in length.
 ERR_82=Expecting organizationalUnit with one of the following names: {0}
 ERR_83=Cannot add an entry on {0}
-ERR_84=Unwilling to perform modify on %s:\n\nEntry:\n%s\n\nModifications:\n%s
+ERR_84=Unwilling to perform modify on %s\:\n\nEntry\:\n%s\n\nModifications\:\n%s
 ERR_85=Unwilling to enable a not loaded schema: {0}
 ERR_86=DitContentRule loading NYI
 ERR_87=DitStructureRule loading NYI
@@ -122,7 +126,7 @@
 ERR_102=Only String values supported for objectClass attribute
 ERR_103=The ServerAttribute list should not contain null elements
 ERR_104=The '{0}' id is not compatible with the '{1}' attribute type
-ERR_105=Error while adding values into the '{0}' attribute. Error : {1} 
+ERR_105=Error while adding values into the '{0}' attribute. Error \: {1} 
 ERR_106=The removal of values for the missing '{0}' attribute is not possible
 ERR_107=The removal of values for the bad '{0}' attribute is not possible
 ERR_108=The AttributeType list should not contain null values
@@ -133,7 +137,7 @@
 ERR_113=Failed to compare normalized values for {0} and {1}
 ERR_114=I don't know what to do if value is not a ServerStringValue
 ERR_115=Failed to delete the working directory.
-ERR_116=Failed to delete: 
+ERR_116=Failed to delete\: 
 ERR_117=Unsupported changetype found in LDIF: {0}
 ERR_118=Error encountered while delivering notifications.
 ERR_119=Encountered exception during event handling.
@@ -145,7 +149,7 @@
 ERR_125=Closed master table for {0} partition.
 ERR_126=Failed to close the master.
 ERR_127=Failed to close the record manager
-ERR_128=Failed to identify OID for: 
+ERR_128=Failed to identify OID for\: 
 ERR_129=A user index on attribute {0} ({1}) does not exist!
 ERR_130=A system index on attribute {0} ({1}) does not exist!
 ERR_131=Error while adding {0} on table {1}
@@ -166,7 +170,7 @@
 ERR_146=Cannot encode the principalName object, the PDU size is {0} when only {1} bytes has been allocated
 ERR_147=Cannot encode the TransitedEncoding object, the PDU size is {0} when only {1} bytes has been allocated
 ERR_148=Cannot put a PDU in a null buffer !
-ERR_149=More than one server entry found for kerberos principal name {0}: 
+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=Unexpected exception: {0}
@@ -197,10 +201,10 @@
 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_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_183=Error while scanning index on attribute {0} using a {1} cursor type with a key constraint of '{2}'\:\n" + {3}
 ERR_184=Type {0} help for usage.
 ERR_185=Unknown command: {0}
 ERR_186=forced configuration load (-c) requires the -i option
@@ -220,14 +224,14 @@
 ERR_200=timeOffline value of '{0}' is not a number
 ERR_201=timeOffline value of '{0}' is larger than max timeOffline (minutes) allowed: {1}
 ERR_202=timeOffline value of '{0}' is less than zero and makes no sense
-ERR_203=Add of entry {0} failed for the following reasons provided by the server:\n{1}
-ERR_204=Delete of entry {0} failed for the following reasons provided by the server:\n{1}
-ERR_205=ModifyDn of entry {0} failed for the following reasons provided by the server:\n{1}
-ERR_206=Modify of entry {0} failed for the following reasons provided by the server:\n{1}
-ERR_207=Binding of user {0} failed for the following reasons provided by the server:\n{1}
+ERR_203=Add of entry {0} failed for the following reasons provided by the server\:\n{1}
+ERR_204=Delete of entry {0} failed for the following reasons provided by the server\:\n{1}
+ERR_205=ModifyDn of entry {0} failed for the following reasons provided by the server\:\n{1}
+ERR_206=Modify of entry {0} failed for the following reasons provided by the server\:\n{1}
+ERR_207=Binding of user {0} failed for the following reasons provided by the server\:\n{1}
 ERR_208=Import failed...
 ERR_209=ldif file '{0}' does not exist
-ERR_210=ldif file '{0}' can't be read
+ERR_210=
 ERR_211=ldif file name must be provided
 ERR_212=
 ERR_213=
@@ -237,7 +241,6 @@
 ERR_217=
 ERR_218=
 ERR_219=
-ERR_210=
 ERR_221=
 ERR_222=
 ERR_223=

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_de.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_de.properties?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_de.properties (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_de.properties Thu Jan 21 10:20:06 2010
@@ -18,4 +18,7 @@
 #
 #
 
-ERR\ 1=Err 1
+#
+# German error code translations comes here 
+#
+

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_fr.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_fr.properties?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_fr.properties (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_fr.properties Thu Jan 21 10:20:06 2010
@@ -18,4 +18,7 @@
 #
 #
 
-ERR\ 1=Err 1
+#
+# French error code translations comes here 
+#
+

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties Thu Jan 21 10:20:06 2010
@@ -0,0 +1,23 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+
+#
+# Default message translations comes here 
+#

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties Thu Jan 21 10:20:06 2010
@@ -0,0 +1,23 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+
+#
+# German message translations comes here 
+#

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties Thu Jan 21 10:20:06 2010
@@ -0,0 +1,23 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+
+#
+# French message translations comes here 
+#

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java Thu Jan 21 10:20:06 2010
@@ -25,6 +25,7 @@
 
 import java.util.Locale;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 
@@ -36,13 +37,29 @@
 public class GermanLanguageTest
 {
 
-    @Test
-    public void testTranslateDeLocale()
+    @BeforeClass
+    public static void setup() throws Exception
     {
         Locale.setDefault( Locale.GERMAN );
-        assertEquals( "ERR_1 Das ist Fehler 1", Err.i18n( Err.ERR_1 ) );
-        assertEquals( "ERR_2 Das ist Fehler 2 mit 1 Parameter", Err.i18n( Err.ERR_2, 1 ) );
-        assertEquals( "ERR_3 Das ist Fehler 3 mit 2 Parameter", Err.i18n( Err.ERR_3, 3, 2 ) );
-        assertEquals( "ERR_4 Das ist Fehler 4 mit mehr als 2 Parameter", Err.i18n( Err.ERR_4, 4, "mehr", "als", 2 ) );
+    }
+
+
+    @Test
+    public void testErrorTranslationGerman()
+    {
+        assertEquals( "ERR_1 Das ist Fehler 1", I18n.err( I18n.ERR_1 ) );
+        assertEquals( "ERR_2 Das ist Fehler 2 mit 1 Parameter", I18n.err( I18n.ERR_2, 1 ) );
+        assertEquals( "ERR_3 Das ist Fehler 3 mit 2 Parameter", I18n.err( I18n.ERR_3, 3, 2 ) );
+        assertEquals( "ERR_4 Das ist Fehler 4 mit mehr als 2 Parameter", I18n.err( I18n.ERR_4, 4, "mehr", "als", 2 ) );
+    }
+
+
+    @Test
+    public void testMessageTranslationGerman()
+    {
+        assertEquals( "Das ist Nachricht 1", I18n.msg( "MSG_1" ) );
+        assertEquals( "Das ist Nachricht 2 mit 1 Parameter", I18n.msg( "MSG_2", 1 ) );
+        assertEquals( "Das ist Nachricht 3 mit 2 Parameter", I18n.msg( "MSG_3", 3, 2 ) );
+        assertEquals( "Das ist Nachricht 4 mit mehr als 2 Parameter", I18n.msg( "MSG_4", 4, "mehr", "als", 2 ) );
     }
 }

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java Thu Jan 21 10:20:06 2010
@@ -0,0 +1,42 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+
+package org.apache.directory.server.i18n;
+
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+
+/**
+ * Test when no translation available, but placeholders inline given in message.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class InlineMessageTest
+{
+
+    @Test
+    public void testMessageInline()
+    {
+        assertEquals( "Inline message test", I18n.msg( "Inline {0} test", "message" ) );
+    }
+}

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/MissingErrorCodeTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/MissingErrorCodeTest.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/MissingErrorCodeTest.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/MissingErrorCodeTest.java Thu Jan 21 10:20:06 2010
@@ -33,13 +33,22 @@
  */
 public class MissingErrorCodeTest
 {
+    @Test
+    public void testErrorTranslationMissing()
+    {
+        assertEquals( "MissingErrorCode ()", I18n.err( "MissingErrorCode" ) );
+        assertEquals( "MissingErrorCode (1)", I18n.err( "MissingErrorCode", 1 ) );
+        assertEquals( "MissingErrorCode (3,2)", I18n.err( "MissingErrorCode", 3, 2 ) );
+        assertEquals( "MissingErrorCode (4,more,than,2)", I18n.err( "MissingErrorCode", 4, "more", "than", 2 ) );
+    }
+
 
     @Test
-    public void testMissingErrorCode()
+    public void testMessageTranslationMissing()
     {
-        assertEquals( "MissingErrorCode ()", Err.i18n( "MissingErrorCode" ) );
-        assertEquals( "MissingErrorCode (1)", Err.i18n( "MissingErrorCode", 1 ) );
-        assertEquals( "MissingErrorCode (3,2)", Err.i18n( "MissingErrorCode", 3, 2 ) );
-        assertEquals( "MissingErrorCode (4,more,than,2)", Err.i18n( "MissingErrorCode", 4, "more", "than", 2 ) );
+        assertEquals( "MissingMessage ()", I18n.err( "MissingMessage" ) );
+        assertEquals( "MissingMessage (1)", I18n.err( "MissingMessage", 1 ) );
+        assertEquals( "MissingMessage (3,2)", I18n.err( "MissingMessage", 3, 2 ) );
+        assertEquals( "MissingMessage (4,more,than,2)", I18n.err( "MissingMessage", 4, "more", "than", 2 ) );
     }
 }

Modified: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java Thu Jan 21 10:20:06 2010
@@ -25,6 +25,7 @@
 
 import java.util.Locale;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 
@@ -36,13 +37,29 @@
 public class UnknownLanguageTest
 {
 
-    @Test
-    public void testTranslateUnknownLocale()
+    @BeforeClass
+    public static void setup() throws Exception
     {
         Locale.setDefault( Locale.TRADITIONAL_CHINESE );
-        assertEquals( "ERR_1 This is error 1", Err.i18n( Err.ERR_1 ) );
-        assertEquals( "ERR_2 This is error 2 with 1 parameter", Err.i18n( Err.ERR_2, 1 ) );
-        assertEquals( "ERR_3 This is error 3 with 2 parameters", Err.i18n( Err.ERR_3, 3, 2 ) );
-        assertEquals( "ERR_4 This is error 4 with more than 2 parameters", Err.i18n( Err.ERR_4, 4, "more", "than", 2 ) );
+    }
+
+
+    @Test
+    public void testErrorTranslationUnknownLocale()
+    {
+        assertEquals( "ERR_1 This is error 1", I18n.err( I18n.ERR_1 ) );
+        assertEquals( "ERR_2 This is error 2 with 1 parameter", I18n.err( I18n.ERR_2, 1 ) );
+        assertEquals( "ERR_3 This is error 3 with 2 parameters", I18n.err( I18n.ERR_3, 3, 2 ) );
+        assertEquals( "ERR_4 This is error 4 with more than 2 parameters", I18n.err( I18n.ERR_4, 4, "more", "than", 2 ) );
+    }
+
+
+    @Test
+    public void testMessageTranslationUnknownLocale()
+    {
+        assertEquals( "This is message 1", I18n.msg( "MSG_1" ) );
+        assertEquals( "This is message 2 with 1 parameter", I18n.msg( "MSG_2", 1 ) );
+        assertEquals( "This is message 3 with 2 parameters", I18n.msg( "MSG_3", 3, 2 ) );
+        assertEquals( "This is message 4 with more than 2 parameters", I18n.msg( "MSG_4", 4, "more", "than", 2 ) );
     }
 }

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties Thu Jan 21 10:20:06 2010
@@ -0,0 +1,24 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+
+MSG_1=This is message 1
+MSG_2=This is message 2 with {0} parameter
+MSG_3=This is message {0} with {1} parameters
+MSG_4=This is message {0} with {1} {2} {3} parameters
\ No newline at end of file

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties?rev=901635&view=auto
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties (added)
+++ directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties Thu Jan 21 10:20:06 2010
@@ -0,0 +1,24 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+
+MSG_1=Das ist Nachricht 1
+MSG_2=Das ist Nachricht 2 mit {0} Parameter
+MSG_3=Das ist Nachricht {0} mit {1} Parameter
+MSG_4=Das ist Nachricht {0} mit {1} {2} {3} Parameter
\ No newline at end of file

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Jan 21 10:20:06 2010
@@ -57,7 +57,7 @@
 import org.apache.directory.server.core.schema.SchemaInterceptor;
 import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.server.core.trigger.TriggerInterceptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
@@ -412,7 +412,7 @@
             }
             catch ( IOException ioe )
             {
-                log.error( Err.i18n( Err.ERR_122 ), ioe );
+                log.error( I18n.err( I18n.ERR_122 ), ioe );
             }
         }
 

Modified: directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Thu Jan 21 10:20:06 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
 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.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -430,7 +430,7 @@
                 }
                 else
                 {
-                    LOG.error( Err.i18n( Err.ERR_123, attributeType.getName() ) );
+                    LOG.error( I18n.err( I18n.ERR_123, attributeType.getName() ) );
                 }
             }
             
@@ -472,7 +472,7 @@
             }
             catch ( Throwable t )
             {
-                LOG.error( Err.i18n( Err.ERR_124 ), t );
+                LOG.error( I18n.err( I18n.ERR_124 ), t );
                 errors.addThrowable( t );
             }
         }
@@ -480,11 +480,11 @@
         try
         {
             master.close();
-            LOG.debug( Err.i18n( Err.ERR_125, suffixDn ) );
+            LOG.debug( I18n.err( I18n.ERR_125, suffixDn ) );
         }
         catch ( Throwable t )
         {
-            LOG.error( Err.i18n( Err.ERR_126 ), t );
+            LOG.error( I18n.err( I18n.ERR_126 ), t );
             errors.addThrowable( t );
         }
 
@@ -495,7 +495,7 @@
         }
         catch ( Throwable t )
         {
-            LOG.error( Err.i18n( Err.ERR_127 ), t );
+            LOG.error( I18n.err( I18n.ERR_127 ), t );
             errors.addThrowable( t );
         }
 
@@ -855,7 +855,7 @@
         }
         catch ( NamingException e )
         {
-            String msg = Err.i18n( Err.ERR_128, id );
+            String msg = I18n.err( I18n.ERR_128, id );
             LOG.error( msg, e );
             throw new IndexNotFoundException( msg, id, e );
         }
@@ -865,7 +865,7 @@
             return userIndices.get( id );
         }
 
-        throw new IndexNotFoundException( Err.i18n( Err.ERR_129, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_129, id, name ) );
     }
 
 
@@ -877,7 +877,7 @@
         }
         catch ( NamingException e )
         {
-            String msg = Err.i18n( Err.ERR_128, id );
+            String msg = I18n.err( I18n.ERR_128, id );
             LOG.error( msg, e );
             throw new IndexNotFoundException( msg, id, e );
         }
@@ -887,7 +887,7 @@
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( Err.i18n( Err.ERR_130, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_130, id, name ) );
     }
 
 

Modified: directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Thu Jan 21 10:20:06 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.server.core.avltree.ArrayTreeCursor;
 import org.apache.directory.server.core.avltree.Marshaller;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Table;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
@@ -685,7 +685,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_131, key, name ), e );
+            LOG.error( I18n.err( I18n.ERR_131, key, name ), e );
             throw e;
         }
     }
@@ -796,7 +796,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_132, key, value, name ), e );
+            LOG.error( I18n.err( I18n.ERR_132, key, value, name ), e );
         }
     }
 
@@ -871,7 +871,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( Err.i18n( Err.ERR_133, key, name ), e );
+            LOG.error( I18n.err( I18n.ERR_133, key, name ), e );
             
             if ( e instanceof IOException )
             {

Modified: directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Thu Jan 21 10:20:06 2010
@@ -28,7 +28,7 @@
 import jdbm.helper.Serializer;
 
 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.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -156,7 +156,7 @@
         }
         catch ( ClassNotFoundException cnfe )
         {
-            LOG.error( Err.i18n( Err.ERR_134, cnfe.getLocalizedMessage() ) );
+            LOG.error( I18n.err( I18n.ERR_134, cnfe.getLocalizedMessage() ) );
             return null;
         }
     }

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java Thu Jan 21 10:20:06 2010
@@ -26,7 +26,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.KerberosUtils;
 import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
@@ -199,8 +199,8 @@
         }
         catch ( ParseException pe )
         {
-            LOG.error( Err.i18n( Err.ERR_135, serverPrincipal, pe.getLocalizedMessage() ) );
-            throw new InvalidTicketException( ErrorType.KRB_ERR_GENERIC, Err.i18n( Err.ERR_136, pe.getLocalizedMessage() ) );
+            LOG.error( I18n.err( I18n.ERR_135, serverPrincipal, pe.getLocalizedMessage() ) );
+            throw new InvalidTicketException( ErrorType.KRB_ERR_GENERIC, I18n.err( I18n.ERR_136, pe.getLocalizedMessage() ) );
         }
     }
     
@@ -521,9 +521,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( Err.i18n( Err.ERR_137, 1 + TLV.getNbBytes( ticketLength ) + ticketLength, 
+            LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( ticketLength ) + ticketLength, 
                 buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java Thu Jan 21 10:20:06 2010
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.messages.Encodable;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -179,9 +179,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_139, 1 + TLV.getNbBytes( authorizationDataLength ) + 
+            log.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( authorizationDataLength ) + 
                 authorizationDataLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java Thu Jan 21 10:20:06 2010
@@ -24,7 +24,7 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -241,9 +241,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_140, 1 + TLV.getNbBytes( checksumLength ) + checksumLength,
+            log.error( I18n.err( I18n.ERR_140, 1 + TLV.getNbBytes( checksumLength ) + checksumLength,
                 buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java Thu Jan 21 10:20:06 2010
@@ -23,7 +23,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -296,9 +296,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_141, 1 + TLV.getNbBytes( encryptedDataSeqLength ) 
+            log.error( I18n.err( I18n.ERR_141, 1 + TLV.getNbBytes( encryptedDataSeqLength ) 
                 + encryptedDataSeqLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java Thu Jan 21 10:20:06 2010
@@ -24,7 +24,7 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -290,9 +290,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_142, 1 + TLV.getNbBytes( encryptionKeyLength )
+            log.error( I18n.err( I18n.ERR_142, 1 + TLV.getNbBytes( encryptionKeyLength )
                 + encryptionKeyLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java Thu Jan 21 10:20:06 2010
@@ -25,7 +25,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.messages.value.types.HostAddrType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -264,9 +264,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( Err.i18n( Err.ERR_143, 1 + TLV.getNbBytes( hostAddressLength )
+            LOG.error( I18n.err( I18n.ERR_143, 1 + TLV.getNbBytes( hostAddressLength )
                 + hostAddressLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java Thu Jan 21 10:20:06 2010
@@ -26,7 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
@@ -237,9 +237,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( Err.i18n( Err.ERR_144, 1 + TLV.getNbBytes( addressesLength )
+            LOG.error( I18n.err( I18n.ERR_144, 1 + TLV.getNbBytes( addressesLength )
                 + addressesLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java Thu Jan 21 10:20:06 2010
@@ -23,7 +23,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.messages.value.types.PaDataType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -229,9 +229,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_145, 1 + TLV.getNbBytes( preAuthenticationDataSeqLength )
+            log.error( I18n.err( I18n.ERR_145, 1 + TLV.getNbBytes( preAuthenticationDataSeqLength )
                 + preAuthenticationDataSeqLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java Thu Jan 21 10:20:06 2010
@@ -95,7 +95,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.KerberosUtils;
 import org.apache.directory.server.kerberos.shared.messages.value.types.PrincipalNameType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
@@ -424,9 +424,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( Err.i18n( Err.ERR_146, 1 + TLV.getNbBytes( principalNameSeqLength )
+            LOG.error( I18n.err( I18n.ERR_146, 1 + TLV.getNbBytes( principalNameSeqLength )
                 + principalNameSeqLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java Thu Jan 21 10:20:06 2010
@@ -23,7 +23,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.messages.value.types.TransitedEncodingType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -203,7 +203,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( Err.i18n( Err.ERR_148 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try
@@ -224,9 +224,9 @@
         }
         catch ( BufferOverflowException boe )
         {
-            log.error( Err.i18n( Err.ERR_147, 1 + TLV.getNbBytes( transitedEncodingLength )
+            log.error( I18n.err( I18n.ERR_147, 1 + TLV.getNbBytes( transitedEncodingLength )
                 + transitedEncodingLength, buffer.capacity() ) );
-            throw new EncoderException( Err.i18n( Err.ERR_138 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Thu Jan 21 10:20:06 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerStringValue;
 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.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.io.encoder.EncryptionKeyEncoder;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
@@ -138,7 +138,7 @@
                 
                 while ( cursor.next() )
                 {
-                    LOG.error( Err.i18n( Err.ERR_149, principal, cursor.next() ) );
+                    LOG.error( I18n.err( I18n.ERR_149, principal, cursor.next() ) );
                 }
                 
                 return entry;

Modified: directory/sandbox/felixk/apacheds-i18n/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Thu Jan 21 10:20:06 2010
@@ -44,7 +44,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.avl.AvlPartition;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -179,7 +179,7 @@
         // of the workingDirectory followed by the suffix
         if ( ( suffix == null ) || ( suffix.isEmpty() ) )
         {
-            String msg = Err.i18n( Err.ERR_150 );
+            String msg = I18n.err( I18n.ERR_150 );
             LOG.error( msg );
             throw new InvalidNameException( msg );
         }
@@ -207,7 +207,7 @@
             }
             catch ( SecurityException se )
             {
-                String msg = Err.i18n( Err.ERR_151, suffixDirectory.getAbsolutePath(), se.getLocalizedMessage() ); 
+                String msg = I18n.err( I18n.ERR_151, suffixDirectory.getAbsolutePath(), se.getLocalizedMessage() ); 
                 LOG.error( msg );
                 throw se;
             }

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -35,7 +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.i18n.I18n;
 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;
@@ -160,7 +160,7 @@
         }
         catch ( Exception e )
         {
-            log.error( Err.i18n( Err.ERR_152, e.getLocalizedMessage() ), e );
+            log.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -36,7 +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.i18n.I18n;
 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;
@@ -145,7 +145,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_152 ), e );
+            LOG.error( I18n.err( I18n.ERR_152 ), e );
         }
     }
     
@@ -342,7 +342,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_154 ), e );
+            LOG.error( I18n.err( I18n.ERR_154 ), e );
         }
     }
     
@@ -430,7 +430,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_155 ), e );
+            LOG.error( I18n.err( I18n.ERR_155 ), e );
         }
     }
 }

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -34,7 +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.apache.directory.server.i18n.I18n;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,7 +85,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_153 ), e );
+            LOG.error( I18n.err( I18n.ERR_153 ), e );
         }
     }
     
@@ -147,7 +147,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_154 ), e );
+            LOG.error( I18n.err( I18n.ERR_154 ), e );
         }
     }
     
@@ -189,7 +189,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_155 ), e );
+            LOG.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -24,7 +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.directory.server.i18n.I18n;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.handler.chain.IoHandlerCommand;
 import org.slf4j.Logger;
@@ -63,7 +63,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                log.error( Err.i18n( Err.ERR_154 ), e );
+                log.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -28,7 +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.i18n.I18n;
 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;
@@ -72,7 +72,7 @@
         catch ( Exception e )
         {
             LOG.error( e.getLocalizedMessage(), e );
-            String message = Err.i18n( Err.ERR_156, catalogBaseDn );
+            String message = I18n.err( I18n.ERR_156, catalogBaseDn );
             throw new ServiceConfigurationException( message, e );
         }
     }
@@ -97,7 +97,7 @@
         catch ( NamingException ne )
         {
             LOG.error( ne.getLocalizedMessage(), ne );
-            String message = Err.i18n( Err.ERR_157, question.getDomainName() );
+            String message = I18n.err( I18n.ERR_157, question.getDomainName() );
             throw new ServiceConfigurationException( message, ne );
         }
         catch ( Exception e )

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -28,7 +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.i18n.I18n;
 import org.apache.directory.server.kerberos.kdc.KdcContext;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.kerberos.sam.SamException;
@@ -636,7 +636,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                LOG.error( Err.i18n( Err.ERR_153 ), e );
+                LOG.error( I18n.err( I18n.ERR_153 ), e );
             }
         }
     }
@@ -685,7 +685,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_154 ), e );
+            LOG.error( I18n.err( I18n.ERR_154 ), e );
         }
     }
     
@@ -723,7 +723,7 @@
                 catch ( Exception e )
                 {
                     // This is a monitor.  No exceptions should bubble up.
-                    LOG.error( Err.i18n( Err.ERR_155 ), e );
+                    LOG.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -28,7 +28,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.kdc.KdcContext;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.kerberos.shared.KerberosConstants;
@@ -161,7 +161,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_153 ), e );
+            LOG.error( I18n.err( I18n.ERR_153 ), e );
         }
     }
     
@@ -485,7 +485,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            LOG.error( Err.i18n( Err.ERR_154 ), e );
+            LOG.error( I18n.err( I18n.ERR_154 ), e );
         }
     }
 
@@ -521,7 +521,7 @@
             catch ( Exception e )
             {
                 // This is a monitor.  No exceptions should bubble up.
-                LOG.error( Err.i18n( Err.ERR_155 ), e );
+                LOG.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -25,7 +25,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-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.kerberos.kdc.authentication.AuthenticationContext;
 import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationService;
@@ -193,7 +193,7 @@
         catch ( Exception e )
         {
         e.printStackTrace();
-            log.error( Err.i18n( Err.ERR_152, e.getLocalizedMessage() ), e );
+            log.error( I18n.err( I18n.ERR_152, e.getLocalizedMessage() ), e );
 
             session.write( getErrorMessage( config.getServicePrincipal(), new KerberosException(
                 ErrorType.KDC_ERR_SVC_UNAVAILABLE ) ) );
@@ -246,7 +246,7 @@
         catch ( Exception e )
         {
             // This is a monitor.  No exceptions should bubble up.
-            log.error( Err.i18n( Err.ERR_155 ), e );
+            log.error( I18n.err( I18n.ERR_155 ), e );
         }
     }
 }

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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -40,7 +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.i18n.I18n;
 import org.apache.directory.server.ldap.handlers.AbandonHandler;
 import org.apache.directory.server.ldap.handlers.AddHandler;
 import org.apache.directory.server.ldap.handlers.BindHandler;
@@ -578,7 +578,7 @@
         }
         catch ( IOException e )
         {
-            String msg = Err.i18n( Err.ERR_171, transport.getPort() );
+            String msg = I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -29,7 +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.i18n.I18n;
 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;
@@ -409,7 +409,7 @@
                     }
                     catch ( Exception e )
                     {
-                        LOG.error( Err.i18n( Err.ERR_172, e.getLocalizedMessage() ) );
+                        LOG.error( I18n.err( I18n.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=901635&r1=901634&r2=901635&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 10:20:06 2010
@@ -45,7 +45,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-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.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler;
@@ -838,7 +838,7 @@
                     }
                     catch ( IOException e1 )
                     {
-                        LOG.error( Err.i18n( Err.ERR_158 ), e1 );
+                        LOG.error( I18n.err( I18n.ERR_158 ), e1 );
                         JOptionPane.showMessageDialog( SessionsFrame.this, e1.getLocalizedMessage(), "Error encountered!",
                             JOptionPane.ERROR_MESSAGE );
                     }



Mime
View raw message