svn commit: r923754 - in /directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server: core/partition/impl/btree/BTreePartition.java xdbm/AbstractXdbmPartition.java

[ka...@apache.org]

Author: kayyagari
Date: Tue Mar 16 14:29:52 2010
New Revision: 923754

URL: http://svn.apache.org/viewvc?rev=923754&view=rev
Log:
replaced jndi exceptions with ADS exceptions

Modified:
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=923754&r1=923753&r2=923754&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Tue Mar 16 14:29:52 2010
@@ -26,7 +26,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.naming.InvalidNameException;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
@@ -51,6 +50,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -265,7 +265,7 @@ public abstract class BTreePartition<ID>
         if ( getChildCount( id ) > 0 )
         {
             LdapContextNotEmptyException cnee = new LdapContextNotEmptyException( I18n.err( I18n.ERR_700, dn ) );
-            cnee.setRemainingName( dn );
+            //cnee.setRemainingName( dn );
             throw cnee;
         }
 
@@ -514,7 +514,7 @@ public abstract class BTreePartition<ID>
     /**
      * {@inheritDoc}
      */
-    public void setSuffix( String suffix ) throws InvalidNameException
+    public void setSuffix( String suffix ) throws LdapInvalidDnException
     {
         this.suffix = new DN( suffix );
     }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=923754&r1=923753&r2=923754&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Tue Mar 16 14:29:52 2010
@@ -421,8 +421,8 @@ public abstract class AbstractXdbmPartit
 
         if ( invalid )
         {
-            throw new LdapUnwillingToPerformException( "cannot place an entry below itself",
-                ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
+                "cannot place an entry below itself" );
         }
 
     }
@@ -437,16 +437,16 @@ public abstract class AbstractXdbmPartit
         }
 
         // does nothing
-        throw new LdapAuthenticationNotSupportedException( I18n.err( I18n.ERR_702 ),
-            ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
+        throw new LdapAuthenticationNotSupportedException( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED,
+            I18n.err( I18n.ERR_702 ) );
     }
 
 
     public final void bind( BindOperationContext bindContext ) throws Exception
     {
         // does nothing
-        throw new LdapAuthenticationNotSupportedException( I18n.err( I18n.ERR_702 ),
-            ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
+        throw new LdapAuthenticationNotSupportedException( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED,
+            I18n.err( I18n.ERR_702 ) );
     }