directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r901735 [1/2] - in /directory/apacheds/trunk: core-integ/src/test/java/org/apache/directory/server/core/operations/bind/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/authn/ core/sr...
Date Thu, 21 Jan 2010 15:18:21 GMT
Author: felixk
Date: Thu Jan 21 15:18:08 2010
New Revision: 901735

URL: http://svn.apache.org/viewvc?rev=901735&view=rev
Log:
I know there are still more I missed

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Thu Jan 21 15:18:08 2010
@@ -228,7 +228,7 @@
         }
         catch ( LdapAuthenticationException lae )
         {
-            assertEquals( "Cannot authenticate user uid=unknown,ou=system", lae.getMessage() );
+            assertEquals( "ERR_229 Cannot authenticate user uid=unknown,ou=system", lae.getMessage() );
         }
         catch ( NamingException ne )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Thu Jan 21 15:18:08 2010
@@ -50,6 +50,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -203,7 +204,7 @@
             }
             else
             {
-                throw new NamingException( "Bad value for the OID " + oid );
+                throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
             }
         }
         else
@@ -218,7 +219,7 @@
             }
             else
             {
-                throw new NamingException( "Bad value for the OID " + oid );
+                throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
             }
         }
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Jan 21 15:18:08 2010
@@ -699,7 +699,7 @@
     {
         if ( changeLog == null || ! changeLog.isEnabled() )
         {
-            throw new IllegalStateException( "The change log must be enabled to revert to previous log revisions." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_310 ) );
         }
 
         Tag latest = changeLog.getLatest();
@@ -717,7 +717,7 @@
             }
         }
 
-        throw new IllegalStateException( "There must be at least one tag to revert to the latest tag." );
+        throw new IllegalStateException( I18n.err( I18n.ERR_311 ) );
     }
 
 
@@ -728,7 +728,7 @@
     {
         if ( oldDn.size() == 0 )
         {
-            throw new LdapNoPermissionException( "can't rename the rootDSE" );
+            throw new LdapNoPermissionException( I18n.err( I18n.ERR_312 ) );
         }
 
         // calculate parents
@@ -774,17 +774,17 @@
     {
         if ( changeLog == null || ! changeLog.isEnabled() )
         {
-            throw new IllegalStateException( "The change log must be enabled to revert to previous log revisions." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_310 ) );
         }
 
         if ( revision < 0 )
         {
-            throw new IllegalArgumentException( "revision must be greater than or equal to 0" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_313 ) );
         }
 
         if ( revision >= changeLog.getChangeLogStore().getCurrentRevision() )
         {
-            throw new IllegalArgumentException( "revision must be less than the current revision" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_314 ) );
         }
 
         Cursor<ChangeLogEvent> cursor = changeLog.getChangeLogStore().findAfter( revision );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Thu Jan 21 15:18:08 2010
@@ -52,6 +52,7 @@
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -198,7 +199,7 @@
 
     private PartialResultException buildPartialResultException( LdapDN childDn )
     {
-        PartialResultException pre = new PartialResultException( "cannot create an entry under a referral when the Context.REFERRAL is set to 'ignore'" );
+        PartialResultException pre = new PartialResultException( I18n.err( I18n.ERR_315 ) );
         
         pre.setRemainingName( childDn );
         pre.setResolvedName( LdapDN.EMPTY_LDAPDN );
@@ -1107,7 +1108,7 @@
     {
         if ( ! directoryService.isStarted() )
         {
-            throw new ServiceUnavailableException( "Directory service is not started." );
+            throw new ServiceUnavailableException( I18n.err( I18n.ERR_316 ) );
         }
     }
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java Thu Jan 21 15:18:08 2010
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 
@@ -58,7 +59,7 @@
         }
         else
         {
-            throw new LdapNoPermissionException( "Anonymous bind NOT permitted!" );
+            throw new LdapNoPermissionException( I18n.err( I18n.ERR_228 ) );
         }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Jan 21 15:18:08 2010
@@ -515,6 +515,6 @@
 
         LdapDN dn = opContext.getDn();
         String upDn = ( dn == null ? "" : dn.getName() );
-        throw new LdapAuthenticationException( "Cannot authenticate user " + upDn );
+        throw new LdapAuthenticationException( I18n.err( I18n.ERR_229, upDn ) );
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Thu Jan 21 15:18:08 2010
@@ -330,7 +330,7 @@
             else
             {
                 // Bad password ...
-                String message = "Password not correct for user '" + opContext.getDn().getName() + "'";
+                String message = I18n.err( I18n.ERR_230, opContext.getDn().getName() );
                 LOG.info( message );
                 throw new LdapAuthenticationException( message );
             }
@@ -338,7 +338,7 @@
         else
         {
             // Bad password ...
-            String message = "Password not correct for user '" + opContext.getDn().getName() + "'";
+            String message = I18n.err( I18n.ERR_230, opContext.getDn().getName() );
             LOG.info( message );
             throw new LdapAuthenticationException( message );
         }
@@ -608,7 +608,7 @@
                 LdapDN dn = opContext.getDn();
                 String upDn = ( dn == null ? "" : dn.getName() );
 
-                throw new LdapAuthenticationException( "Failed to lookup user for authentication: " + upDn );
+                throw new LdapAuthenticationException( I18n.err( I18n.ERR_231, upDn ) );
             }
         }
         catch ( Exception cause )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Thu Jan 21 15:18:08 2010
@@ -361,7 +361,7 @@
 
         if ( dn.isEmpty() )
         {
-            String msg = "The rootDSE cannot be moved or renamed!";
+            String msg = I18n.err( I18n.ERR_234 );
             LOG.error( msg );
             throw new LdapNoPermissionException( msg );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Thu Jan 21 15:18:08 2010
@@ -36,6 +36,7 @@
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
+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.Modification;
@@ -359,7 +360,7 @@
                 break;
 
             default:
-                throw new InternalError( "Undefined modify operation value of " + modOp );
+                throw new InternalError( I18n.err( I18n.ERR_235, modOp ) );
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Thu Jan 21 15:18:08 2010
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.event.Evaluator;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -279,7 +280,7 @@
             }
             else
             {
-                throw new InternalError( "Unexpected protectedItem: " + item.getClass().getName() );
+                throw new InternalError( I18n.err( I18n.ERR_232, item.getClass().getName() ) );
             }
         }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Thu Jan 21 15:18:08 2010
@@ -28,6 +28,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.subtree.SubtreeEvaluator;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.UserClass;
@@ -168,7 +169,7 @@
             }
             else
             {
-                throw new InternalError( "Unexpected userClass: " + userClass.getClass().getName() );
+                throw new InternalError( I18n.err( I18n.ERR_233, userClass.getClass().getName() ) );
             }
         }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Thu Jan 21 15:18:08 2010
@@ -125,7 +125,7 @@
     {
         if ( !enabled )
         {
-            throw new IllegalStateException( "The ChangeLog has not been enabled." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_236 ) );
         }
 
         return store.log( principal, forward, reverse );
@@ -139,7 +139,7 @@
     {
         if ( !enabled )
         {
-            throw new IllegalStateException( "The ChangeLog has not been enabled." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_236 ) );
         }
 
         return store.log( principal, forward, reverses );
@@ -183,8 +183,7 @@
             return ( ( SearchableChangeLogStore ) store ).getChangeLogSearchEngine();
         }
 
-        throw new UnsupportedOperationException(
-            "The underlying changelog store does not support searching through it's logs" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_237 ) );
     }
 
 
@@ -198,8 +197,7 @@
             return ( ( TaggableSearchableChangeLogStore ) store ).getTagSearchEngine();
         }
 
-        throw new UnsupportedOperationException(
-            "The underlying changelog store does not support searching through it's tags" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_238 ) );
     }
 
 
@@ -210,12 +208,12 @@
     {
         if ( revision < 0 )
         {
-            throw new IllegalArgumentException( "revision must be greater than or equal to 0" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) );
         }
 
         if ( revision > store.getCurrentRevision() )
         {
-            throw new IllegalArgumentException( "revision must be less than or equal to the current revision" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_240 ) );
         }
 
         if ( store instanceof TaggableChangeLogStore )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Thu Jan 21 15:18:08 2010
@@ -37,6 +37,7 @@
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.LdapPrincipal;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.ListCursor;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -471,12 +472,12 @@
     {
         if ( revision < 0 )
         {
-            throw new IllegalArgumentException( "revision must be greater than or equal to 0" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) );
         }
 
         if ( revision > getCurrentRevision() )
         {
-            throw new IllegalArgumentException( "The revision must not be greater than the current revision" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_240 ) );
         }
 
         return events.get( ( int ) revision );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Thu Jan 21 15:18:08 2010
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.server.core.partition.PartitionNexus;
+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.Modification;
@@ -72,9 +73,7 @@
             /*
              * TODO: Replace the Exception and the ResultCodeEnum with the correct ones.
              */
-            throw new LdapSchemaViolationException(
-                "Collective attributes cannot be stored in non-collectiveAttributeSubentries",
-                ResultCodeEnum.OTHER);
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_241 ), ResultCodeEnum.OTHER );
         }
     }
     
@@ -96,9 +95,7 @@
             /*
              * TODO: Replace the Exception and the ResultCodeEnum with the correct ones.
              */
-            throw new LdapSchemaViolationException(
-                "Cannot operate on collective attributes in non-collectiveAttributeSubentries",
-                ResultCodeEnum.OTHER);
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_242 ), ResultCodeEnum.OTHER);
         }
     }
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Thu Jan 21 15:18:08 2010
@@ -23,6 +23,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -136,11 +137,11 @@
                 return !evaluate( bnode.getFirstChild(), dn, entry );
             }
 
-            throw new NamingException( "Negation has no child: " + node );
+            throw new NamingException( I18n.err( I18n.ERR_243, node ) );
         }
         else
         {
-                throw new NamingException( "Unrecognized branch node operator: " + bnode );
+                throw new NamingException( I18n.err( I18n.ERR_244, bnode ) );
         }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Thu Jan 21 15:18:08 2010
@@ -25,6 +25,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -140,7 +141,7 @@
         }
         else
         {
-            throw new NamingException( "Unrecognized leaf node type: " + node );
+            throw new NamingException( I18n.err( I18n.ERR_245, node ) );
         }
     }
 
@@ -368,7 +369,7 @@
                 break;
 
             default:
-                throw new NamingException( "Unknown match type: " + matchType );
+                throw new NamingException( I18n.err( I18n.ERR_246, matchType ) );
         }
 
         if ( ( mrule == null ) && ( matchType != EQUALITY_MATCH ) )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Thu Jan 21 15:18:08 2010
@@ -23,6 +23,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -65,7 +66,7 @@
                 return dn.endsWith( snode.getBaseDn() );
             
             default:
-                throw new NamingException( "Unrecognized search scope!" );
+                throw new NamingException( I18n.err( I18n.ERR_247 ) );
         }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Thu Jan 21 15:18:08 2010
@@ -26,6 +26,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -95,7 +96,7 @@
         }
         catch ( PatternSyntaxException pse )
         {
-            NamingException ne = new NamingException( "SubstringNode '" + node + "' had " + "incorrect syntax" );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_248, node ) );
             ne.setRootCause( pse );
             throw ne;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Thu Jan 21 15:18:08 2010
@@ -47,6 +47,7 @@
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -138,14 +139,13 @@
         
         if ( subschemSubentryDn.getNormName().equals( name.getNormName() ) )
         {
-            throw new LdapNameAlreadyBoundException( 
-                "The global schema subentry cannot be added since it exists by default." );
+            throw new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_249 ) );
         }
         
         // check if the entry already exists
         if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), name ) ) )
         {
-            LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( name.getName() + " already exists!" );
+            LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_250, name.getName() ) );
             ne.setResolvedName( new LdapDN( name.getName() ) );
             throw ne;
         }
@@ -183,8 +183,8 @@
             }
             catch ( Exception e )
             {
-                LdapNameNotFoundException e2 = new LdapNameNotFoundException( "Parent " + parentDn.getName() 
-                    + " not found" );
+                LdapNameNotFoundException e2 = new LdapNameNotFoundException( I18n.err( I18n.ERR_251, 
+                    parentDn.getName() ) );
                 e2.setResolvedName( new LdapDN( nexus.getMatchedName( 
                     new GetMatchedNameOperationContext( opContext.getSession(), parentDn ) ).getName() ) );
                 throw e2;
@@ -194,7 +194,7 @@
             
             if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
             {
-                String msg = "Attempt to add entry to alias '" + name.getName() + "' not allowed.";
+                String msg = I18n.err( I18n.ERR_252, name.getName() );
                 ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
                 LdapNamingException e = new LdapNamingException( msg, rc );
                 e.setResolvedName( new LdapDN( parentDn.getName() ) );
@@ -223,9 +223,7 @@
         
         if ( name.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( 
-                "Can not allow the deletion of the subschemaSubentry (" + 
-                subschemSubentryDn + ") for the global schema.",
+            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_253, subschemSubentryDn ),
                 ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
@@ -335,8 +333,8 @@
                     {
                         if ( entryAttr.contains( value ) )
                         {
-                            throw new LdapAttributeInUseException( "Trying to add existing value '" + value
-                                    + "' to attribute " + modAttr.getId() );
+                            throw new LdapAttributeInUseException( I18n.err( I18n.ERR_254, value,
+                                modAttr.getId() ) );
                         }
                     }
                 }
@@ -369,10 +367,8 @@
         
         if ( dn.equals( subschemSubentryDn ) )
         {
-            throw new LdapOperationNotSupportedException( 
-                "Can not allow the renaming of the subschemaSubentry (" + 
-                subschemSubentryDn + ") for the global schema: it is fixed at " + subschemSubentryDn,
-                ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_255, subschemSubentryDn,
+                subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
         // Check to see if the renamed entry exists
@@ -381,7 +377,7 @@
             // This is a nonsense : we can't rename an entry which does not exist
             // on the server
             LdapNameNotFoundException ldnfe;
-            ldnfe = new LdapNameNotFoundException( "target entry " + dn.getName() + " des not exist!" );
+            ldnfe = new LdapNameNotFoundException( I18n.err( I18n.ERR_256, dn.getName() ) );
             ldnfe.setResolvedName( new LdapDN( dn.getName() ) );
             throw ldnfe;
         }
@@ -392,7 +388,7 @@
         if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), newDn ) ) )
         {
             LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( "target entry " + newDn.getName() + " already exists!" );
+            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, newDn.getName() ) );
             e.setResolvedName( new LdapDN( newDn.getName() ) );
             throw e;
         }
@@ -421,10 +417,8 @@
         
         if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( 
-                "Can not allow the move of the subschemaSubentry (" + 
-                subschemSubentryDn + ") for the global schema: it is fixed at " + subschemSubentryDn,
-                ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_258, subschemSubentryDn,
+                subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
         // check if child to move exists
@@ -448,7 +442,7 @@
             upTarget.add( upRdn );
 
             LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getName() + " already exists!" );
+            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
             e.setResolvedName( new LdapDN( upTarget.getName() ) );
             throw e;
         }
@@ -477,10 +471,8 @@
 
         if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( 
-                "Can not allow the move of the subschemaSubentry (" + 
-                subschemSubentryDn + ") for the global schema: it is fixed at " + subschemSubentryDn,
-                ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_258, subschemSubentryDn,
+                subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
         // check if child to move exists
@@ -502,7 +494,7 @@
             upTarget.add( opContext.getNewRdn() );
 
             LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( "target entry " + upTarget.getName() + " already exists!" );
+            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
             e.setResolvedName( new LdapDN( upTarget.getName() ) );
             throw e;
         }
@@ -544,7 +536,7 @@
         }
         catch ( Exception ne )
         {
-            String msg = "Attempt to search under non-existant entry: ";
+            String msg = I18n.err( I18n.ERR_259 );
             assertHasEntry( nextInterceptor, opContext, msg, base );
             throw ne;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java Thu Jan 21 15:18:08 2010
@@ -25,6 +25,7 @@
 
 import javax.naming.NamingException;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.filter.ApproximateNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -162,7 +163,7 @@
                             }
                             else
                             {
-                                throw new IllegalStateException( "Unknown assertion type: " + leaf );
+                                throw new IllegalStateException( I18n.err( I18n.ERR_260, leaf ) );
                             }
 
                             orNode.addNode( newLeaf );
@@ -172,7 +173,7 @@
                 catch ( NamingException e )
                 {
                     // log something here and throw a runtime excpetion
-                    throw new RuntimeException( "Failed to expand node" );
+                    throw new RuntimeException( I18n.err( I18n.ERR_261 ) );
                 }
             }
             else

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Thu Jan 21 15:18:08 2010
@@ -287,8 +287,7 @@
 
             if ( ! override.getId().equals( "system" ) )
             {
-                throw new ConfigurationException( "System partition has wrong name: should be 'system' not '"
-                        + override.getId() + "'." );
+                throw new ConfigurationException( I18n.err( I18n.ERR_262, override.getId() ) );
             }
             
 
@@ -335,7 +334,7 @@
         
         if ( partitions.containsKey( key ) )
         {
-            throw new ConfigurationException( "Duplicate partition suffix: " + key );
+            throw new ConfigurationException( I18n.err( I18n.ERR_263, key ) );
         }
         
         synchronized ( partitionLookupTree )
@@ -408,7 +407,7 @@
      */
     public void setId( String id )
     {
-        throw new UnsupportedOperationException( "The id cannot be set for the partition nexus." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_264 ) );
     }
 
 
@@ -485,7 +484,7 @@
                 if ( error == null )
                 {
                     //noinspection ThrowableInstanceNeverThrown
-                    error = new MultiException( "Grouping many exceptions on root nexus sync()" );
+                    error = new MultiException( I18n.err( I18n.ERR_265 ) );
                 }
 
                 // @todo really need to send this info to a monitor
@@ -533,7 +532,7 @@
         // complain if we do not recognize the attribute being compared
         if ( !schemaManager.getAttributeTypeRegistry().contains( compareContext.getOid() ) )
         {
-            throw new LdapInvalidAttributeIdentifierException( compareContext.getOid() + " not found within the attributeType registry" );
+            throw new LdapInvalidAttributeIdentifierException( I18n.err( I18n.ERR_266, compareContext.getOid() ) );
         }
 
         AttributeType attrType = schemaManager.lookupAttributeTypeRegistry( compareContext.getOid() );
@@ -875,7 +874,7 @@
         
         if ( partitions.containsKey( key ) )
         {
-            throw new ConfigurationException( "Duplicate partition suffix: " + key );
+            throw new ConfigurationException( I18n.err( I18n.ERR_263, key ) );
         }
 
         if ( ! partition.isInitialized() )
@@ -889,7 +888,7 @@
             
             if ( partitionSuffix == null )
             {
-                throw new ConfigurationException( "The current partition does not have any suffix: " + partition.getId() );
+                throw new ConfigurationException( I18n.err( I18n.ERR_267, partition.getId() ) );
             }
             
             partitions.put( partitionSuffix.toString(), partition );
@@ -974,7 +973,7 @@
         
         if ( parent == null )
         {
-            throw new LdapNameNotFoundException( " Cannot find a partition for " + dn );
+            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_268, dn ) );
         }
         else
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java Thu Jan 21 15:18:08 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 
 import java.util.prefs.Preferences;
@@ -53,7 +54,6 @@
 
     public Preferences userRoot()
     {
-        throw new NotImplementedException(
-            "userRoot() in org.apache.directory.server.prefs.ServerPreferencesFactory not implemented!" );
+        throw new NotImplementedException( I18n.err( I18n.ERR_269 ) );
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Thu Jan 21 15:18:08 2010
@@ -39,6 +39,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerModification;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+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.Modification;
@@ -132,7 +133,7 @@
         }
         catch ( Exception e )
         {
-            throw new ServerSystemPreferenceException( "Failed to set up node.", e );
+            throw new ServerSystemPreferenceException( I18n.err( I18n.ERR_270 ), e );
         }
     }
 
@@ -336,7 +337,7 @@
         }
         catch ( Exception e )
         {
-            throw new ServerSystemPreferenceException( "Failed to get SPI.", e );
+            throw new ServerSystemPreferenceException( I18n.err( I18n.ERR_271 ), e );
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Thu Jan 21 15:18:08 2010
@@ -90,7 +90,7 @@
         // all the objectClass values in which case we must throw an exception
         if ( attribute.size() == 0 )
         {
-            String msg = "Modify operation leaves no structural objectClass for entry " + name;
+            String msg = I18n.err( I18n.ERR_272, name );
             
             if ( log.isInfoEnabled() )
             {
@@ -113,7 +113,7 @@
 
         // no structural object classes exist for the entry in the replacement
         // set for the objectClass attribute so we need to complain about that
-        String msg = "Modify operation leaves no structural objectClass for entry " + name;
+        String msg = I18n.err( I18n.ERR_272, name );
         if ( log.isInfoEnabled() )
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
@@ -154,7 +154,7 @@
         // all the objectClass values in which case we must throw an exception
         if ( objectClass.size() == 0 )
         {
-            String msg = "Modify operation leaves no structural objectClass for entry " + name;
+            String msg = I18n.err( I18n.ERR_272, name );
             if ( log.isInfoEnabled() )
             {
                 log.info( msg + ".  Raising LdapSchemaViolationException." );
@@ -175,7 +175,7 @@
 
         // no structural object classes exist for the entry in the replacement
         // set for the objectClass attribute so we need to complain about that
-        String msg = "Modify operation leaves no structural objectClass for entry " + name;
+        String msg =  I18n.err( I18n.ERR_272, name );
         if ( log.isInfoEnabled() )
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
@@ -234,7 +234,7 @@
         // all the objectClass values in which case we must throw an exception
         if ( attribute.size() == 0 )
         {
-            String msg = "Modify operation leaves no structural objectClass for entry " + name;
+            String msg =  I18n.err( I18n.ERR_272, name );
             
             if ( log.isInfoEnabled() )
             {
@@ -268,7 +268,7 @@
 
         // no structural object classes exist for the entry after the modifications
         // to the objectClass attribute so we need to complain about that
-        String msg = "Modify operation leaves no structural objectClass for entry " + name;
+        String msg =  I18n.err( I18n.ERR_272, name );
 
         if ( log.isInfoEnabled() )
         {
@@ -403,8 +403,7 @@
         // a schema violation exception with the notAllowedOnRdn result code
         if ( attribute.size() == 0 )
         {
-            String msg = "Modify operation attempts to delete RDN attribute ";
-            msg += id + " on entry " + name + " violates schema constraints";
+            String msg = I18n.err( I18n.ERR_273, id, name );
 
             if ( log.isInfoEnabled() )
             {
@@ -424,8 +423,7 @@
             // we must complain with a schema violation
             if ( !attribute.contains( rdnValue ) )
             {
-                String msg = "Modify operation attempts to delete RDN attribute values in use for ";
-                msg += id + " on entry " + name + " and violates schema constraints";
+                String msg = I18n.err( I18n.ERR_274, id, name );
 
                 if ( log.isInfoEnabled() )
                 {
@@ -482,8 +480,7 @@
                 // a schema violation exception with the notAllowedOnRdn result code
                 if ( rdnAttr.size() == 0 )
                 {
-                    String msg = "Modify operation attempts to delete RDN attribute ";
-                    msg += id + " on entry " + name + " violates schema constraints";
+                    String msg = I18n.err( I18n.ERR_273, id, name );
 
                     if ( log.isInfoEnabled() )
                     {
@@ -502,8 +499,7 @@
                 // we must complain with a schema violation
                 if ( !rdnAttr.contains( rdnValue ) )
                 {
-                    String msg = "Modify operation attempts to delete RDN attribute values in use for ";
-                    msg += id + " on entry " + name + " and violates schema constraints";
+                    String msg = I18n.err( I18n.ERR_274, id, name );
 
                     if ( log.isInfoEnabled() )
                     {
@@ -557,8 +553,7 @@
         // a schema violation exception with the notAllowedOnRdn result code
         if ( attribute.size() == 0 )
         {
-            String msg = "Modify operation attempts to delete RDN attribute ";
-            msg += id + " on entry " + name + " violates schema constraints";
+            String msg = I18n.err( I18n.ERR_273, id, name );
 
             if ( log.isInfoEnabled() )
             {
@@ -577,8 +572,7 @@
         {
             if ( rdnValue.equals( value.getString() ) )
             {
-                String msg = "Modify operation attempts to delete RDN attribute values in use for ";
-                msg += id + " on entry " + name + " and violates schema constraints";
+                String msg = I18n.err( I18n.ERR_274, id, name );
 
                 if ( log.isInfoEnabled() )
                 {
@@ -633,8 +627,7 @@
                 // a schema violation exception with the notAllowedOnRdn result code
                 if ( entry.get( id ).size() == 0 )
                 {
-                    String msg = "Modify operation attempts to delete RDN attribute ";
-                    msg += id + " on entry " + name + " violates schema constraints";
+                    String msg = I18n.err( I18n.ERR_273, id, name );
 
                     if ( log.isInfoEnabled() )
                     {
@@ -653,8 +646,7 @@
                 {
                     if ( rdnValue.equals( value.getString() ) )
                     {
-                        String msg = "Modify operation attempts to delete RDN attribute values in use for ";
-                        msg += id + " on entry " + name + " and violates schema constraints";
+                        String msg = I18n.err( I18n.ERR_274, id, name );
 
                         if ( log.isInfoEnabled() )
                         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Jan 21 15:18:08 2010
@@ -1556,8 +1556,8 @@
         {
             if ( !schemaManager.getAttributeTypeRegistry().contains( attributeType.getName() ) )
             {
-                throw new LdapInvalidAttributeIdentifierException( attributeType.getName()
-                    + " not found in attribute registry!" );
+                throw new LdapInvalidAttributeIdentifierException( I18n.err( I18n.ERR_275, 
+                    attributeType.getName() ) );
             }
         }
 
@@ -1739,7 +1739,7 @@
     {
         if ( dn.size() < 2 )
         {
-            throw new NamingException( "At least two name components are expected for the dn" );
+            throw new NamingException( I18n.err( I18n.ERR_276 ) );
         }
         
         RDN rdn = dn.getRdn( 1 );
@@ -1775,9 +1775,8 @@
             {
                 if ( !allowed.contains( attrOid ) )
                 {
-                    throw new LdapSchemaViolationException( "Attribute " + attribute.getUpId()
-                        + " not declared in objectClasses of entry " + dn.getName(),
-                        ResultCodeEnum.OBJECT_CLASS_VIOLATION );
+                    throw new LdapSchemaViolationException( I18n.err( I18n.ERR_277, attribute.getUpId(),
+                        dn.getName() ), ResultCodeEnum.OBJECT_CLASS_VIOLATION );
                 }
             }
         }
@@ -1804,8 +1803,8 @@
     {
         if ( attribute.size() > 1 && ( ( ServerAttribute ) attribute ).getAttributeType().isSingleValued() )
         {
-            throw new LdapInvalidAttributeValueException( "More than one value has been provided "
-                + "for the single-valued attribute: " + attribute.getUpId(), ResultCodeEnum.CONSTRAINT_VIOLATION );
+            throw new LdapInvalidAttributeValueException( I18n.err( I18n.ERR_278, attribute.getUpId() ),
+                ResultCodeEnum.CONSTRAINT_VIOLATION );
         }
     }
 
@@ -1822,8 +1821,8 @@
 
         if ( must.size() != 0 )
         {
-            throw new LdapSchemaViolationException( "Required attributes " + must + " not found within entry "
-                + dn.getName(), ResultCodeEnum.OBJECT_CLASS_VIOLATION );
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_279, must, dn.getName() ),
+                ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
     }
 
@@ -1929,8 +1928,7 @@
                 }
                 catch ( Exception ne )
                 {
-                    String message = "Attribute value '" + value.getString()
-                         + "' for attribute '" + attribute.getUpId() + "' is syntactically incorrect";
+                    String message = I18n.err( I18n.ERR_280, value.getString(), attribute.getUpId() );
                     LOG.info( message );
 
                     throw new LdapInvalidAttributeValueException( message, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
@@ -1985,12 +1983,12 @@
                 }
                 catch ( UnsupportedEncodingException uee )
                 {
-                    throw new NamingException( "The value is not a valid String" );
+                    throw new NamingException( I18n.err( I18n.ERR_281 ) );
                 }
             }
             else
             {
-                throw new NamingException( "The value stored in an Human Readable attribute is not a String" );
+                throw new NamingException( I18n.err( I18n.ERR_282 ) );
             }
         }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Thu Jan 21 15:18:08 2010
@@ -31,6 +31,7 @@
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+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.Modification;
@@ -175,15 +176,11 @@
                     break; 
                     
                 case REPLACE_ATTRIBUTE :
-                    throw new LdapOperationNotSupportedException( 
-                        "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.", 
+                    throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_283 ), 
                         ResultCodeEnum.UNWILLING_TO_PERFORM );
                 
                 default:
-                    throw new IllegalStateException( "Undefined modify operation: " + mod.getOperation() );
+                    throw new IllegalStateException( I18n.err( I18n.ERR_284, mod.getOperation() ) );
             }
         }
     }
@@ -218,15 +215,11 @@
                 break;
                 
             case( DirContext.REPLACE_ATTRIBUTE ):
-                throw new LdapOperationNotSupportedException( 
-                    "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.", 
+                throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_283 ), 
                     ResultCodeEnum.UNWILLING_TO_PERFORM );
             
             default:
-                throw new IllegalStateException( "Undefined modify operation: " + modOp );
+                throw new IllegalStateException( I18n.err( I18n.ERR_284, modOp ) );
         }
     }
     
@@ -337,7 +330,7 @@
                 }
                 break;
             default:
-                throw new IllegalStateException( "Unknown index into handler array: " + index );
+                throw new IllegalStateException( I18n.err( I18n.ERR_285, index ) );
         }
     }
     
@@ -475,7 +468,7 @@
                 break;
                 
             default:
-                throw new IllegalStateException( "Unknown index into handler array: " + index );
+                throw new IllegalStateException( I18n.err( I18n.ERR_285, index ) );
         }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java Thu Jan 21 15:18:08 2010
@@ -44,6 +44,7 @@
 import java.security.spec.X509EncodedKeySpec;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+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.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -117,7 +118,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Failed to get BC Certificate factory for algorithm: X.509" );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_286 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -131,7 +132,7 @@
         }
         catch ( CertificateException e )
         {
-            NamingException ne = new NamingException( "Bad certificate format." );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_287 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -159,7 +160,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Failed to get key factory for algorithm: " + ALGORITHM );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_288, ALGORITHM ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -171,7 +172,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Bad private key format." );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_289 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -183,7 +184,7 @@
         }
         catch ( InvalidKeySpecException e )
         {
-            NamingException ne = new NamingException( "Bad public key format." );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_290 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -226,7 +227,7 @@
         }
         catch ( NoSuchAlgorithmException e )
         {
-            NamingException ne = new NamingException( "Cannot generate key pair for TLS" );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_291 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -270,7 +271,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Cannot generate self signed certificate." );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_292 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -305,7 +306,7 @@
         }
         catch ( NoSuchAlgorithmException e )
         {
-            NamingException ne = new NamingException( "Cannot generate key pair for TLS" );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_291 ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -350,7 +351,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Cannot generate self signed certificate." );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_292 ) );
             ne.setRootCause( e );
             throw ne;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Thu Jan 21 15:18:08 2010
@@ -199,7 +199,7 @@
         } 
         catch ( ClassNotFoundException e )
         {
-            String msg = "Class " + name + " not found in DIT.";
+            String msg = I18n.err( I18n.ERR_293, name );
             log.debug( msg );
             throw new ClassNotFoundException( msg );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Thu Jan 21 15:18:08 2010
@@ -32,6 +32,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.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -145,7 +146,7 @@
 
         }
 
-        throw new NamingException( "Stored Procedure Language, " + spLangId + " is not supported." );
+        throw new NamingException( I18n.err( I18n.ERR_294, spLangId ) );
 
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Thu Jan 21 15:18:08 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerAttribute;
+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.filter.AndNode;
@@ -59,17 +60,17 @@
     {
         if ( node == null )
         {
-            throw new IllegalArgumentException( "node cannot be null" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_295 ) );
         }
         
         if ( objectClasses == null )
         {
-            throw new IllegalArgumentException( "objectClasses cannot be null" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_296 ) );
         }
         
         if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
-            throw new IllegalArgumentException( "Attribute objectClasses should be of id 'objectClass'" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_297 ) );
         }
         
         if ( node.isLeaf() )
@@ -111,12 +112,12 @@
                 return !evaluate( bnode.getFirstChild(), objectClasses );
             }
 
-            throw new IllegalArgumentException( "Negation has no child: " + node );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_298, node ) );
             
         }
         else
         {
-            throw new IllegalArgumentException( "Unrecognized branch node operator: " + bnode );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_299, bnode ) );
         }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Thu Jan 21 15:18:08 2010
@@ -25,6 +25,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.entry.ServerAttribute;
+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.filter.EqualityNode;
@@ -71,27 +72,27 @@
     {
         if ( node == null )
         {
-            throw new IllegalArgumentException( "node cannot be null" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_300 ) );
         }
         
         if ( !( node instanceof EqualityNode ) )
         {
-            throw new NamingException( "Unrecognized assertion type for refinement node: " + node );
+            throw new NamingException( I18n.err( I18n.ERR_301, node ) );
         }
         
         if ( !node.getAttribute().equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT ) )
         {
-            throw new NamingException( "Refinement leaf node attribute was " + node.getAttribute() );
+            throw new NamingException( I18n.err( I18n.ERR_302, node.getAttribute() ) );
         }
 
         if ( null == objectClasses )
         {
-            throw new IllegalArgumentException( "objectClasses argument cannot be null" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_303 ) );
         }
         
         if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
-            throw new IllegalArgumentException( "objectClasses attribute must be for ID 'objectClass'" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_304 ) );
         }
 
         // check if AVA value exists in attribute

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Jan 21 15:18:08 2010
@@ -209,7 +209,7 @@
 
         if ( oc == null )
         {
-            throw new LdapSchemaViolationException( "A subentry must have an objectClass attribute",
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_305 ),
                 ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
 
@@ -416,10 +416,7 @@
             // check that administrativeRole has something valid in it for us
             if ( administrativeRole == null || administrativeRole.size() <= 0 )
             {
-                throw new LdapNoSuchAttributeException( "Administration point " + apName
-                    + " does not contain an administrativeRole attribute! An"
-                    + " administrativeRole attribute in the administrative point is"
-                    + " required to add a subordinate subentry." );
+                throw new LdapNoSuchAttributeException( I18n.err( I18n.ERR_306, apName ) );
             }
 
             /* ----------------------------------------------------------------
@@ -450,7 +447,7 @@
             }
             catch ( Exception e )
             {
-                String msg = "Failed while parsing subtreeSpecification for " + name.getName();
+                String msg = I18n.err( I18n.ERR_307, name.getName() );
                 LOG.warn( msg );
                 throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
             }
@@ -795,7 +792,7 @@
         {
             if ( hasAdministrativeDescendant( opContext, name ) )
             {
-                String msg = "Will not allow rename operation on entries with administrative descendants.";
+                String msg = I18n.err( I18n.ERR_308 );
                 LOG.warn( msg );
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
@@ -869,7 +866,7 @@
         {
             if ( hasAdministrativeDescendant( opContext, oriChildName ) )
             {
-                String msg = "Will not allow rename operation on entries with administrative descendants.";
+                String msg = I18n.err( I18n.ERR_308 );
                 LOG.warn( msg );
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
@@ -943,7 +940,7 @@
         {
             if ( hasAdministrativeDescendant( opContext, oriChildName ) )
             {
-                String msg = "Will not allow rename operation on entries with administrative descendants.";
+                String msg = I18n.err( I18n.ERR_308 );
                 LOG.warn( msg );
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }

Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=901735&r1=901734&r2=901735&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java (original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java Thu Jan 21 15:18:08 2010
@@ -268,6 +268,176 @@
     public static String ERR_227 = "ERR_227";
     public static String ERR_228 = "ERR_228";
     public static String ERR_229 = "ERR_229";
+    public static String ERR_230 = "ERR_230";
+    public static String ERR_231 = "ERR_231";
+    public static String ERR_232 = "ERR_232";
+    public static String ERR_233 = "ERR_233";
+    public static String ERR_234 = "ERR_234";
+    public static String ERR_235 = "ERR_235";
+    public static String ERR_236 = "ERR_236";
+    public static String ERR_237 = "ERR_237";
+    public static String ERR_238 = "ERR_238";
+    public static String ERR_239 = "ERR_239";
+    public static String ERR_240 = "ERR_240";
+    public static String ERR_241 = "ERR_241";
+    public static String ERR_242 = "ERR_242";
+    public static String ERR_243 = "ERR_243";
+    public static String ERR_244 = "ERR_244";
+    public static String ERR_245 = "ERR_245";
+    public static String ERR_246 = "ERR_246";
+    public static String ERR_247 = "ERR_247";
+    public static String ERR_248 = "ERR_248";
+    public static String ERR_249 = "ERR_249";
+    public static String ERR_250 = "ERR_250";
+    public static String ERR_251 = "ERR_251";
+    public static String ERR_252 = "ERR_252";
+    public static String ERR_253 = "ERR_253";
+    public static String ERR_254 = "ERR_254";
+    public static String ERR_255 = "ERR_255";
+    public static String ERR_256 = "ERR_256";
+    public static String ERR_257 = "ERR_257";
+    public static String ERR_258 = "ERR_258";
+    public static String ERR_259 = "ERR_259";
+    public static String ERR_260 = "ERR_260";
+    public static String ERR_261 = "ERR_261";
+    public static String ERR_262 = "ERR_262";
+    public static String ERR_263 = "ERR_263";
+    public static String ERR_264 = "ERR_264";
+    public static String ERR_265 = "ERR_265";
+    public static String ERR_266 = "ERR_266";
+    public static String ERR_267 = "ERR_267";
+    public static String ERR_268 = "ERR_268";
+    public static String ERR_269 = "ERR_269";
+    public static String ERR_270 = "ERR_270";
+    public static String ERR_271 = "ERR_271";
+    public static String ERR_272 = "ERR_272";
+    public static String ERR_273 = "ERR_273";
+    public static String ERR_274 = "ERR_274";
+    public static String ERR_275 = "ERR_275";
+    public static String ERR_276 = "ERR_276";
+    public static String ERR_277 = "ERR_277";
+    public static String ERR_278 = "ERR_278";
+    public static String ERR_279 = "ERR_279";
+    public static String ERR_280 = "ERR_280";
+    public static String ERR_281 = "ERR_281";
+    public static String ERR_282 = "ERR_282";
+    public static String ERR_283 = "ERR_283";
+    public static String ERR_284 = "ERR_284";
+    public static String ERR_285 = "ERR_285";
+    public static String ERR_286 = "ERR_286";
+    public static String ERR_287 = "ERR_287";
+    public static String ERR_288 = "ERR_288";
+    public static String ERR_289 = "ERR_289";
+    public static String ERR_290 = "ERR_290";
+    public static String ERR_291 = "ERR_291";
+    public static String ERR_292 = "ERR_292";
+    public static String ERR_293 = "ERR_293";
+    public static String ERR_294 = "ERR_294";
+    public static String ERR_295 = "ERR_295";
+    public static String ERR_296 = "ERR_296";
+    public static String ERR_297 = "ERR_297";
+    public static String ERR_298 = "ERR_298";
+    public static String ERR_299 = "ERR_299";
+    public static String ERR_300 = "ERR_300";
+    public static String ERR_301 = "ERR_301";
+    public static String ERR_302 = "ERR_302";
+    public static String ERR_303 = "ERR_303";
+    public static String ERR_304 = "ERR_304";
+    public static String ERR_305 = "ERR_305";
+    public static String ERR_306 = "ERR_306";
+    public static String ERR_307 = "ERR_307";
+    public static String ERR_308 = "ERR_308";
+    public static String ERR_309 = "ERR_309";
+    public static String ERR_310 = "ERR_310";
+    public static String ERR_311 = "ERR_311";
+    public static String ERR_312 = "ERR_312";
+    public static String ERR_313 = "ERR_313";
+    public static String ERR_314 = "ERR_314";
+    public static String ERR_315 = "ERR_315";
+    public static String ERR_316 = "ERR_316";
+    public static String ERR_317 = "ERR_317";
+    public static String ERR_318 = "ERR_318";
+    public static String ERR_319 = "ERR_319";
+    public static String ERR_320 = "ERR_320";
+    public static String ERR_321 = "ERR_321";
+    public static String ERR_322 = "ERR_322";
+    public static String ERR_323 = "ERR_323";
+    public static String ERR_324 = "ERR_324";
+    public static String ERR_325 = "ERR_325";
+    public static String ERR_326 = "ERR_326";
+    public static String ERR_327 = "ERR_327";
+    public static String ERR_328 = "ERR_328";
+    public static String ERR_329 = "ERR_329";
+    public static String ERR_330 = "ERR_330";
+    public static String ERR_331 = "ERR_331";
+    public static String ERR_332 = "ERR_332";
+    public static String ERR_333 = "ERR_333";
+    public static String ERR_334 = "ERR_334";
+    public static String ERR_335 = "ERR_335";
+    public static String ERR_336 = "ERR_336";
+    public static String ERR_337 = "ERR_337";
+    public static String ERR_338 = "ERR_338";
+    public static String ERR_339 = "ERR_339";
+    public static String ERR_340 = "ERR_340";
+    public static String ERR_341 = "ERR_341";
+    public static String ERR_342 = "ERR_342";
+    public static String ERR_343 = "ERR_343";
+    public static String ERR_344 = "ERR_344";
+    public static String ERR_345 = "ERR_345";
+    public static String ERR_346 = "ERR_346";
+    public static String ERR_347 = "ERR_347";
+    public static String ERR_348 = "ERR_348";
+    public static String ERR_349 = "ERR_349";
+    public static String ERR_350 = "ERR_350";
+    public static String ERR_351 = "ERR_351";
+    public static String ERR_352 = "ERR_352";
+    public static String ERR_353 = "ERR_353";
+    public static String ERR_354 = "ERR_354";
+    public static String ERR_355 = "ERR_355";
+    public static String ERR_356 = "ERR_356";
+    public static String ERR_357 = "ERR_357";
+    public static String ERR_358 = "ERR_358";
+    public static String ERR_359 = "ERR_359";
+    public static String ERR_360 = "ERR_360";
+    public static String ERR_361 = "ERR_361";
+    public static String ERR_362 = "ERR_362";
+    public static String ERR_363 = "ERR_363";
+    public static String ERR_364 = "ERR_364";
+    public static String ERR_365 = "ERR_365";
+    public static String ERR_366 = "ERR_366";
+    public static String ERR_367 = "ERR_367";
+    public static String ERR_368 = "ERR_368";
+    public static String ERR_369 = "ERR_369";
+    public static String ERR_370 = "ERR_370";
+    public static String ERR_371 = "ERR_371";
+    public static String ERR_372 = "ERR_372";
+    public static String ERR_373 = "ERR_373";
+    public static String ERR_374 = "ERR_374";
+    public static String ERR_375 = "ERR_375";
+    public static String ERR_376 = "ERR_376";
+    public static String ERR_377 = "ERR_377";
+    public static String ERR_378 = "ERR_378";
+    public static String ERR_379 = "ERR_379";
+    public static String ERR_380 = "ERR_380";
+    public static String ERR_381 = "ERR_381";
+    public static String ERR_382 = "ERR_382";
+    public static String ERR_383 = "ERR_383";
+    public static String ERR_384 = "ERR_384";
+    public static String ERR_385 = "ERR_385";
+    public static String ERR_386 = "ERR_386";
+    public static String ERR_387 = "ERR_387";
+    public static String ERR_388 = "ERR_388";
+    public static String ERR_389 = "ERR_389";
+    public static String ERR_390 = "ERR_390";
+    public static String ERR_391 = "ERR_391";
+    public static String ERR_392 = "ERR_392";
+    public static String ERR_393 = "ERR_393";
+    public static String ERR_394 = "ERR_394";
+    public static String ERR_395 = "ERR_395";
+    public static String ERR_396 = "ERR_396";
+    public static String ERR_397 = "ERR_397";
+    public static String ERR_398 = "ERR_398";
+    public static String ERR_399 = "ERR_399";
 
 
     /**



Mime
View raw message