svn commit: r901844 - in /directory/apacheds/trunk: core-annotations/src/main/java/org/apache/directory/server/core/factory/ i18n/src/main/resources/org/apache/directory/server/i18n/

[fe...@apache.org]

Author: felixk
Date: Thu Jan 21 20:12:22 2010
New Revision: 901844

URL: http://svn.apache.org/viewvc?rev=901844&view=rev
Log:
I18n

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=901844&r1=901843&r2=901844&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Thu Jan 21 20:12:22 2010
@@ -229,7 +229,7 @@
         }
         else
         {
-            String message = "Unsupported changetype found in LDIF: " + entry.getChangeType();
+            String message = I18n.err( I18n.ERR_318, entry.getChangeType() );
             throw new NamingException( message );
         }
     }

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=901844&r1=901843&r2=901844&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Thu Jan 21 20:12:22 2010
@@ -34,6 +34,7 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.core.schema.SchemaPartition;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -135,7 +136,7 @@
 
         if ( errors.size() != 0 )
         {
-            throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
+            throw new Exception( I18n.err( I18n.ERR_317, ExceptionUtils.printErrors( errors ) ) );
         }
     }
     

Modified: directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties?rev=901844&r1=901843&r2=901844&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties (original)
+++ directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties Thu Jan 21 20:12:22 2010
@@ -304,7 +304,7 @@
 ERR_280=Attribute value '{0}' for attribute '{1}' is syntactically incorrect
 ERR_281=The value is not a valid String
 ERR_282=The value stored in an Human Readable attribute is not a String
-ERR_283=Modify REPLACE operations on schema subentries are not allowed: it's just silly to destroy and recreate so many \nschema entities that reside in schema operational attributes.  Instead use \na targeted combination of modify ADD and REMOVE operations.
+ERR_283=Modify REPLACE operations on schema subentries are not allowed\: it's just silly to destroy and recreate so many \nschema entities that reside in schema operational attributes.  Instead use \na targeted combination of modify ADD and REMOVE operations.
 ERR_284=Undefined modify operation: {0}
 ERR_285=Unknown index into handler array: {0}
 ERR_286=Failed to get BC Certificate factory for algorithm: X.509
@@ -338,8 +338,8 @@
 ERR_314=revision must be less than the current revision
 ERR_315=cannot create an entry under a referral when the Context.REFERRAL is set to 'ignore'
 ERR_316=Directory service is not started.
-ERR_317=
-ERR_318=
+ERR_317=Schema load failed : {0}
+ERR_318=Unsupported changetype found in LDIF: {0}
 ERR_319=
 ERR_320=
 ERR_321=