directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902575 [1/2] - in /directory/apacheds/trunk: core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ core-avl/src/main/java/org/apach...
Date Sun, 24 Jan 2010 14:38:08 GMT
Author: felixk
Date: Sun Jan 24 14:38:06 2010
New Revision: 902575

URL: http://svn.apache.org/viewvc?rev=902575&view=rev
Log:
- Remove duplicates
- escape '=' in properties file
- fix found i18n replacement I replaced in a mistaken way (hope there aren't more)

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.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/schema/SchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.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/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
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
    directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ObjectBAComparator.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsTcpDecoder.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpDecoder.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java

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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -229,7 +229,7 @@
         }
         else
         {
-            String message = I18n.err( I18n.ERR_318, entry.getChangeType() );
+            String message = I18n.err( I18n.ERR_117, entry.getChangeType() );
             throw new NamingException( message );
         }
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Sun Jan 24 14:38:06 2010
@@ -153,7 +153,7 @@
     {
         if ( dn.size() < 2 )
         {
-            throw new NamingException( I18n.err( I18n.ERR_334 ) );
+            throw new NamingException( I18n.err( I18n.ERR_276 ) );
         }
         
         RDN rdn = dn.getRdn( 1 );
@@ -224,7 +224,7 @@
 
         if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
-            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_340, oid ),
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_335, oid ),
                 ResultCodeEnum.OTHER );
         }
     }
@@ -234,7 +234,7 @@
     {
         if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
-            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_340, oid ),
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_335, oid ),
                 ResultCodeEnum.OTHER );
         }
     }
@@ -307,7 +307,7 @@
         }
         else
         {
-            String msg = I18n.err( I18n.ERR_344, schemaObject.getName(), schemaName );
+            String msg = I18n.err( I18n.ERR_342, schemaObject.getName(), schemaName );
             LOG.warn( msg );
         
             throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Sun Jan 24 14:38:06 2010
@@ -364,7 +364,7 @@
         }
         else
         {
-            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_356, oid ),
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_336, oid ),
                 ResultCodeEnum.OTHER );
         }
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Sun Jan 24 14:38:06 2010
@@ -205,7 +205,7 @@
             }
             else
             {
-                String msg = I18n.err( I18n.ERR_388, entry.getDn().getName(),
+                String msg = I18n.err( I18n.ERR_386, entry.getDn().getName(),
                     StringTools.listToString( schemaManager.getErrors() ) );
                 LOG.info( msg );
                 throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
@@ -273,7 +273,7 @@
 
         if ( schemaManager.getSyntaxCheckerRegistry().contains( newOid ) )
         {
-            throw new LdapNamingException( I18n.err( I18n.ERR_392, newOid ),
+            throw new LdapNamingException( I18n.err( I18n.ERR_390, newOid ),
                 ResultCodeEnum.OTHER );
         }
 
@@ -327,7 +327,7 @@
 
         if ( schemaManager.getNormalizerRegistry().contains( oid ) )
         {
-            throw new LdapNamingException( I18n.err( I18n.ERR_394, oid ),
+            throw new LdapNamingException( I18n.err( I18n.ERR_390, oid ),
                 ResultCodeEnum.OTHER );
         }
     }
@@ -347,7 +347,7 @@
         }
         else
         {
-            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_395, oid ),
+            throw new LdapSchemaViolationException( I18n.err( I18n.ERR_336, oid ),
                 ResultCodeEnum.OTHER );
         }
     }
@@ -371,7 +371,7 @@
 
         if ( !( ( String ) rdn.getNormValue() ).equalsIgnoreCase( SchemaConstants.SYNTAX_CHECKERS_AT ) )
         {
-            throw new LdapInvalidNameException( I18n.err( I18n.ERR_398 ),
+            throw new LdapInvalidNameException( I18n.err( I18n.ERR_372 ),
                 ResultCodeEnum.NAMING_VIOLATION );
         }
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Sun Jan 24 14:38:06 2010
@@ -396,7 +396,7 @@
 
         if ( !( ( String ) rdn.getNormValue() ).equalsIgnoreCase( "syntaxes" ) )
         {
-            throw new LdapInvalidNameException( I18n.err( I18n.ERR_404 ), ResultCodeEnum.NAMING_VIOLATION );
+            throw new LdapInvalidNameException( I18n.err( I18n.ERR_363 ), ResultCodeEnum.NAMING_VIOLATION );
         }
     }
 }

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Sun Jan 24 14:38:06 2010
@@ -168,7 +168,7 @@
     {
         if ( data == null || data.length == 0 )
         {
-            throw new IOException( I18n.err( I18n.ERR_442 ) );
+            throw new IOException( I18n.err( I18n.ERR_439 ) );
         }
 
         if ( data.length == 1 && data[0] == 0 )

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Sun Jan 24 14:38:06 2010
@@ -163,7 +163,7 @@
     {
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_457 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
         
         setAttributeType( attributeType );
@@ -223,7 +223,7 @@
     {
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_457 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
         
         setAttributeType( attributeType );
@@ -255,7 +255,7 @@
     {
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_457 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
 
         setAttributeType( attributeType );
@@ -287,7 +287,7 @@
     {
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_457 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
 
         setAttributeType( attributeType );

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Sun Jan 24 14:38:06 2010
@@ -114,7 +114,7 @@
 
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_461 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
 
         if ( attributeType.getSyntax() == null )

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Sun Jan 24 14:38:06 2010
@@ -106,12 +106,12 @@
         
         if ( attributeType == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_470 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_92 ) );
         }
 
         if ( attributeType.getSyntax() == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_471 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_462 ) );
         }
 
         if ( ! attributeType.getSyntax().isHumanReadable() )
@@ -318,7 +318,7 @@
             }
             catch ( NamingException e )
             {
-                String msg = I18n.err( I18n.ERR_113, this, value );
+                String msg = I18n.err( I18n.ERR_109, this, value );
                 LOG.error( msg, e );
                 throw new IllegalStateException( msg, e );
             }

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java Sun Jan 24 14:38:06 2010
@@ -154,7 +154,7 @@
         }
         else if ( !( authentication instanceof String ) )
         {
-            throw new LdapConfigurationException( I18n.err( I18n.ERR_486, authentication.getClass(), 
+            throw new LdapConfigurationException( I18n.err( I18n.ERR_483, authentication.getClass(), 
                 Context.SECURITY_AUTHENTICATION ) );
         }
         else
@@ -196,7 +196,7 @@
         }
         else if ( !( principal instanceof String ) )
         {
-            throw new LdapConfigurationException( I18n.err( I18n.ERR_488, principal.getClass(), Context.SECURITY_PRINCIPAL ) );
+            throw new LdapConfigurationException( I18n.err( I18n.ERR_483, principal.getClass(), Context.SECURITY_PRINCIPAL ) );
         }
         else if ( ( ( String ) principal ).trim().equals( "" ) )
         {
@@ -217,7 +217,7 @@
             }
             else
             {
-                throw new LdapConfigurationException( I18n.err( I18n.ERR_488, obj.getClass(), SASL_AUTHID ) );
+                throw new LdapConfigurationException( I18n.err( I18n.ERR_483, obj.getClass(), SASL_AUTHID ) );
             }
             props.saslAuthId = ( String ) principal;
         }
@@ -242,7 +242,7 @@
             }
             else
             {
-                throw new LdapConfigurationException( I18n.err( I18n.ERR_488, credobj.getClass(), Context.SECURITY_CREDENTIALS ) );
+                throw new LdapConfigurationException( I18n.err( I18n.ERR_483, credobj.getClass(), Context.SECURITY_CREDENTIALS ) );
             }
         }
 

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Jan 24 14:38:06 2010
@@ -942,7 +942,7 @@
 
         if ( oldDn.size() == 0 )
         {
-            throw new LdapNoPermissionException( I18n.err( I18n.ERR_496 ) );
+            throw new LdapNoPermissionException( I18n.err( I18n.ERR_312 ) );
         }
 
         // calculate parents

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Sun Jan 24 14:38:06 2010
@@ -197,7 +197,7 @@
             }
             else
             {
-                throw new NamingException( I18n.err( I18n.ERR_502, oid ) );
+                throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
             }
         }
         else
@@ -212,7 +212,7 @@
             }
             else
             {
-                throw new NamingException( I18n.err( I18n.ERR_502, oid ) );
+                throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
             }
         }
         

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Sun Jan 24 14:38:06 2010
@@ -204,7 +204,7 @@
             }
             else
             {
-                throw new NamingException( I18n.err( I18n.ERR_502, oid ) );
+                throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
             }
         }
         else
@@ -219,7 +219,7 @@
             }
             else
             {
-                throw new NamingException( I18n.err( I18n.ERR_502, 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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -779,7 +779,7 @@
 
         if ( revision < 0 )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_313 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) );
         }
 
         if ( revision >= changeLog.getChangeLogStore().getCurrentRevision() )

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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -693,8 +693,8 @@
 
             if ( rdnAttrOid == null )
             {
-                log.error( I18n.err( I18n.ERR_44, rdnAttrOid ) );
-                throw new NamingException( I18n.err( I18n.ERR_45, rdnAttrOid ) );
+                log.error( I18n.err( I18n.ERR_43, rdnAttrOid ) );
+                throw new NamingException( I18n.err( I18n.ERR_44, rdnAttrOid ) );
             }
 
             if ( rdnAttrOid.equalsIgnoreCase( idOid ) )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Sun Jan 24 14:38:06 2010
@@ -200,7 +200,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( I18n.err( I18n.ERR_67 ), e );
+            LOG.error( I18n.err( I18n.ERR_66 ), e );
         }
         
         return new Certificate[0];

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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -112,12 +112,12 @@
                 return !evaluate( bnode.getFirstChild(), objectClasses );
             }
 
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_298, node ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_243, node ) );
             
         }
         else
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_299, bnode ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_244, 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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -72,7 +72,7 @@
     {
         if ( node == null )
         {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_300 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_295 ) );
         }
         
         if ( !( node instanceof EqualityNode ) )

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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -83,8 +83,8 @@
     public static String ERR_42 = "ERR_42";
     public static String ERR_43 = "ERR_43";
     public static String ERR_44 = "ERR_44";
-    public static String ERR_45 = "ERR_45";
-    public static String ERR_46 = "ERR_46";
+    // public static String ERR_45 = "ERR_45";
+    // public static String ERR_46 = "ERR_46";
     public static String ERR_47 = "ERR_47";
     public static String ERR_48 = "ERR_48";
     public static String ERR_49 = "ERR_49";
@@ -105,7 +105,7 @@
     public static String ERR_64 = "ERR_64";
     public static String ERR_65 = "ERR_65";
     public static String ERR_66 = "ERR_66";
-    public static String ERR_67 = "ERR_67";
+    // public static String ERR_67 = "ERR_67";
     public static String ERR_68 = "ERR_68";
     public static String ERR_69 = "ERR_69";
     public static String ERR_70 = "ERR_70";
@@ -151,7 +151,7 @@
     public static String ERR_110 = "ERR_110";
     public static String ERR_111 = "ERR_111";
     public static String ERR_112 = "ERR_112";
-    public static String ERR_113 = "ERR_113";
+    // public static String ERR_113 = "ERR_113";
     public static String ERR_114 = "ERR_114";
     public static String ERR_115 = "ERR_115";
     public static String ERR_116 = "ERR_116";
@@ -161,14 +161,14 @@
     public static String ERR_120 = "ERR_120";
     public static String ERR_121 = "ERR_121";
     public static String ERR_122 = "ERR_122";
-    public static String ERR_123 = "ERR_123";
+    // public static String ERR_123 = "ERR_123";
     public static String ERR_124 = "ERR_124";
     public static String ERR_125 = "ERR_125";
     public static String ERR_126 = "ERR_126";
     public static String ERR_127 = "ERR_127";
     public static String ERR_128 = "ERR_128";
-    public static String ERR_129 = "ERR_129";
-    public static String ERR_130 = "ERR_130";
+    // public static String ERR_129 = "ERR_129";
+    // public static String ERR_130 = "ERR_130";
     public static String ERR_131 = "ERR_131";
     public static String ERR_132 = "ERR_132";
     public static String ERR_133 = "ERR_133";
@@ -336,9 +336,9 @@
     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_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";
@@ -351,12 +351,12 @@
     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_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_318 = "ERR_318";
     public static String ERR_319 = "ERR_319";
     public static String ERR_320 = "ERR_320";
     public static String ERR_321 = "ERR_321";
@@ -372,17 +372,17 @@
     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_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_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_344 = "ERR_344";
     public static String ERR_345 = "ERR_345";
     public static String ERR_346 = "ERR_346";
     public static String ERR_347 = "ERR_347";
@@ -394,7 +394,7 @@
     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_356 = "ERR_356";
     public static String ERR_357 = "ERR_357";
     public static String ERR_358 = "ERR_358";
     public static String ERR_359 = "ERR_359";
@@ -426,23 +426,23 @@
     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_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_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_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_398 = "ERR_398";
     public static String ERR_399 = "ERR_399";
     public static String ERR_400 = "ERR_400";
     public static String ERR_401 = "ERR_401";
     public static String ERR_402 = "ERR_402";
     public static String ERR_403 = "ERR_403";
-    public static String ERR_404 = "ERR_404";
+    // public static String ERR_404 = "ERR_404";
     public static String ERR_405 = "ERR_405";
     public static String ERR_406 = "ERR_406";
     public static String ERR_407 = "ERR_407";
@@ -480,7 +480,7 @@
     public static String ERR_439 = "ERR_439";
     public static String ERR_440 = "ERR_440";
     public static String ERR_441 = "ERR_441";
-    public static String ERR_442 = "ERR_442";
+    // public static String ERR_442 = "ERR_442";
     public static String ERR_443 = "ERR_443";
     public static String ERR_444 = "ERR_444";
     public static String ERR_445 = "ERR_445";
@@ -495,11 +495,11 @@
     public static String ERR_454 = "ERR_454";
     public static String ERR_455 = "ERR_455";
     public static String ERR_456 = "ERR_456";
-    public static String ERR_457 = "ERR_457";
+    // public static String ERR_457 = "ERR_457";
     public static String ERR_458 = "ERR_458";
     public static String ERR_459 = "ERR_459";
     public static String ERR_460 = "ERR_460";
-    public static String ERR_461 = "ERR_461";
+    // public static String ERR_461 = "ERR_461";
     public static String ERR_462 = "ERR_462";
     public static String ERR_463 = "ERR_463";
     public static String ERR_464 = "ERR_464";
@@ -508,8 +508,8 @@
     public static String ERR_467 = "ERR_467";
     public static String ERR_468 = "ERR_468";
     public static String ERR_469 = "ERR_469";
-    public static String ERR_470 = "ERR_470";
-    public static String ERR_471 = "ERR_471";
+    // public static String ERR_470 = "ERR_470";
+    // public static String ERR_471 = "ERR_471";
     public static String ERR_472 = "ERR_472";
     public static String ERR_473 = "ERR_473";
     public static String ERR_474 = "ERR_474";
@@ -524,9 +524,9 @@
     public static String ERR_483 = "ERR_483";
     public static String ERR_484 = "ERR_484";
     public static String ERR_485 = "ERR_485";
-    public static String ERR_486 = "ERR_486";
+    // public static String ERR_486 = "ERR_486";
     public static String ERR_487 = "ERR_487";
-    public static String ERR_488 = "ERR_488";
+    // public static String ERR_488 = "ERR_488";
     public static String ERR_489 = "ERR_489";
     public static String ERR_490 = "ERR_490";
     public static String ERR_491 = "ERR_491";
@@ -534,13 +534,13 @@
     public static String ERR_493 = "ERR_493";
     public static String ERR_494 = "ERR_494";
     public static String ERR_495 = "ERR_495";
-    public static String ERR_496 = "ERR_496";
+    // public static String ERR_496 = "ERR_496";
     public static String ERR_497 = "ERR_497";
     public static String ERR_498 = "ERR_498";
     public static String ERR_499 = "ERR_499";
     public static String ERR_500 = "ERR_500";
     public static String ERR_501 = "ERR_501";
-    public static String ERR_502 = "ERR_502";
+    // public static String ERR_502 = "ERR_502";
     public static String ERR_503 = "ERR_503";
     public static String ERR_504 = "ERR_504";
     public static String ERR_505 = "ERR_505";
@@ -568,7 +568,7 @@
     public static String ERR_527 = "ERR_527";
     public static String ERR_528 = "ERR_528";
     public static String ERR_529 = "ERR_529";
-    public static String ERR_530 = "ERR_530";
+    // public static String ERR_530 = "ERR_530";
     public static String ERR_531 = "ERR_531";
     public static String ERR_532 = "ERR_532";
     public static String ERR_533 = "ERR_533";
@@ -616,27 +616,27 @@
     public static String ERR_575 = "ERR_575";
     public static String ERR_576 = "ERR_576";
     public static String ERR_577 = "ERR_577";
-    public static String ERR_578 = "ERR_578";
-    public static String ERR_579 = "ERR_579";
-    public static String ERR_580 = "ERR_580";
+    // public static String ERR_578 = "ERR_578";
+    // public static String ERR_579 = "ERR_579";
+    // public static String ERR_580 = "ERR_580";
     public static String ERR_581 = "ERR_581";
-    public static String ERR_582 = "ERR_582";
-    public static String ERR_583 = "ERR_583";
-    public static String ERR_584 = "ERR_584";
-    public static String ERR_585 = "ERR_585";
-    public static String ERR_586 = "ERR_586";
-    public static String ERR_587 = "ERR_587";
-    public static String ERR_588 = "ERR_588";
-    public static String ERR_589 = "ERR_589";
-    public static String ERR_590 = "ERR_590";
+    // public static String ERR_582 = "ERR_582";
+    // public static String ERR_583 = "ERR_583";
+    // public static String ERR_584 = "ERR_584";
+    // public static String ERR_585 = "ERR_585";
+    // public static String ERR_586 = "ERR_586";
+    // public static String ERR_587 = "ERR_587";
+    // public static String ERR_588 = "ERR_588";
+    // public static String ERR_589 = "ERR_589";
+    // public static String ERR_590 = "ERR_590";
     public static String ERR_591 = "ERR_591";
     public static String ERR_592 = "ERR_592";
     public static String ERR_593 = "ERR_593";
     public static String ERR_594 = "ERR_594";
-    public static String ERR_595 = "ERR_595";
+    // public static String ERR_595 = "ERR_595";
     public static String ERR_596 = "ERR_596";
     public static String ERR_597 = "ERR_597";
-    public static String ERR_598 = "ERR_598";
+    // public static String ERR_598 = "ERR_598";
     public static String ERR_599 = "ERR_599";
     public static String ERR_600 = "ERR_600";
     public static String ERR_601 = "ERR_601";
@@ -658,8 +658,8 @@
     public static String ERR_617 = "ERR_617";
     public static String ERR_618 = "ERR_618";
     public static String ERR_619 = "ERR_619";
-    public static String ERR_620 = "ERR_620";
-    public static String ERR_621 = "ERR_621";
+    // public static String ERR_620 = "ERR_620";
+    // public static String ERR_621 = "ERR_621";
     public static String ERR_622 = "ERR_622";
     public static String ERR_623 = "ERR_623";
     public static String ERR_624 = "ERR_624";
@@ -681,9 +681,9 @@
     public static String ERR_640 = "ERR_640";
     public static String ERR_641 = "ERR_641";
     public static String ERR_642 = "ERR_642";
-    public static String ERR_643 = "ERR_643";
-    public static String ERR_644 = "ERR_644";
-    public static String ERR_645 = "ERR_645";
+    // public static String ERR_643 = "ERR_643";
+    // public static String ERR_644 = "ERR_644";
+    // public static String ERR_645 = "ERR_645";
     public static String ERR_646 = "ERR_646";
     public static String ERR_647 = "ERR_647";
     public static String ERR_648 = "ERR_648";
@@ -703,7 +703,7 @@
     public static String ERR_662 = "ERR_662";
     public static String ERR_663 = "ERR_663";
     public static String ERR_664 = "ERR_664";
-    public static String ERR_665 = "ERR_665";
+    // public static String ERR_665 = "ERR_665";
     public static String ERR_666 = "ERR_666";
     public static String ERR_667 = "ERR_667";
     public static String ERR_668 = "ERR_668";
@@ -711,7 +711,7 @@
     public static String ERR_670 = "ERR_670";
     public static String ERR_671 = "ERR_671";
     public static String ERR_672 = "ERR_672";
-    public static String ERR_673 = "ERR_673";
+    // public static String ERR_673 = "ERR_673";
     public static String ERR_674 = "ERR_674";
     public static String ERR_675 = "ERR_675";
     public static String ERR_676 = "ERR_676";
@@ -726,15 +726,15 @@
     public static String ERR_685 = "ERR_685";
     public static String ERR_686 = "ERR_686";
     public static String ERR_687 = "ERR_687";
-    public static String ERR_688 = "ERR_688";
+    // public static String ERR_688 = "ERR_688";
     public static String ERR_689 = "ERR_689";
     public static String ERR_690 = "ERR_690";
     public static String ERR_691 = "ERR_691";
     public static String ERR_692 = "ERR_692";
-    public static String ERR_693 = "ERR_693";
+    // public static String ERR_693 = "ERR_693";
     public static String ERR_694 = "ERR_694";
     public static String ERR_695 = "ERR_695";
-    public static String ERR_696 = "ERR_696";
+    // public static String ERR_696 = "ERR_696";
     public static String ERR_697 = "ERR_697";
     public static String ERR_698 = "ERR_698";
     public static String ERR_699 = "ERR_699";
@@ -748,7 +748,7 @@
     public static String ERR_707 = "ERR_707";
     public static String ERR_708 = "ERR_708";
     public static String ERR_709 = "ERR_709";
-    public static String ERR_710 = "ERR_710";
+    // public static String ERR_710 = "ERR_710";
     public static String ERR_711 = "ERR_711";
     public static String ERR_712 = "ERR_712";
     public static String ERR_713 = "ERR_713";
@@ -764,7 +764,7 @@
     public static String ERR_723 = "ERR_723";
     public static String ERR_724 = "ERR_724";
     public static String ERR_725 = "ERR_725";
-    public static String ERR_726 = "ERR_726";
+    // public static String ERR_726 = "ERR_726";
     public static String ERR_727 = "ERR_727";
     public static String ERR_728 = "ERR_728";
     public static String ERR_729 = "ERR_729";

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=902575&r1=902574&r2=902575&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 Sun Jan 24 14:38:06 2010
@@ -66,8 +66,8 @@
 ERR_42=An entry with a 'referral' ObjectClass must contains a 'ref' Attribute
 ERR_43=The id {0} does not have any OID. It should be a wrong AttributeType.
 ERR_44=Wrong AttributeType, does not have an associated OID : {0}
-ERR_45=The id {0} does not have any OID. It should be a wrong AttributeType.
-ERR_46=Wrong AttributeType, does not have an associated OID : {0}
+# ERR_45=
+# ERR_46=
 ERR_47=The value stored in an Human Readable attribute as a byte[] should be convertible to a String"
 ERR_48=The value stored in a non Human Readable attribute as a String should be convertible to a byte[]
 ERR_49=A filter should not be null
@@ -88,7 +88,7 @@
 ERR_64=The value is not valid. It should be a String or a byte[]
 ERR_65=Failed to access certificate in DIT.
 ERR_66=Failed on attempt to compare certificate bytes to determine alias.
-ERR_67=Failed on attempt to compare certificate bytes to determine alias.
+# ERR_67=
 ERR_68=Failed on attempt to extract key.
 ERR_69=Exception while searching the DIT for class: {0}
 ERR_70=Encountered failure while searching directory for class: {0}
@@ -134,7 +134,7 @@
 ERR_110=I don't really know how to compare anything other than ServerBinaryValues at this point in time.
 ERR_111=The attribute '{0}' is incorrect
 ERR_112=Cannot normalize the wrapped value {0}
-ERR_113=Failed to compare normalized values for {0} and {1}
+# ERR_113=
 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\: 
@@ -144,14 +144,14 @@
 ERR_120=Failed to configure the jetty http server
 ERR_121=Failed to configure the web application(s)
 ERR_122=Error encoding EncryptionKey.
-ERR_123=Cannot build an index for attribute '{0}', no EQUALITY MatchingRule defined
+# ERR_123=
 ERR_124=Failed to close an index.
 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_129=A user index on attribute {0} ({1}) does not exist!
-ERR_130=A system index on attribute {0} ({1}) does not exist!
+# ERR_129=
+# ERR_130=
 ERR_131=Error while adding {0} on table {1}
 ERR_132=Error while adding {0}, {1} on table {2}
 ERR_133=Exception while removing {0} from index {1}
@@ -319,9 +319,9 @@
 ERR_295=node cannot be null
 ERR_296=objectClasses cannot be null
 ERR_297=Attribute objectClasses should be of id 'objectClass'
-ERR_298=Negation has no child: {0}
-ERR_299=Unrecognized branch node operator: {0}
-ERR_300=node cannot be null
+# ERR_298=
+# ERR_299=
+# ERR_300=
 ERR_301=Unrecognized assertion type for refinement node: {0}
 ERR_302=Refinement leaf node attribute was {0}
 ERR_303=objectClasses argument cannot be null
@@ -334,12 +334,12 @@
 ERR_310=The change log must be enabled to revert to previous log revisions.
 ERR_311=There must be at least one tag to revert to the latest tag.
 ERR_312=can't rename the rootDSE
-ERR_313=revision must be greater than or equal to 0
+# ERR_313=
 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=Schema load failed : {0}
-ERR_318=Unsupported changetype found in LDIF: {0}
+# ERR_318=
 ERR_319=Cannot execute indirect lookup if it is not the next operation.
 ERR_320=The throwReferral method is not implemented for a Bind operation
 ERR_321=The isReferralThrown method is not implemented for a Bind operation
@@ -355,17 +355,17 @@
 ERR_331=Unknown interceptor name: {0}
 ERR_332=Other interceptor is using name '{0}'
 ERR_333=Unexpected exception.
-ERR_334=At least two name components are expected for the dn
+# ERR_334=
 ERR_335=Oid {0} for new schema entity is not unique.
 ERR_336=Oid {0} for new schema entity does not exist.
 ERR_337=The parent dn of a attributeType should be at most 3 name components in length.
 ERR_338=The parent entry of a {0} should be an organizationalUnit.
-ERR_339=The parent entry of a {0} should have a relative name of ou={1}.
-ERR_340=Oid {0} for new schema entity is not unique.
+ERR_339=The parent entry of a {0} should have a relative name of ou\={1}.
+# ERR_340=
 ERR_341=Cannot inject {0} into {1} as this schema already contains this element
 ERR_342=Cannot inject {0} into {1} as this schema is not loaded
 ERR_343=Cannot remove {0} from {1} as this schema does not contain this element
-ERR_344=Cannot inject {0} into {1} as this schema is not loaded
+# ERR_344=
 ERR_345=Cannot add the AttributeType {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_346=Cannot delete the AttributeType {0} from the registries, the resulting registries would be inconsistent : {1}
 ERR_347=Cannot rename {0} to {1} as the later has descendants' AttributeTypes
@@ -377,14 +377,14 @@
 ERR_353=The comparator with OID {0} cannot have it's OID changed until all matchingRules using that comparator have been deleted.
 ERR_354=The comparator with OID {0} cannot be moved to another schema until all matchingRules using that comparator have been deleted.
 ERR_355=Oid {0} for new schema comparator is not unique.
-ERR_356=Oid {0} for new schema entity does not exist.
+# ERR_356=
 ERR_357=The parent dn of a comparator should be at most 3 name components in length.
 ERR_358=The parent entry of a comparator should be an organizationalUnit.
-ERR_359=The parent entry of a comparator should have a relative name of ou=comparators.
+ERR_359=The parent entry of a comparator should have a relative name of ou\=comparators.
 ERR_360=Cannot add the MatchingRule {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_361=The parent dn of a matchingRule should be at most 3 name components in length.
 ERR_362=The parent entry of a matchingRule should be an organizationalUnit.
-ERR_363=The parent entry of a syntax should have a relative name of ou=matchingRules.
+ERR_363=The parent entry of a syntax should have a relative name of ou\=matchingRules.
 ERR_364=Cannot delete the Normalizer {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_365=Cannot add the Normalizer {0} into the registries, we have got some errors : {1}
 ERR_366=Cannot delete {0}, as there are some dependant SchemaObjects \:\n{1}
@@ -393,12 +393,12 @@
 ERR_369=Oid {0} for new schema normalizer is not unique.
 ERR_370=The parent dn of a normalizer should be at most 3 name components in length.
 ERR_371=The parent entry of a normalizer should be an organizationalUnit.
-ERR_372=The parent entry of a normalizer should have a relative name of ou=normalizers.
+ERR_372=The parent entry of a normalizer should have a relative name of ou\=normalizers.
 ERR_373=Cannot add the ObjectClass {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_374=Cannot delete the ObjectClass {0} from the registries, the resulting registries would be inconsistent : {1}
 ERR_375=Cannot rename {0} to {1} as the later has descendants' ObjectClasses
 ERR_376=The parent entry of a objectClass should be an organizationalUnit.
-ERR_377=The parent entry of a attributeType should have a relative name of ou=objectClasses.
+ERR_377=The parent entry of a attributeType should have a relative name of ou\=objectClasses.
 ERR_378=Only schema entity containers of objectClass organizationalUnit with 3 name components in length can be deleted.
 ERR_379=Can only delete organizationalUnit entity containers with one of the following names: {0}
 ERR_380=The parent dn of a schema should be {0} and not: {1}
@@ -409,23 +409,23 @@
 ERR_385=Unwilling to perform operation on schema with missing dependencies: {0}
 ERR_386=Cannot delete the SyntaxChecker {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_387=Cannot delete the SyntaxChecker {0} as it does not exist in any schema
-ERR_388=Cannot delete the syntaxChecker {0} into the registries, the resulting registries would be inconsistent : {1}
+# ERR_388=
 ERR_389=The syntaxChecker with OID {0} cannot have it's OID changed until all syntaxes using that syntaxChecker have been deleted.
 ERR_390=Oid {0} for new schema syntaxChecker is not unique.
 ERR_391=The syntaxChecker with OID {0} cannot have it's OID changed until all syntaxes using that syntaxChecker have been deleted.
-ERR_392=Oid {0} for new schema syntaxChecker is not unique.
+# ERR_392=
 ERR_393=The syntaxChecker with OID {0} cannot be moved to another schema until all syntax using that syntaxChecker have been deleted.
-ERR_394=Oid {0} for new schema SyntaxChecker is not unique.
-ERR_395=Oid {0} for new schema entity does not exist.
+# ERR_394=
+# ERR_395=
 ERR_396=The parent dn of a syntaxChecker should be at most 3 name components in length.
 ERR_397=The parent entry of a syntaxChecker should be an organizationalUnit.
-ERR_398=The parent entry of a normalizer should have a relative name of ou=syntaxCheckers.
+# ERR_398=
 ERR_399=Cannot add the Syntax {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_400=Cannot delete the Syntax {0} into the registries, the resulting registries would be inconsistent : {1}
 ERR_401=The syntax with OID {0} cannot be deleted until all entities using this syntax have also been deleted. The following dependees exist: {1}
 ERR_402=The parent dn of a syntax should be at most 3 name components in length.
 ERR_403=The parent entry of a syntax should be an organizationalUnit.
-ERR_404=The parent entry of a syntax should have a relative name of ou=syntaxes.
+# ERR_404=
 ERR_405=The following does not conform to the syntaxCheckerDescription syntax: {0}
 ERR_406=The following does not conform to the normalizerDescription syntax: {0}
 ERR_407=The following does not conform to the comparatorDescription syntax: {0}
@@ -463,7 +463,7 @@
 ERR_439=Null or empty data array is invalid.
 ERR_440=wrong array serialized data format
 ERR_441=Bad tree : [{0}]
-ERR_442=Null or empty data array is invalid.
+# ERR_442=
 ERR_443=wrong AvlTree serialized data format
 ERR_444=This singleton AvlTree does not support changes since the behavior of alterations on a singleton are undefined.
 ERR_445=Could not find class
@@ -478,11 +478,11 @@
 ERR_454=Already in ordered set mode.
 ERR_455=Cannot use standard serialization for a ServerAttribute
 ERR_456=Cannot use standard serialization for a ServerEntry
-ERR_457=The AttributeType parameter should not be null
+# ERR_457=
 ERR_458=The ID '{0}'is incompatible with the AttributeType's id '{1}'
 ERR_459=An ID cannnot be null, empty, or resolved to an emtpy value when trimmed
 ERR_460=Cannot read the attribute as it's OID ('{0}') does not exist
-ERR_461=The AttributeType parameter should not be null
+# ERR_461=
 ERR_462=There is no Syntax associated with this attributeType
 ERR_463=Cannot use standard serialization for a ServerStringValue
 ERR_464=undefined modification type: {0}
@@ -491,8 +491,8 @@
 ERR_467=The AttributeType '{0}' does not exist in the schema
 ERR_468=Encountered NamingException on underlying enumeration.
 ERR_469=Cannot serialize a Modification with no attribute
-ERR_470=The AttributeType parameter should not be null
-ERR_471=There is no Syntax associated with this attributeType
+# ERR_470=
+# ERR_471=
 ERR_472=Not a valid value
 ERR_473=expected string to normalize
 ERR_474=expected byte[] to normalize
@@ -507,9 +507,9 @@
 ERR_483=Don't know how to interpret {0} objects for environment property {1}
 ERR_484=Expected property {0} but could not find it in env!
 ERR_485=Expected value for property {0} but it was set to null in env!
-ERR_486=Don't know how to interpret {0} objects for environment property {1}
+# ERR_486=
 ERR_487={0} cannot be null.
-ERR_488=Don't know how to interpret {0} objects for environment property {1}
+# ERR_488=
 ERR_489=cannot specify simple authentication with supplying credentials
 ERR_490={0} does not exist
 ERR_491={0} does not contains the mandatory 'cn' attribute for JavaContainer ObjectClass!
@@ -517,13 +517,13 @@
 ERR_493=Do not know how to store Referenceables yet!
 ERR_494=Do not know how to store References yet!
 ERR_495=Can't find a way to bind: {0}
-ERR_496=can't rename the rootDSE
+# ERR_496=
 ERR_497=Failed to create an object for {0} using object factories within the context's environment.
 ERR_498=The prefix '{0}' is not an ancestor of this entry '{1}'
 ERR_499=Both obj and attrs args are null. At least one of these parameters must not be null.
 ERR_500=Encountered parse exception while parsing the filter: '{0}'
 ERR_501=could not parse filter: {0}
-ERR_502=Bad value for the OID {0}
+# ERR_502=
 ERR_503=Config partition cannot be null
 ERR_504=the config partition is not initialized
 ERR_505=system partition doesn't exist
@@ -551,7 +551,7 @@
 ERR_527=Platform doesn't support UTF8 encoding
 ERR_528=MRU cache must contain at least one entry
 ERR_529=Cannot add null listener.
-ERR_530=Argument 'comparator' is null
+# ERR_530=
 ERR_531=Internal cache cannot be null.
 ERR_532=key cannot be null.
 ERR_533=value cannot be null.
@@ -599,27 +599,27 @@
 ERR_575=The {0} property for an index cannot be set after it has been initialized.
 ERR_576=Cannot set jdbm store property {0} after initialization.
 ERR_577=Errors encountered on destroy()
-ERR_578=[36] aliasDereferencingProblem - attempt to create alias to itself.
-ERR_579=[36] aliasDereferencingProblem - attempt to create alias with cycle to relative {0} not allowed from descendent alias {1} 
-ERR_580=[36] aliasDereferencingProblem - the alias points to an entry outside of the {0} namingContext to an object whose existence cannot be determined.
+# ERR_578=
+# ERR_579= 
+# ERR_580=
 ERR_581=[33] aliasProblem - the alias '{0}' when dereferenced would not name a known object. The aliased ObjectName '{1}' must be set to a valid existing entry.
-ERR_582=[36] aliasDereferencingProblem - the alias points to another alias. Alias chaining is not supported by this backend.
-ERR_583=Cannot store a ClonedServerEntry
-ERR_584=Id for parent '{0}' not found!
-ERR_585=Not a normalized name: {0}
-ERR_586=Entry {0} contains no objectClass attribute: {1}
-ERR_587=Entry {0} contains no entryCsn attribute: {1}
-ERR_588=Entry {0} contains no entryUuid attribute: {1}
-ERR_589=Cannot store a ClonedServerEntry
-ERR_590=Unidentified modification operation
+# ERR_582=
+# ERR_583=
+# ERR_584=
+# ERR_585=
+# ERR_586=
+# ERR_587=
+# ERR_588=
+# ERR_589=
+# ERR_590=
 ERR_591=Key comparator cannot be null.
 ERR_592=Value comparator must not be null for tables with duplicate keys.
 ERR_593=Unfortunately this Table without duplicates enabled does not contain a value comparator which is needed to answer your ordering question.
 ERR_594=null for key or value is not valid
-ERR_595=This cursor locks down the key so keywise advances are not allowed.
+# ERR_595=
 ERR_596=This Cursor does not support duplicate keys.
 ERR_597=Encoder unavailable for {0}
-ERR_598=Error accessing encoder for {0}
+# ERR_598=
 ERR_599=Error instantiating encoder for {0}
 ERR_600=Decoder unavailable for {0}
 ERR_601=Error accessing decoder for {0}
@@ -632,7 +632,7 @@
 ERR_608=TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed with the TGS session key
 ERR_609=TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes TGS authenticator subkey), encrypted with the TGS session key
 ERR_610=TGS-REP encrypted part (includes application session key), encrypted with the TGS session key
-ERR_611=TGS-REP encrypted part (includes application session key), encrypted with the TGS session key
+ERR_611=TGS-REP encrypted part (includes application session key), encrypted with the TGS authenticator subkey
 ERR_612=AP-REQ Authenticator cksum, keyed with the application session key
 ERR_613=AP-REQ Authenticator (includes application authenticator subkey), encrypted with the application session key
 ERR_614=AP-REP encrypted part (includes application session subkey), encrypted with the application session key
@@ -641,8 +641,8 @@
 ERR_617=Callback not supported
 ERR_618=File is too large {0}
 ERR_619=Could not completely read file {0}
-ERR_620=Cannot put a PDU in a null buffer !
-ERR_621=The PDU buffer size is too small !
+# ERR_620=
+# ERR_621=
 ERR_622=Cannot encode the AuthorizationDataEntry object, the PDU size is {0} when only {1} bytes has been allocated
 ERR_623=Account Kerberos key attribute '{0}' contained an invalid value for krb5key.
 ERR_624=Failed to get catalog context {0}
@@ -664,9 +664,9 @@
 ERR_640=Can't initialize option field classes
 ERR_641=Max data length: 128 bytes.
 ERR_642=ASCII encoding unavailable
-ERR_643=Decoder unavailable for {0}
-ERR_644=Encoder unavailable for {0}
-ERR_645=maxObjectSize: {0}
+# ERR_643=
+# ERR_644=
+# ERR_645=
 ERR_646=Record type to objectClass mapping has not been set.
 ERR_647=ResourceRecord requires STRUCTURAL objectClass
 ERR_648=Invalid search base {0}
@@ -686,7 +686,7 @@
 ERR_662=Sasl challenge response already completed.
 ERR_663=Cannot send Type 2 challenge before Type 1 response.
 ERR_664=Cannot send Type 2 after it's already sent.
-ERR_665=Sasl challenge response already completed.
+# ERR_665=
 ERR_666=response was null
 ERR_667=response with zero bytes
 ERR_668=There was a failure during NTLM Type 1 message handling.
@@ -694,7 +694,7 @@
 ERR_670=Authentication attempted but the credentials were invalid..
 ERR_671=response with no auhcid or no password
 ERR_672='0' chars are not allowed in authcid or no password
-ERR_673=response with no auhcid or no password
+# ERR_673=
 ERR_674=The given InitialReponse is incorrect
 ERR_675=Cannot authenticate an invalid authcid DN
 ERR_676=Cannot authenticate the user {0}
@@ -709,15 +709,15 @@
 ERR_685=Unidentified single reply request/response type: {0}
 ERR_686=Unexpected base scope.
 ERR_687=TimeUnit not supported: {0}
-ERR_688=LDIF file does not exist.
+# ERR_688=
 ERR_689=Unsupported protocol type {0}
 ERR_690=Failed to add the extended operation of type {0}
 ERR_691=Failed to add the SASL mechanism with the name {0} and implementation class {1}
 ERR_692=Failed to add NTLM provider
-ERR_693=Unsupported protocol type {0}
+# ERR_693=
 ERR_694=Empty ID: {0}
 ERR_695=Invalid replica ID\: 
-ERR_696=Schema load failed : {0}
+# ERR_696=
 ERR_697=The following schema directory from the installation layout could not be found\:\n\t{0}
 ERR_698=Unknown SchemaObject type: {0}
 ERR_699=Could not find entry at '{0}' to delete it!
@@ -731,7 +731,7 @@
 ERR_707=AndCursors are not ordered and do not support positioning by element.
 ERR_708=Cursor has not been positioned yet.
 ERR_709=Could not find matchingRule to use for EqualityNode evaluation: {0}
-ERR_710=Unknown assertion type: {0}
+# ERR_710=
 ERR_711=Unrecognized leaf node
 ERR_712=Unrecognized branch node type
 ERR_713=Unrecognized search scope value for filter scope node
@@ -747,7 +747,7 @@
 ERR_723=Must have 2 or more sub-expression Cursors for a disjunction
 ERR_724=PresenceCursors do not support positioning by element without a user index on the presence attribute.
 ERR_725=SubstringCursors may not be ordered and do not support positioning by element.
-ERR_726=Scope Cursors are not ordered and do not support positioning by element.
+# ERR_726=
 ERR_727=ScopeNode is not of subtree scope.
 ERR_728=There can only be 2 columns at index 0 and at 1
 ERR_729=You didn't correctly set col names

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sun Jan 24 14:38:06 2010
@@ -430,7 +430,7 @@
                 }
                 else
                 {
-                    LOG.error( I18n.err( I18n.ERR_123, attributeType.getName() ) );
+                    LOG.error( I18n.err( I18n.ERR_4, attributeType.getName() ) );
                 }
             }
             
@@ -865,7 +865,7 @@
             return userIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_129, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, name ) );
     }
 
 
@@ -887,7 +887,7 @@
             return systemIndices.get( id );
         }
 
-        throw new IndexNotFoundException( I18n.err( I18n.ERR_130, id, name ) );
+        throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, name ) );
     }
 
 
@@ -1029,14 +1029,14 @@
         {
             if ( aliasDn.equals( normalizedAliasTargetDn ) )
             {
-                String msg = I18n.err( I18n.ERR_578 );
+                String msg = I18n.err( I18n.ERR_223 );
                 ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
                 LdapNamingException e = new LdapNamingException( msg, rc );
                 e.setResolvedName( aliasDn );
                 throw e;
             }
 
-            String msg = I18n.err( I18n.ERR_579, aliasTarget, aliasDn );
+            String msg = I18n.err( I18n.ERR_224, aliasTarget, aliasDn );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1053,7 +1053,7 @@
          */
         if ( !normalizedAliasTargetDn.startsWith( normSuffix ) )
         {
-            String msg = I18n.err( I18n.ERR_580, upSuffix.getName() );
+            String msg = I18n.err( I18n.ERR_225, upSuffix.getName() );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1091,7 +1091,7 @@
          */
         if ( null != aliasIdx.reverseLookup( targetId ) )
         {
-            String msg = I18n.err( I18n.ERR_582 );
+            String msg = I18n.err( I18n.ERR_227 );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1154,7 +1154,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( I18n.err( I18n.ERR_583 ) );
+            throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
         
         Long parentId;
@@ -1182,14 +1182,14 @@
         // don't keep going if we cannot find the parent Id
         if ( parentId == null )
         {
-            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_584, parentDn ) );
+            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_216, parentDn ) );
         }
 
         EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
 
         if ( objectClass == null )
         {
-            String msg = I18n.err( I18n.ERR_586, entryDn.getName(), entry );
+            String msg = I18n.err( I18n.ERR_217, entryDn.getName(), entry );
             ResultCodeEnum rc = ResultCodeEnum.OBJECT_CLASS_VIOLATION;
             NamingException e = new LdapSchemaViolationException( msg, rc );
             e.setResolvedName( entryDn );
@@ -1213,7 +1213,7 @@
 
         if ( !Character.isDigit( entryDn.toNormName().charAt( 0 ) ) )
         {
-            throw new IllegalStateException( I18n.err( I18n.ERR_585, entryDn.toNormName() ) );
+            throw new IllegalStateException( I18n.err( I18n.ERR_218, entryDn.toNormName() ) );
         }
 
         ndnIdx.add( entryDn.toNormName(), id );
@@ -1225,7 +1225,7 @@
 
         if ( entryCsn == null )
         {
-            String msg = I18n.err( I18n.ERR_587, entryDn.getName(), entry );
+            String msg = I18n.err( I18n.ERR_219, entryDn.getName(), entry );
             throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
         
@@ -1236,7 +1236,7 @@
 
         if ( entryUuid == null )
         {
-            String msg = I18n.err( I18n.ERR_588, entryDn.getName(), entry );
+            String msg = I18n.err( I18n.ERR_220, entryDn.getName(), entry );
             throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
         
@@ -1415,7 +1415,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( I18n.err( I18n.ERR_589 ) );
+            throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
@@ -1478,7 +1478,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( I18n.err( I18n.ERR_589 ) );
+            throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
@@ -1572,7 +1572,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( I18n.err( I18n.ERR_589 ) );
+            throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
@@ -1648,7 +1648,7 @@
     {
         if ( mods instanceof ClonedServerEntry )
         {
-            throw new Exception( I18n.err( I18n.ERR_589 ) );
+            throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
         
         Long id = getEntryId( dn.toString() );
@@ -1674,7 +1674,7 @@
                     break;
 
                 default:
-                    throw new NamingException( I18n.err( I18n.ERR_590 ) );
+                    throw new NamingException( I18n.err( I18n.ERR_221 ) );
             }
         }
 
@@ -1711,7 +1711,7 @@
                     break;
 
                 default:
-                    throw new NamingException( I18n.err( I18n.ERR_590 ) );
+                    throw new NamingException( I18n.err( I18n.ERR_221 ) );
             }
         }
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java Sun Jan 24 14:38:06 2010
@@ -73,13 +73,13 @@
 
     public void beforeKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
     }
 
 
     public void afterKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
     }
 
 
@@ -88,7 +88,7 @@
         checkNotClosed( "beforeValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
         }
 
         wrapped.before( value );
@@ -101,7 +101,7 @@
         checkNotClosed( "afterValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
         }
 
         wrapped.after( value );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Sun Jan 24 14:38:06 2010
@@ -83,13 +83,13 @@
 
     public void beforeKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
     }
 
 
     public void afterKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
     }
 
 
@@ -98,7 +98,7 @@
         checkNotClosed( "beforeValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
         }
 
         browser = btree.browse( value );
@@ -111,7 +111,7 @@
     {
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
         }
 
         browser = btree.browse( value );

Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ObjectBAComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ObjectBAComparator.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ObjectBAComparator.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/ObjectBAComparator.java Sun Jan 24 14:38:06 2010
@@ -84,7 +84,7 @@
     public ObjectBAComparator( Comparator comparator )
     {
         if ( comparator == null ) {
-            throw new IllegalArgumentException( I18n.err( I18n.ERR_530 ) );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_518 ) );
         }
 
         _comparator = comparator;

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java Sun Jan 24 14:38:06 2010
@@ -211,7 +211,7 @@
         }
         catch ( IllegalAccessException iae )
         {
-            throw new IOException( I18n.err( I18n.ERR_598, encodableClass ) );
+            throw new IOException( I18n.err( I18n.ERR_601, encodableClass ) );
         }
         catch ( InstantiationException ie )
         {

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java Sun Jan 24 14:38:06 2010
@@ -86,7 +86,7 @@
     /**
      * TGS-REP encrypted part (includes application session key), encrypted with the TGS authenticator subkey (Section 5.4.2)
      */
-    public static final KeyUsage NUMBER9 = new KeyUsage( 9, I18n.err( I18n.ERR_611 ) );
+    public static final KeyUsage NUMBER9 = new KeyUsage( 9, I18n.err( I18n.ERR_610 ) );
 
     /**
      * AP-REQ Authenticator cksum, keyed with the application session key (Section 5.5.1)

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java Sun Jan 24 14:38:06 2010
@@ -159,7 +159,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java Sun Jan 24 14:38:06 2010
@@ -215,7 +215,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try
@@ -239,7 +239,7 @@
             log
                 .error( I18n.err( I18n.ERR_622, 1 + TLV.getNbBytes( authorizationDataEntryLength ) + authorizationDataEntryLength, 
                     buffer.capacity() ) );
-            throw new EncoderException( I18n.err( I18n.ERR_621 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java Sun Jan 24 14:38:06 2010
@@ -220,7 +220,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java Sun Jan 24 14:38:06 2010
@@ -265,7 +265,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java Sun Jan 24 14:38:06 2010
@@ -269,7 +269,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java Sun Jan 24 14:38:06 2010
@@ -243,7 +243,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java Sun Jan 24 14:38:06 2010
@@ -217,7 +217,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java Sun Jan 24 14:38:06 2010
@@ -208,7 +208,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java Sun Jan 24 14:38:06 2010
@@ -376,7 +376,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java?rev=902575&r1=902574&r2=902575&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java Sun Jan 24 14:38:06 2010
@@ -203,7 +203,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
         }
 
         try



Mime
View raw message