Partial fix for DIRSERVER-1728:core-jndi
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
index b6f639a..5a23f8b 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
@@ -60,7 +60,7 @@
 
         if ( service == null )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_477, env ) );
+            throw new ConfigurationException( I18n.err( I18n.ERR_06014_CANNOT_FIND_DIRECTORY_SERVICE, env ) );
         }
 
         if ( !service.isStarted() )
@@ -74,7 +74,7 @@
         }
         catch ( LdapInvalidDnException lide )
         {
-            throw new InvalidNameException( I18n.err( I18n.ERR_733, env ) );
+            throw new InvalidNameException( I18n.err( I18n.ERR_06016_PRINCIPAL_NOT_VALID, env ) );
         }
 
         ServerLdapContext ctx = null;
@@ -148,7 +148,7 @@
         }
         else
         {
-            throw new javax.naming.ConfigurationException( I18n.err( I18n.ERR_478, Context.SECURITY_CREDENTIALS ) );
+            throw new javax.naming.ConfigurationException( I18n.err( I18n.ERR_06015_CANNOT_CONVERT_TO_BYTES, Context.SECURITY_CREDENTIALS ) );
         }
 
         if ( credential != null )
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
index 92d9ba3..53702c0 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
@@ -91,7 +91,7 @@
 
     private void deliverNamingExceptionEvent( Exception e )
     {
-        LOG.error( I18n.err( I18n.ERR_118 ), e );
+        LOG.error( I18n.err( I18n.ERR_06000_ERROR_WHILE_DELIVERING_NOTIFICATIONS ), e );
         NamingExceptionEvent evt = null;
 
         if ( e instanceof NamingException )
@@ -100,7 +100,7 @@
         }
         else
         {
-            NamingException ne = new NamingException( I18n.err( I18n.ERR_119 ) );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_06001_EXCEPTION_DURING_EVENT_HANDLING ) );
             ne.setRootCause( e );
             evt = new NamingExceptionEvent( source, ne );
         }
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
index aa401be..79c65f5 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
@@ -94,7 +94,7 @@
         }
         catch ( LdapInvalidAttributeValueException liave )
         {
-            NamingException ne = new NamingException( I18n.err( I18n.ERR_479, className, liave.getLocalizedMessage() ) );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_06017_INSTANCE_DESERIALIZATION_FAILED, className, liave.getLocalizedMessage() ) );
             ne.setRootCause( liave );
             throw ne;
         }
@@ -106,7 +106,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( I18n.err( I18n.ERR_479, className, e.getLocalizedMessage() ) );
+            NamingException ne = new NamingException( I18n.err( I18n.ERR_06017_INSTANCE_DESERIALIZATION_FAILED, className, e.getLocalizedMessage() ) );
             ne.setRootCause( e );
             throw ne;
         }
@@ -132,7 +132,7 @@
         }
         catch ( Exception e )
         {
-            throw new LdapException( I18n.err( I18n.ERR_481, obj, e.getLocalizedMessage() ) );
+            throw new LdapException( I18n.err( I18n.ERR_06018_SERIALIZATION_FAILED, obj, e.getLocalizedMessage() ) );
         }
     }
 
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
index 67d87fd..6a3eaf7 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
@@ -75,7 +75,7 @@
         }
         else if ( !( authentication instanceof String ) )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_483, authentication.getClass(),
+            throw new ConfigurationException( I18n.err( I18n.ERR_06002_DONT_KNOW_HOW_TO_INTERPRET, authentication.getClass(),
                 Context.SECURITY_AUTHENTICATION ) );
         }
         else
@@ -116,7 +116,7 @@
 
         if ( !env.containsKey( Context.PROVIDER_URL ) )
         {
-            String msg = I18n.err( I18n.ERR_484, Context.PROVIDER_URL );
+            String msg = I18n.err( I18n.ERR_06003_EXPECTED_PROPERTY, Context.PROVIDER_URL );
             throw new ConfigurationException( msg );
         }
 
@@ -124,7 +124,7 @@
 
         if ( url == null )
         {
-            String msg = I18n.err( I18n.ERR_485, Context.PROVIDER_URL );
+            String msg = I18n.err( I18n.ERR_06004_PROPERTY_SET_TO_NULL, Context.PROVIDER_URL );
             throw new ConfigurationException( msg );
         }
 
@@ -140,7 +140,7 @@
             }
             catch ( LdapInvalidDnException lide )
             {
-                String msg = I18n.err( I18n.ERR_733, url );
+                String msg = I18n.err( I18n.ERR_06016_PRINCIPAL_NOT_VALID, url );
                 throw new ConfigurationException( msg );
             }
         }
@@ -163,7 +163,7 @@
         }
         else if ( !( authentication instanceof String ) )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_483, authentication.getClass(),
+            throw new ConfigurationException( I18n.err( I18n.ERR_06002_DONT_KNOW_HOW_TO_INTERPRET, authentication.getClass(),
                 Context.SECURITY_AUTHENTICATION ) );
         }
         else
@@ -189,7 +189,7 @@
 
         if ( principal == null && props.level == AuthenticationLevel.SIMPLE )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_487, Context.SECURITY_PRINCIPAL ) );
+            throw new ConfigurationException( I18n.err( I18n.ERR_06005_CANNOT_BE_NULL, Context.SECURITY_PRINCIPAL ) );
         }
         else if ( principal == null && props.level == AuthenticationLevel.NONE )
         {
@@ -197,7 +197,7 @@
         }
         else if ( !( principal instanceof String ) )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_483, principal.getClass(), Context.SECURITY_PRINCIPAL ) );
+            throw new ConfigurationException( I18n.err( I18n.ERR_06002_DONT_KNOW_HOW_TO_INTERPRET, principal.getClass(), Context.SECURITY_PRINCIPAL ) );
         }
         else if ( ( ( String ) principal ).trim().equals( "" ) )
         {
@@ -211,7 +211,7 @@
             }
             catch ( LdapInvalidDnException lide )
             {
-                String msg = I18n.err( I18n.ERR_733, principal );
+                String msg = I18n.err( I18n.ERR_06016_PRINCIPAL_NOT_VALID, principal );
                 throw new ConfigurationException( msg );
             }
 
@@ -226,7 +226,7 @@
             }
             else
             {
-                throw new ConfigurationException( I18n.err( I18n.ERR_483, obj.getClass(), SASL_AUTHID ) );
+                throw new ConfigurationException( I18n.err( I18n.ERR_06002_DONT_KNOW_HOW_TO_INTERPRET, obj.getClass(), SASL_AUTHID ) );
             }
             props.saslAuthId = ( String ) principal;
         }
@@ -237,7 +237,7 @@
 
         if ( props.level == AuthenticationLevel.SIMPLE && credobj == null )
         {
-            throw new ConfigurationException( I18n.err( I18n.ERR_489 ) );
+            throw new ConfigurationException( I18n.err( I18n.ERR_06006_CANT_SPECIFY_SIMPLE_AUTHENTICATION ) );
         }
         else if ( credobj != null )
         {
@@ -251,7 +251,7 @@
             }
             else
             {
-                throw new ConfigurationException( I18n.err( I18n.ERR_483, credobj.getClass(),
+                throw new ConfigurationException( I18n.err( I18n.ERR_06002_DONT_KNOW_HOW_TO_INTERPRET, credobj.getClass(),
                     Context.SECURITY_CREDENTIALS ) );
             }
         }
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
index 5bbfd67..4175c22 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
@@ -210,7 +210,7 @@
 
         if ( !operationManager.hasEntry( hasEntryContext ) )
         {
-            throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
+            throw new NameNotFoundException( I18n.err( I18n.ERR_06007_ELEMENT_DOES_NOT_EXIST, dn ) );
         }
 
         schemaManager = service.getSchemaManager();
@@ -245,7 +245,7 @@
 
         if ( !operationManager.hasEntry( hasEntryContext ) )
         {
-            throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
+            throw new NameNotFoundException( I18n.err( I18n.ERR_06007_ELEMENT_DOES_NOT_EXIST, dn ) );
         }
 
         schemaManager = service.getSchemaManager();
@@ -269,7 +269,7 @@
 
         if ( !operationManager.hasEntry( hasEntryContext ) )
         {
-            throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
+            throw new NameNotFoundException( I18n.err( I18n.ERR_06007_ELEMENT_DOES_NOT_EXIST, dn ) );
         }
 
         schemaManager = service.getSchemaManager();
@@ -915,7 +915,7 @@
         }
         catch ( LdapException le )
         {
-            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
+            throw new SchemaViolationException( I18n.err( I18n.ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER, name ) );
         }
 
         // Now add the CN attribute, which is mandatory
@@ -930,13 +930,13 @@
             else
             {
                 // No CN in the rdn, this is an error
-                throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
+                throw new SchemaViolationException( I18n.err( I18n.ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER, name ) );
             }
         }
         else
         {
             // No CN in the rdn, this is an error
-            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
+            throw new SchemaViolationException( I18n.err( I18n.ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER, name ) );
         }
 
         /*
@@ -988,7 +988,7 @@
 
         if ( target.size() == 0 )
         {
-            throw new NoPermissionException( I18n.err( I18n.ERR_492 ) );
+            throw new NoPermissionException( I18n.err( I18n.ERR_06009_CANT_DELETE_ROOT_DSE ) );
         }
 
         try
@@ -1050,7 +1050,7 @@
         }
         catch ( LdapInvalidAttributeTypeException liate )
         {
-            throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+            throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
         }
 
         if ( outServerEntry != null )
@@ -1082,13 +1082,13 @@
         // Check for Referenceable
         else if ( obj instanceof Referenceable )
         {
-            throw new NamingException( I18n.err( I18n.ERR_493 ) );
+            throw new NamingException( I18n.err( I18n.ERR_06010_CANT_STORE_REFERENCEABLE ) );
         }
         // Store different formats
         else if ( obj instanceof Reference )
         {
             // Store as ref and add outAttrs
-            throw new NamingException( I18n.err( I18n.ERR_494 ) );
+            throw new NamingException( I18n.err( I18n.ERR_06011_CANT_STORE_REFERENCE ) );
         }
         else if ( obj instanceof Serializable )
         {
@@ -1101,7 +1101,7 @@
             }
             catch ( LdapException le )
             {
-                throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+                throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
             }
 
             // Get target and inject all rdn attributes into entry
@@ -1114,7 +1114,7 @@
             }
             catch ( LdapException le )
             {
-                throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+                throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
             }
 
             try
@@ -1138,7 +1138,7 @@
             }
             catch ( LdapInvalidAttributeTypeException liate )
             {
-                throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+                throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
             }
 
             injectRdnAttributeValues( target, serverEntry );
@@ -1154,7 +1154,7 @@
         }
         else
         {
-            throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+            throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
         }
     }
 
@@ -1361,7 +1361,7 @@
         }
         catch ( Exception e )
         {
-            String msg = I18n.err( I18n.ERR_497, target );
+            String msg = I18n.err( I18n.ERR_06013_CANNOT_CREATE_OBJECT_WITH_FACTORY, target );
             NamingException ne = new NamingException( msg );
             ne.setRootCause( e );
             throw ne;
diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
index 9303090..be38c71 100644
--- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
+++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
@@ -333,7 +333,7 @@
     {
         if ( ( null == obj ) && ( null == attrs ) )
         {
-            throw new NamingException( I18n.err( I18n.ERR_499 ) );
+            throw new NamingException( I18n.err( I18n.ERR_06019_ABJ_AND_ATTRS_ARGS_ARE_NULL ) );
         }
 
         // A null attrs defaults this to the Context.bind() operation
@@ -421,14 +421,14 @@
         // Check for Referenceable
         if ( obj instanceof Referenceable )
         {
-            throw new NamingException( I18n.err( I18n.ERR_493 ) );
+            throw new NamingException( I18n.err( I18n.ERR_06010_CANT_STORE_REFERENCEABLE ) );
         }
 
         // Store different formats
         if ( obj instanceof Reference )
         {
             // Store as ref and add outAttrs
-            throw new NamingException( I18n.err( I18n.ERR_494 ) );
+            throw new NamingException( I18n.err( I18n.ERR_06011_CANT_STORE_REFERENCE ) );
         }
         else if ( obj instanceof Serializable )
         {
@@ -505,7 +505,7 @@
         }
         else
         {
-            throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
+            throw new NamingException( I18n.err( I18n.ERR_06012_CANT_BIND, obj ) );
         }
     }
 
@@ -854,7 +854,7 @@
         }
         catch ( ParseException pe )
         {
-            InvalidSearchFilterException isfe = new InvalidSearchFilterException( I18n.err( I18n.ERR_500, filter ) );
+            InvalidSearchFilterException isfe = new InvalidSearchFilterException( I18n.err( I18n.ERR_06020_PARSE_EXCEPTION_ENCOUNTERED, filter ) );
             isfe.setRootCause( pe );
             throw isfe;
         }
@@ -970,7 +970,7 @@
         }
         catch ( Exception e )
         {
-            NamingException e2 = new NamingException( I18n.err( I18n.ERR_501, filterStr ) );
+            NamingException e2 = new NamingException( I18n.err( I18n.ERR_06021_COULD_NOT_PARSE_FILTER, filterStr ) );
             e2.setRootCause( e );
             throw e2;
         }
diff --git a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
index 52ea0d0..04857a5 100644
--- a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
@@ -222,6 +222,28 @@
     // apacheds-core-integ errors                    5000 - 5999
 
     // apacheds-core-jndi errors                     6000 - 6999
+    ERR_06000_ERROR_WHILE_DELIVERING_NOTIFICATIONS("ERR_06000_ERROR_WHILE_DELIVERING_NOTIFICATIONS"),
+    ERR_06001_EXCEPTION_DURING_EVENT_HANDLING("ERR_06001_EXCEPTION_DURING_EVENT_HANDLING"),
+    ERR_06002_DONT_KNOW_HOW_TO_INTERPRET("ERR_06002_DONT_KNOW_HOW_TO_INTERPRET"),
+    ERR_06003_EXPECTED_PROPERTY("ERR_06003_EXPECTED_PROPERTY"),
+    ERR_06004_PROPERTY_SET_TO_NULL("ERR_06004_PROPERTY_SET_TO_NULL"),
+    ERR_06005_CANNOT_BE_NULL("ERR_06005_CANNOT_BE_NULL"),
+    ERR_06006_CANT_SPECIFY_SIMPLE_AUTHENTICATION("ERR_06006_CANT_SPECIFY_SIMPLE_AUTHENTICATION"),
+    ERR_06007_ELEMENT_DOES_NOT_EXIST("ERR_06007_ELEMENT_DOES_NOT_EXIST"),
+    ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER("ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER="),
+    ERR_06009_CANT_DELETE_ROOT_DSE("ERR_06009_CANT_DELETE_ROOT_DSE"),
+    ERR_06010_CANT_STORE_REFERENCEABLE("ERR_06010_CANT_STORE_REFERENCEABLE"),
+    ERR_06011_CANT_STORE_REFERENCE("ERR_06011_CANT_STORE_REFERENCE"),
+    ERR_06012_CANT_BIND("ERR_06012_CANT_BIND"),
+    ERR_06013_CANNOT_CREATE_OBJECT_WITH_FACTORY("ERR_06013_CANNOT_CREATE_OBJECT_WITH_FACTORY"),
+    ERR_06014_CANNOT_FIND_DIRECTORY_SERVICE("ERR_06014_CANNOT_FIND_DIRECTORY_SERVICE"),
+    ERR_06015_CANNOT_CONVERT_TO_BYTES("ERR_06015_CANNOT_CONVERT_TO_BYTES"),
+    ERR_06016_PRINCIPAL_NOT_VALID("ERR_06016_PRINCIPAL_NOT_VALID"),
+    ERR_06017_INSTANCE_DESERIALIZATION_FAILED("ERR_06017_INSTANCE_DESERIALIZATION_FAILED"),
+    ERR_06018_SERIALIZATION_FAILED("ERR_06018_SERIALIZATION_FAILED"),
+    ERR_06019_ABJ_AND_ATTRS_ARGS_ARE_NULL("ERR_06019_ABJ_AND_ATTRS_ARGS_ARE_NULL"),
+    ERR_06020_PARSE_EXCEPTION_ENCOUNTERED("ERR_06020_PARSE_EXCEPTION_ENCOUNTERED"),
+    ERR_06021_COULD_NOT_PARSE_FILTER("ERR_06021_COULD_NOT_PARSE_FILTER"),
 
     // apacheds-core-shared errors                   7000 - 7999
     ERR_07000_CANNOT_DESERIALIZE_ENTRY("ERR_07000_CANNOT_DESERIALIZE_ENTRY"),
@@ -386,8 +408,6 @@
     ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY("ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY"),
     ERR_115("ERR_115"),
     ERR_116("ERR_116"),
-    ERR_118("ERR_118"),
-    ERR_119("ERR_119"),
     ERR_122("ERR_122"),
     // ERR_123( "ERR_123" ),
     ERR_124("ERR_124"),
@@ -583,31 +603,10 @@
     ERR_474("ERR_474"),
     ERR_475("ERR_475"),
     ERR_476("ERR_476"),
-    ERR_477("ERR_477"),
-    ERR_478("ERR_478"),
-    ERR_479("ERR_479"),
     ERR_480("ERR_480"),
-    ERR_481("ERR_481"),
     ERR_482("ERR_482"),
-    ERR_483("ERR_483"),
-    ERR_484("ERR_484"),
-    ERR_485("ERR_485"),
-    // ERR_486( "ERR_486" ),
-    ERR_487("ERR_487"),
-    // ERR_488( "ERR_488" ),
-    ERR_489("ERR_489"),
-    ERR_490("ERR_490"),
-    ERR_491("ERR_491"),
-    ERR_492("ERR_492"),
-    ERR_493("ERR_493"),
-    ERR_494("ERR_494"),
-    ERR_495("ERR_495"),
     // ERR_496( "ERR_496" ),
-    ERR_497("ERR_497"),
     ERR_498("ERR_498"),
-    ERR_499("ERR_499"),
-    ERR_500("ERR_500"),
-    ERR_501("ERR_501"),
     // ERR_502( "ERR_502" ),
     ERR_503("ERR_503"),
     ERR_504("ERR_504"),
@@ -838,7 +837,6 @@
     ERR_730("ERR_730"),
     ERR_731("ERR_731"),
     ERR_732("ERR_732"),
-    ERR_733("ERR_733"),
     ERR_734_CANNOT_ENCODE_KRBERROR("ERR_734_CANNOT_ENCODE_KRBERROR"),
     ERR_735_CANNOT_ENCODE_KRBSAFEBODY("ERR_735_CANNOT_ENCODE_KRBSAFEBODY"),
     ERR_736_CANNOT_ENCODE_KRBSAFE("ERR_736_CANNOT_ENCODE_KRBSAFE"),
diff --git a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
index ee0a3ac..4e775f6 100644
--- a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
@@ -183,7 +183,6 @@
 ERR_02126_SYNTAX_PARENT_DN_MUST_HAVE_3_NC=The parent dn of a syntax should be at most 3 name components in length.
 ERR_02127_SYNTAX_PARENT_ENTRY_NOT_ORGANIZATIONAL_UNIT=The parent entry of a syntax should be an organizationalUnit.
 
-
 # apacheds-core-avl errors                      3000 - 3999
 ERR_03000_NEGATIVE_AVL_NODE_COUNT=The number of node for the deserialized AVL is negative
 ERR_03001_NEGATIVE_AVL_LENGTH=The AVL tree has a negative length
@@ -211,6 +210,29 @@
 # apacheds-core-integ errors                    5000 - 5999
 
 # apacheds-core-jndi errors                     6000 - 6999
+ERR_06000_ERROR_WHILE_DELIVERING_NOTIFICATIONS=Error encountered while delivering notifications.
+ERR_06001_EXCEPTION_DURING_EVENT_HANDLING=Encountered exception during event handling.
+ERR_06002_DONT_KNOW_HOW_TO_INTERPRET=Don''t know how to interpret {0} objects for environment property {1}
+ERR_06003_EXPECTED_PROPERTY=Expected property {0} but could not find it in env!
+ERR_06004_PROPERTY_SET_TO_NULL=Expected value for property {0} but it was set to null in env!
+ERR_06005_CANNOT_BE_NULL={0} cannot be null.
+ERR_06006_CANT_SPECIFY_SIMPLE_AUTHENTICATION=cannot specify simple authentication with supplying credentials
+ERR_06007_ELEMENT_DOES_NOT_EXIST={0} does not exist
+ERR_06008_CN_ATTRIBUTE_MISSING_FOR_JAVA_CONTAINER={0} does not contains the mandatory ''cn'' attribute for JavaContainer ObjectClass!
+ERR_06009_CANT_DELETE_ROOT_DSE=can''t delete the rootDSE
+ERR_06010_CANT_STORE_REFERENCEABLE=Do not know how to store Referenceables yet!
+ERR_06011_CANT_STORE_REFERENCE=Do not know how to store References yet!
+ERR_06012_CANT_BIND=Can''t find a way to bind: {0}
+ERR_06013_CANNOT_CREATE_OBJECT_WITH_FACTORY=Failed to create an object for {0} using object factories within the context''s environment.
+ERR_06014_CANNOT_FIND_DIRECTORY_SERVICE=Cannot find directory service in environment: {0}
+ERR_06015_CANNOT_CONVERT_TO_BYTES=Can''t convert ''{0}'' to byte[].
+ERR_06016_PRINCIPAL_NOT_VALID=Principal is not a valid Name : {0}
+ERR_06017_INSTANCE_DESERIALIZATION_FAILED=De-serialization of ''{0}'' instance failed\:\n{1}
+ERR_06018_SERIALIZATION_FAILED=Serialization of ''{0}'' failed\:\n{1}
+ERR_06019_ABJ_AND_ATTRS_ARGS_ARE_NULL=Both obj and attrs args are null. At least one of these parameters must not be null.
+ERR_06020_PARSE_EXCEPTION_ENCOUNTERED=Encountered parse exception while parsing the filter: ''{0}''
+ERR_06021_COULD_NOT_PARSE_FILTER=could not parse filter: {0}
+
 
 # apacheds-core-shared errors                   7000 - 7999
 ERR_07000_CANNOT_DESERIALIZE_ENTRY=Cannot deserialize the entry : {0}
@@ -379,8 +401,6 @@
 ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY=Could not delete file or directory {0}
 ERR_115=Failed to delete the working directory.
 ERR_116=Failed to delete\: 
-ERR_118=Error encountered while delivering notifications.
-ERR_119=Encountered exception during event handling.
 ERR_122=Error encoding EncryptionKey.
 # ERR_123=
 ERR_124=Failed to close an index.
@@ -574,31 +594,10 @@
 ERR_474=expected byte[] to normalize
 ERR_475=can''t move the root DSE
 ERR_476=Unidentified change type value: {0}
-ERR_477=Cannot find directory service in environment: {0}
-ERR_478=Can''t convert ''{0}'' to byte[].
-ERR_479=De-serialization of ''{0}'' instance failed\:\n{1}
 ERR_480=object deserialization stream close() failure
-ERR_481=Serialization of ''{0}'' failed\:\n{1}
 ERR_482=object serialization stream close() failure
-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=
-ERR_487={0} cannot be null.
-# 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!
-ERR_492=can''t delete the rootDSE
-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=
-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=
 ERR_503=Config partition cannot be null
 ERR_504=the config partition is not initialized
@@ -829,7 +828,6 @@
 ERR_730=Unrecognized mode.
 ERR_731=Unrecognized FilterDialog command: {0}
 ERR_732=Cannot process a Request while binding
-ERR_733=Principal is not a valid Name : {0}
 ERR_734_CANNOT_ENCODE_KRBERROR=Cannot encode the KrbError object, the PDU size is {0} when only {1} bytes has been allocated
 ERR_735_CANNOT_ENCODE_KRBSAFEBODY=Cannot encode the KrbSafeBody object, the PDU size is {0} when only {1} bytes has been allocated
 ERR_736_CANNOT_ENCODE_KRBSAFE=Cannot encode the KrbSafe object, the PDU size is {0} when only {1} bytes has been allocated