directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r923519 [2/2] - in /directory/apacheds/trunk: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ core-api/src/main/java/org/apache/director...
Date Tue, 16 Mar 2010 00:20:00 GMT
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -38,8 +38,8 @@ import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -244,7 +244,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).destroySubcontext( dn );
             fail( "should not be able to delete a attributeType in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -370,7 +370,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename a attributeType in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -447,7 +447,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a attributeType up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -474,7 +474,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a attributeType into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -522,7 +522,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a attributeType in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -550,7 +550,7 @@ public class MetaAttributeTypeHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a attributeType in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -40,8 +40,8 @@ import javax.naming.directory.Modificati
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -354,7 +354,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).destroySubcontext( cDn );
             fail( "should not be able to delete a comparator in use" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -464,7 +464,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename a comparator in use" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -550,7 +550,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a comparator in use" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -580,7 +580,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a comparator in use" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -613,7 +613,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a comparator up to ou=schema" );
         }
-        catch ( LdapInvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -640,7 +640,7 @@ public class MetaComparatorHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a comparator up to normalizers container" );
         }
-        catch ( LdapInvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -37,7 +37,7 @@ import javax.naming.directory.Modificati
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -402,7 +402,7 @@ public class MetaMatchingRuleHandlerIT e
 //            super.schemaRoot.destroySubcontext( dn );
 //            fail( "should not be able to delete a syntax in use" );
 //        }
-//        catch( LdapOperationNotSupportedException e ) 
+//        catch( LdapUnwillingToPerformException e ) 
 //        {
 //            assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
 //        }
@@ -428,7 +428,7 @@ public class MetaMatchingRuleHandlerIT e
 //            super.schemaRoot.rename( dn, newdn );
 //            fail( "should not be able to move a syntax in use" );
 //        }
-//        catch( LdapOperationNotSupportedException e ) 
+//        catch( LdapUnwillingToPerformException e ) 
 //        {
 //            assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
 //        }
@@ -454,7 +454,7 @@ public class MetaMatchingRuleHandlerIT e
 //            super.schemaRoot.rename( dn, newdn );
 //            fail( "should not be able to move a syntax in use" );
 //        }
-//        catch( LdapOperationNotSupportedException e ) 
+//        catch( LdapUnwillingToPerformException e ) 
 //        {
 //            assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
 //        }
@@ -488,7 +488,7 @@ public class MetaMatchingRuleHandlerIT e
 //            super.schemaRoot.rename( dn, newdn );
 //            fail( "should not be able to rename a syntax in use" );
 //        }
-//        catch( LdapOperationNotSupportedException e ) 
+//        catch( LdapUnwillingToPerformException e ) 
 //        {
 //            assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
 //        }
@@ -520,7 +520,7 @@ public class MetaMatchingRuleHandlerIT e
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a matchingRule up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -547,7 +547,7 @@ public class MetaMatchingRuleHandlerIT e
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a matchingRule into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -40,8 +40,8 @@ import javax.naming.directory.Modificati
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -451,7 +451,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).destroySubcontext( nDn );
             fail( "should not be able to delete a Normalizer in use" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -479,7 +479,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a normalizer in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -509,7 +509,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a normalizer in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -538,7 +538,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename a normalizer in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -572,7 +572,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a normalizer up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -599,7 +599,7 @@ public class MetaNormalizerHandlerIT ext
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a normalizer into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -36,8 +36,8 @@ import javax.naming.directory.DirContext
 import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -391,7 +391,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).destroySubcontext( dn );
             fail( "should not be able to delete a objectClass in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -419,7 +419,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a objectClass in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -447,7 +447,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move an objectClass in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -474,7 +474,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename an objectClass in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -504,7 +504,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a objectClass up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -531,7 +531,7 @@ public class MetaObjectClassHandlerIT ex
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a objectClass into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -39,8 +39,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -203,7 +203,7 @@ public class MetaSchemaHandlerIT extends
             IntegrationUtils.enableSchema( service, "wrong" );
             fail();
         }
-        catch ( LdapNameNotFoundException lnnfe )
+        catch ( LdapNoSuchObjectException lnnfe )
         {
             // Expected
             assertTrue( true );
@@ -313,7 +313,7 @@ public class MetaSchemaHandlerIT extends
             IntegrationUtils.disableSchema( service, "wrong" );
             fail();
         }
-        catch ( LdapNameNotFoundException lnnfe )
+        catch ( LdapNoSuchObjectException lnnfe )
         {
             // Expected
             assertTrue( true );
@@ -461,7 +461,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.createSubcontext( "cn=dummy", dummySchema );
             fail();
         }
-        catch ( LdapOperationNotSupportedException lonse )
+        catch ( LdapUnwillingToPerformException lonse )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, lonse.getResultCode() );
         }
@@ -495,7 +495,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.createSubcontext( "cn=dummy", dummySchema );
             fail();
         }
-        catch ( LdapOperationNotSupportedException lonse )
+        catch ( LdapUnwillingToPerformException lonse )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, lonse.getResultCode() );
         }
@@ -606,7 +606,7 @@ public class MetaSchemaHandlerIT extends
         {
             schemaRoot.createSubcontext( "cn=dummy", dummySchema );
         } 
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertTrue( e.getResultCode().equals( ResultCodeEnum.UNWILLING_TO_PERFORM ) );
         }
@@ -670,7 +670,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.createSubcontext( "cn=dummy", dummySchema );
             fail( "should not be able to add enabled schema with deps on disabled schemas" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertTrue( e.getResultCode().equals( ResultCodeEnum.UNWILLING_TO_PERFORM ) );
         }
@@ -742,7 +742,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.destroySubcontext( "cn=dummy" );
             fail( "should not be able to delete a schema with dependents" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertTrue( e.getResultCode().equals( ResultCodeEnum.UNWILLING_TO_PERFORM ) );
         }
@@ -774,7 +774,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.createSubcontext( "cn=dummy", dummySchema );
             fail( "should not be able to add enabled schema with deps on missing schemas" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertTrue( e.getResultCode().equals( ResultCodeEnum.UNWILLING_TO_PERFORM ) );
         }
@@ -840,7 +840,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.modifyAttributes( "cn=nis", mods );
             fail( "attempt to disable schema with enabled dependents should fail" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertTrue( e.getResultCode().equals( ResultCodeEnum.UNWILLING_TO_PERFORM ) );
         }
@@ -887,7 +887,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.lookup( "cn=samba" );
             fail( "the samba schema should not be present after a rename to foo" );
         }
-        catch( LdapNameNotFoundException e )
+        catch( LdapNoSuchObjectException e )
         {
         }
     }
@@ -910,7 +910,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.rename( "cn=nis", "cn=foo" );
             fail( "should not be able to rename nis which has samba as it's dependent" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -923,7 +923,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.lookup( "cn=foo" );
             fail( "the foo schema should not be present after rejecting the rename" );
         }
-        catch( LdapNameNotFoundException e )
+        catch( LdapNoSuchObjectException e )
         {
         }
     }
@@ -957,7 +957,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.lookup( "cn=samba" );
             fail( "the samba schema should not be present after a rename to foo" );
         }
-        catch( LdapNameNotFoundException e )
+        catch( LdapNoSuchObjectException e )
         {
         }
     }
@@ -987,7 +987,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.modifyAttributes( "cn=nis", mods );
             fail( "Should not be able to add bogus dependency to schema" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1017,7 +1017,7 @@ public class MetaSchemaHandlerIT extends
             schemaRoot.modifyAttributes( "cn=nis", mods );
             fail( "Should not be able to add disabled dependency to schema" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -39,8 +39,8 @@ import javax.naming.directory.DirContext
 import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -449,7 +449,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).destroySubcontext( scDn );
             fail( "should not be able to delete a syntaxChecker in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -477,7 +477,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntaxChecker in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -507,7 +507,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntaxChecker in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -536,7 +536,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename a syntaxChecker in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -570,7 +570,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a syntaxChecker up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -597,7 +597,7 @@ public class MetaSyntaxCheckerHandlerIT 
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntaxChecker into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Tue Mar 16 00:19:58 2010
@@ -43,8 +43,8 @@ import javax.naming.directory.SearchCont
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -372,7 +372,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).destroySubcontext( dn );
             fail( "should not be able to delete a syntax in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -400,7 +400,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntax in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -428,7 +428,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntax in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -474,7 +474,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to rename a syntax in use" );
         }
-        catch( LdapOperationNotSupportedException e ) 
+        catch( LdapUnwillingToPerformException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
@@ -506,7 +506,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).rename( dn, top );
             fail( "should not be able to move a syntax up to ou=schema" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }
@@ -533,7 +533,7 @@ public class MetaSyntaxHandlerIT extends
             getSchemaContext( service ).rename( dn, newdn );
             fail( "should not be able to move a syntax into comparators container" );
         }
-        catch( LdapInvalidNameException e ) 
+        catch( LdapInvalidDnException e ) 
         {
             assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Tue Mar 16 00:19:58 2010
@@ -60,8 +60,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapEntryAlreadyExistsException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -148,7 +148,7 @@ public class SubschemaSubentryIT extends
             getRootContext( service ).destroySubcontext( getSubschemaSubentryDN() );
             fail( "You are not allowed to delete the global schema subentry" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -168,7 +168,7 @@ public class SubschemaSubentryIT extends
             getRootContext( service ).createSubcontext( getSubschemaSubentryDN(), getSubschemaSubentryAttributes() );
             fail( "You are not allowed to add the global schema subentry which exists by default" );
         }
-        catch( LdapNameAlreadyBoundException e )
+        catch( LdapEntryAlreadyExistsException e )
         {
             assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
         }
@@ -188,7 +188,7 @@ public class SubschemaSubentryIT extends
             getRootContext( service ).rename( getSubschemaSubentryDN(), "cn=schema,ou=system" );
             fail( "You are not allowed to rename the global schema subentry which is fixed" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -208,7 +208,7 @@ public class SubschemaSubentryIT extends
             getRootContext( service ).rename( getSubschemaSubentryDN(), "cn=blah,ou=schema" );
             fail( "You are not allowed to move the global schema subentry which is fixed" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -218,7 +218,7 @@ public class SubschemaSubentryIT extends
             getRootContext( service ).rename( getSubschemaSubentryDN(), "cn=schema,ou=schema" );
             fail( "You are not allowed to move the global schema subentry which is fixed" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -354,7 +354,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "syntaxCheckers" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -518,7 +518,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "comparators" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -673,7 +673,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "normalizers" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -810,7 +810,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "ldapSyntaxes" );
             fail( "should not be able to add syntaxes without their syntaxCheckers" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -865,7 +865,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "ldapSyntaxes" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -981,7 +981,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "matchingRules" );
             fail( "Cannot add matchingRule with bogus non-existant syntax" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1075,7 +1075,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "matchingRules" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1196,7 +1196,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "Cannot add attributeType with bogus non-existant syntax" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1219,7 +1219,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "Cannot add attributeType with bogus non-existant syntax" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1242,7 +1242,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "Cannot add attributeType with bogus non-existant equality MatchingRule" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1265,7 +1265,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "Cannot add attributeType with bogus non-existant ordering MatchingRule" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1288,7 +1288,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "Cannot add attributeType with bogus non-existant substrings MatchingRule" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1364,7 +1364,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "attributeTypes" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1611,7 +1611,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "objectClasses" );
             fail( "Cannot add objectClass with bogus non-existant super" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1712,7 +1712,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "objectClasses" );
             fail( "Cannot add objectClass with bogus non-existant attributeTypes" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1737,7 +1737,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.ADD_ATTRIBUTE, descriptions, "objectClasses" );
             fail( "Cannot add objectClass with bogus non-existant attributeTypes" );
         }
-        catch( LdapOperationNotSupportedException e )
+        catch( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }
@@ -1821,7 +1821,7 @@ public class SubschemaSubentryIT extends
             modify( DirContext.REPLACE_ATTRIBUTE, descriptions, "objectClasses" );
             fail( "modify REPLACE operations should not be allowed" );
         }
-        catch ( LdapOperationNotSupportedException e )
+        catch ( LdapUnwillingToPerformException e )
         {
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Tue Mar 16 00:19:58 2010
@@ -57,7 +57,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -444,7 +444,7 @@ public class AuthenticationInterceptor e
             // This is a case where the Bind request contains a DN, but no password.
             // We don't check the DN, we just return a UnwillingToPerform error
             // Cf RFC 4513, chap. 5.1.2
-            throw new LdapOperationNotSupportedException( "Cannot Bind for DN " + opContext.getDn().getName(), ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapUnwillingToPerformException( "Cannot Bind for DN " + opContext.getDn().getName(), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
 
         Collection<Authenticator> authenticators = getAuthenticators( level.getName() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Tue Mar 16 00:19:58 2010
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -112,7 +112,7 @@ public class CollectiveAttributesSchemaC
             {
                 if ( !schemaManager.getAttributeTypeRegistry().contains( attr.getUpId() ) )
                 {
-                    throw new LdapInvalidAttributeIdentifierException();
+                    throw new LdapInvalidAttributeTypeException();
                 }
                 else
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Tue Mar 16 00:19:58 2010
@@ -56,10 +56,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
-import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.exception.LdapEntryAlreadyExistsException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -139,13 +139,13 @@ public class ExceptionInterceptor extend
         
         if ( subschemSubentryDn.getNormName().equals( name.getNormName() ) )
         {
-            throw new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_249 ) );
+            throw new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_249 ) );
         }
         
         // check if the entry already exists
         if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), name ) ) )
         {
-            LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_250, name.getName() ) );
+            LdapEntryAlreadyExistsException ne = new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_250, name.getName() ) );
             ne.setResolvedName( new DN( name.getName() ) );
             throw ne;
         }
@@ -183,7 +183,7 @@ public class ExceptionInterceptor extend
             }
             catch ( Exception e )
             {
-                LdapNameNotFoundException e2 = new LdapNameNotFoundException( I18n.err( I18n.ERR_251, 
+                LdapNoSuchObjectException e2 = new LdapNoSuchObjectException( I18n.err( I18n.ERR_251, 
                     parentDn.getName() ) );
                 e2.setResolvedName( new DN( nexus.getMatchedName( 
                     new GetMatchedNameOperationContext( opContext.getSession(), parentDn ) ).getName() ) );
@@ -223,7 +223,7 @@ public class ExceptionInterceptor extend
         
         if ( name.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_253, subschemSubentryDn ),
+            throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_253, subschemSubentryDn ),
                 ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
@@ -367,7 +367,7 @@ public class ExceptionInterceptor extend
         
         if ( dn.equals( subschemSubentryDn ) )
         {
-            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_255, subschemSubentryDn,
+            throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_255, subschemSubentryDn,
                 subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
@@ -376,8 +376,8 @@ public class ExceptionInterceptor extend
         {
             // This is a nonsense : we can't rename an entry which does not exist
             // on the server
-            LdapNameNotFoundException ldnfe;
-            ldnfe = new LdapNameNotFoundException( I18n.err( I18n.ERR_256, dn.getName() ) );
+            LdapNoSuchObjectException ldnfe;
+            ldnfe = new LdapNoSuchObjectException( I18n.err( I18n.ERR_256, dn.getName() ) );
             ldnfe.setResolvedName( new DN( dn.getName() ) );
             throw ldnfe;
         }
@@ -387,8 +387,8 @@ public class ExceptionInterceptor extend
         
         if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), newDn ) ) )
         {
-            LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, newDn.getName() ) );
+            LdapEntryAlreadyExistsException e;
+            e = new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_257, newDn.getName() ) );
             e.setResolvedName( new DN( newDn.getName() ) );
             throw e;
         }
@@ -417,7 +417,7 @@ public class ExceptionInterceptor extend
         
         if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_258, subschemSubentryDn,
+            throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_258, subschemSubentryDn,
                 subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
@@ -441,8 +441,8 @@ public class ExceptionInterceptor extend
             DN upTarget = ( DN ) newParentName.clone();
             upTarget.add( upRdn );
 
-            LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
+            LdapEntryAlreadyExistsException e;
+            e = new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
             e.setResolvedName( new DN( upTarget.getName() ) );
             throw e;
         }
@@ -471,7 +471,7 @@ public class ExceptionInterceptor extend
 
         if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
         {
-            throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_258, subschemSubentryDn,
+            throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_258, subschemSubentryDn,
                 subschemSubentryDn ), ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
         
@@ -493,8 +493,8 @@ public class ExceptionInterceptor extend
             DN upTarget = ( DN ) parent.clone();
             upTarget.add( opContext.getNewRdn() );
 
-            LdapNameAlreadyBoundException e;
-            e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
+            LdapEntryAlreadyExistsException e;
+            e = new LdapEntryAlreadyExistsException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
             e.setResolvedName( new DN( upTarget.getName() ) );
             throw e;
         }
@@ -544,7 +544,7 @@ public class ExceptionInterceptor extend
 
 
     /**
-     * Asserts that an entry is present and as a side effect if it is not, creates a LdapNameNotFoundException, which is
+     * Asserts that an entry is present and as a side effect if it is not, creates a LdapNoSuchObjectException, which is
      * used to set the before exception on the invocation - eventually the exception is thrown.
      *
      * @param msg        the message to prefix to the distinguished name for explanation
@@ -562,15 +562,15 @@ public class ExceptionInterceptor extend
         
         if ( ! opContext.hasEntry( dn, ByPassConstants.HAS_ENTRY_BYPASS ) )
         {
-            LdapNameNotFoundException e;
+            LdapNoSuchObjectException e;
 
             if ( msg != null )
             {
-                e = new LdapNameNotFoundException( msg + dn.getName() );
+                e = new LdapNoSuchObjectException( msg + dn.getName() );
             }
             else
             {
-                e = new LdapNameNotFoundException( dn.getName() );
+                e = new LdapNoSuchObjectException( dn.getName() );
             }
 
             e.setResolvedName( 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Tue Mar 16 00:19:58 2010
@@ -86,8 +86,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
@@ -534,7 +534,7 @@ public class DefaultPartitionNexus imple
         // complain if we do not recognize the attribute being compared
         if ( !schemaManager.getAttributeTypeRegistry().contains( compareContext.getOid() ) )
         {
-            throw new LdapInvalidAttributeIdentifierException( I18n.err( I18n.ERR_266, compareContext.getOid() ) );
+            throw new LdapInvalidAttributeTypeException( I18n.err( I18n.ERR_266, compareContext.getOid() ) );
         }
 
         AttributeType attrType = schemaManager.lookupAttributeTypeRegistry( compareContext.getOid() );
@@ -868,7 +868,7 @@ public class DefaultPartitionNexus imple
             }
     
             // TODO : handle searches based on the RootDSE
-            throw new LdapNameNotFoundException();
+            throw new LdapNoSuchObjectException();
         }
     
         base.normalize( schemaManager.getNormalizerMapping() );
@@ -1007,7 +1007,7 @@ public class DefaultPartitionNexus imple
         
         if ( parent == null )
         {
-            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_268, dn ) );
+            throw new LdapNoSuchObjectException( I18n.err( I18n.ERR_268, dn ) );
         }
         else
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Mar 16 00:19:58 2010
@@ -71,7 +71,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
-import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -1556,7 +1556,7 @@ public class SchemaInterceptor extends B
         {
             if ( !schemaManager.getAttributeTypeRegistry().contains( attributeType.getName() ) )
             {
-                throw new LdapInvalidAttributeIdentifierException( I18n.err( I18n.ERR_275, 
+                throw new LdapInvalidAttributeTypeException( I18n.err( I18n.ERR_275, 
                     attributeType.getName() ) );
             }
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=923519&r1=923518&r2=923519&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Tue Mar 16 00:19:58 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -176,7 +176,7 @@ public class SchemaSubentryManager
                     break; 
                     
                 case REPLACE_ATTRIBUTE :
-                    throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_283 ), 
+                    throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_283 ), 
                         ResultCodeEnum.UNWILLING_TO_PERFORM );
                 
                 default:
@@ -215,7 +215,7 @@ public class SchemaSubentryManager
                 break;
                 
             case( DirContext.REPLACE_ATTRIBUTE ):
-                throw new LdapOperationNotSupportedException( I18n.err( I18n.ERR_283 ), 
+                throw new LdapUnwillingToPerformException( I18n.err( I18n.ERR_283 ), 
                     ResultCodeEnum.UNWILLING_TO_PERFORM );
             
             default:



Mime
View raw message