directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r951068 [1/6] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apac...
Date Thu, 03 Jun 2010 17:05:29 GMT
Author: elecharny
Date: Thu Jun  3 17:05:26 2010
New Revision: 951068

URL: http://svn.apache.org/viewvc?rev=951068&view=rev
Log:
o The Interceptor/OperationManager/Partition methods now throw a LdapException instead of an Exception
o Minor refactoring (mainly removed commented code)
o Closed cursors when it was not done

Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/journal/Journal.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerExecutionAuthorizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/EntityFactory.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Thu Jun  3 17:05:26 2010
@@ -34,6 +34,8 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.impl.NoOpOptimizer;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.exception.LdapException;
+import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -104,9 +106,16 @@ public class AvlPartition extends Abstra
     }
 
 
-    public final void modify( DN dn, List<Modification> modifications ) throws Exception
+    public final void modify( DN dn, List<Modification> modifications ) throws LdapException
     {
-        store.modify( dn, modifications );
+        try
+        {
+            store.modify( dn, modifications );
+        }
+        catch ( Exception e )
+        {
+            throw new LdapOperationErrorException( e.getMessage() );
+        }
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Thu Jun  3 17:05:26 2010
@@ -166,7 +166,10 @@ public interface DirectoryService extend
     boolean isStarted();
 
     
-    CoreSession getAdminSession() throws Exception;
+    /**
+     * @return The Admin session
+     */
+    CoreSession getAdminSession();
     
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java Thu Jun  3 17:05:26 2010
@@ -58,91 +58,91 @@ public interface OperationManager
     /**
      * TODO document after determining if this method should be here.
      */
-    ClonedServerEntry getRootDSE( GetRootDSEOperationContext  opContext ) throws Exception;
+    ClonedServerEntry getRootDSE( GetRootDSEOperationContext  opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    DN getSuffix ( GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix ( GetSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception;
+    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    boolean compare( CompareOperationContext opContext) throws Exception;
+    boolean compare( CompareOperationContext opContext) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void delete( DeleteOperationContext opContext ) throws Exception;
+    void delete( DeleteOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void add( AddOperationContext opContext ) throws Exception;
+    void add( AddOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void modify( ModifyOperationContext opContext ) throws Exception;
+    void modify( ModifyOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    EntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
+    EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
+    EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    Entry lookup( LookupOperationContext opContext ) throws Exception;
+    Entry lookup( LookupOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    boolean hasEntry( EntryOperationContext opContext ) throws Exception;
+    boolean hasEntry( EntryOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void rename( RenameOperationContext opContext ) throws Exception;
+    void rename( RenameOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void move( MoveOperationContext opContext ) throws Exception;
+    void move( MoveOperationContext opContext ) throws LdapException;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception;
+    void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException;
 
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java Thu Jun  3 17:05:26 2010
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.LdapPrincipal;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 
 
@@ -84,7 +85,7 @@ public interface ChangeLog
      * @return the new revision reached after having applied the forward LDIF
      * @throws Exception if there are problems logging the change
      */
-    ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws Exception;
+    ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws LdapException;
 
 
     /**
@@ -97,7 +98,7 @@ public interface ChangeLog
      * @return the new revision reached after having applied the forward LDIF
      * @throws Exception if there are problems logging the change
      */
-    ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, List<LdifEntry> reverses ) throws Exception;
+    ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, List<LdifEntry> reverses ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Thu Jun  3 17:05:26 2010
@@ -110,7 +110,7 @@ public abstract class BaseInterceptor im
      * This method does nothing by default.
      * @throws Exception 
      */
-    public void init( DirectoryService directoryService ) throws Exception
+    public void init( DirectoryService directoryService ) throws LdapException
     {
     }
 
@@ -127,106 +127,106 @@ public abstract class BaseInterceptor im
     // Interceptor's Invoke Method
     // ------------------------------------------------------------------------
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws Exception
+    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
     {
         next.add( opContext );
     }
 
 
-    public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
+    public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
     {
         next.delete( opContext );
     }
 
 
-    public DN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws LdapException
     {
         return next.getMatchedName( opContext );
     }
 
 
-    public ClonedServerEntry getRootDSE( NextInterceptor next, GetRootDSEOperationContext opContext ) throws Exception
+    public ClonedServerEntry getRootDSE( NextInterceptor next, GetRootDSEOperationContext opContext ) throws LdapException
     {
         return next.getRootDSE( opContext );
     }
 
 
-    public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws LdapException
     {
         return next.getSuffix( opContext );
     }
 
 
-    public boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws Exception
+    public boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws LdapException
     {
         return next.hasEntry( opContext );
     }
 
 
-    public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+    public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws LdapException
     {
         return next.list( opContext );
     }
 
 
     public Set<String> listSuffixes ( NextInterceptor next, ListSuffixOperationContext opContext ) 
-        throws Exception
+        throws LdapException
     {
         return next.listSuffixes( opContext );
     }
 
 
-    public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+    public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws LdapException
     {
         return next.lookup( opContext );
     }
 
     
-    public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
+    public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
     {
         next.modify( opContext );
     }
 
 
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext )
-        throws Exception
+        throws LdapException
     {
         next.moveAndRename( opContext );
     }
 
 
     public void rename( NextInterceptor next, RenameOperationContext opContext )
-        throws Exception
+        throws LdapException
     {
         next.rename( opContext );
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
+    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
     {
         next.move( opContext );
     }
 
 
-    public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+    public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws LdapException
     {
         return next.search( opContext );
     }
 
 
-    public void addContextPartition( NextInterceptor next, AddContextPartitionOperationContext opContext ) throws Exception
+    public void addContextPartition( NextInterceptor next, AddContextPartitionOperationContext opContext ) throws LdapException
     {
         next.addContextPartition( opContext );
     }
 
 
-    public void removeContextPartition( NextInterceptor next, RemoveContextPartitionOperationContext opContext ) throws Exception
+    public void removeContextPartition( NextInterceptor next, RemoveContextPartitionOperationContext opContext ) throws LdapException
     {
         next.removeContextPartition( opContext );
     }
 
 
-    public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws Exception
+    public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws LdapException
     {
         return next.compare( opContext );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Thu Jun  3 17:05:26 2010
@@ -126,7 +126,7 @@ public interface Interceptor
      * when this intercepter is loaded into interceptor chain.
      * @throws Exception 
      */
-    void init( DirectoryService directoryService ) throws Exception;
+    void init( DirectoryService directoryService ) throws LdapException;
 
 
     /**
@@ -139,104 +139,104 @@ public interface Interceptor
     /**
      * Filters {@link DefaultPartitionNexus#getRootDSE( GetRootDSEOperationContext )} call.
      */
-    ClonedServerEntry getRootDSE( NextInterceptor next, GetRootDSEOperationContext  opContext ) throws Exception;
+    ClonedServerEntry getRootDSE( NextInterceptor next, GetRootDSEOperationContext  opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#getMatchedName( GetMatchedNameOperationContext )} call.
      */
-    DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#getSuffix( GetSuffixOperationContext )} call.
      */
-    DN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#listSuffixes( ListSuffixOperationContext )} call.
      */
-    Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext opContext ) throws Exception;
+    Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#addContextPartition( AddContextPartitionOperationContext )} call.
      */
-    void addContextPartition( NextInterceptor next, AddContextPartitionOperationContext opContext ) throws Exception;
+    void addContextPartition( NextInterceptor next, AddContextPartitionOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#removeContextPartition( RemoveContextPartitionOperationContext )} call.
      */
-    void removeContextPartition( NextInterceptor next, RemoveContextPartitionOperationContext opContext ) throws Exception;
+    void removeContextPartition( NextInterceptor next, RemoveContextPartitionOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#compare( CompareOperationContext )} call.
      */
-    boolean compare( NextInterceptor next, CompareOperationContext opContext) throws Exception;
+    boolean compare( NextInterceptor next, CompareOperationContext opContext) throws LdapException;
 
 
     /**
      * Filters {@link Partition#delete( DeleteOperationContext )} call.
      */
-    void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception;
+    void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#add( AddOperationContext )} call.
      */
-    void add( NextInterceptor next, AddOperationContext opContext ) throws Exception;
+    void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#modify( ModifyOperationContext )} call.
      */
-    void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception;
+    void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#list( ListOperationContext )} call.
      */
-    EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception;
+    EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#search( SearchOperationContext )} call.
      */
-    EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception;
+    EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#lookup( LookupOperationContext )} call.
      */
-    Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception;
+    Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#hasEntry( EntryOperationContext )} call.
      */
-    boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws Exception;
+    boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#rename( RenameOperationContext )} call.
      */
-    void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception;
+    void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#move( MoveOperationContext )} call.
      */
-    void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception;
+    void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException;
 
 
     /**
      * Filters {@link Partition#moveAndRename( MoveAndRenameOperationContext) } call.
      */
     void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext )
-        throws Exception;
+        throws LdapException;
 
     /**
      * Filters {@link Partition#bind( BindOperationContext )} call.

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Thu Jun  3 17:05:26 2010
@@ -100,106 +100,106 @@ public class InterceptorChain
         }
 
 
-        public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws Exception
+        public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws LdapException
         {
             return nexus.compare( opContext );
         }
 
 
         public ClonedServerEntry getRootDSE( NextInterceptor next, GetRootDSEOperationContext opContext )
-            throws Exception
+            throws LdapException
         {
             return nexus.getRootDSE( opContext );
         }
 
 
-        public DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+        public DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws LdapException
         {
             return ( DN ) nexus.getMatchedName( opContext ).clone();
         }
 
 
-        public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+        public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws LdapException
         {
             return ( DN ) nexus.getSuffix( opContext ).clone();
         }
 
 
-        public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext opContext ) throws Exception
+        public Set<String> listSuffixes( NextInterceptor next, ListSuffixOperationContext opContext ) throws LdapException
         {
             return nexus.listSuffixes( opContext );
         }
 
 
-        public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
+        public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws LdapException
         {
             nexus.delete( opContext );
         }
 
 
-        public void add( NextInterceptor next, AddOperationContext opContext ) throws Exception
+        public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
         {
             nexus.add( opContext );
         }
 
 
-        public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
+        public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
         {
             nexus.modify( opContext );
         }
 
 
-        public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception
+        public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws LdapException
         {
             return nexus.list( opContext );
         }
 
 
-        public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
+        public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws LdapException
         {
             return nexus.search( opContext );
         }
 
 
-        public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+        public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws LdapException
         {
             return nexus.lookup( opContext );
         }
 
 
-        public boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws Exception
+        public boolean hasEntry( NextInterceptor next, EntryOperationContext opContext ) throws LdapException
         {
             return nexus.hasEntry( opContext );
         }
 
 
-        public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
+        public void rename( NextInterceptor next, RenameOperationContext opContext ) throws LdapException
         {
             nexus.rename( opContext );
         }
 
 
-        public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
+        public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
         {
             nexus.move( opContext );
         }
 
 
-        public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) throws Exception
+        public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) throws LdapException
         {
             nexus.moveAndRename( opContext );
         }
 
 
         public void addContextPartition( NextInterceptor next, AddContextPartitionOperationContext opContext )
-            throws Exception
+            throws LdapException
         {
             nexus.addContextPartition( opContext );
         }
 
 
         public void removeContextPartition( NextInterceptor next, RemoveContextPartitionOperationContext opContext )
-            throws Exception
+            throws LdapException
         {
             nexus.removeContextPartition( opContext );
         }
@@ -242,7 +242,7 @@ public class InterceptorChain
      * @throws javax.naming.Exception if an interceptor cannot be initialized.
      * @param directoryService the directory core
      */
-    public synchronized void init( DirectoryService directoryService ) throws Exception
+    public synchronized void init( DirectoryService directoryService ) throws LdapException
     {
         // Initialize tail first.
         this.directoryService = directoryService;
@@ -266,9 +266,9 @@ public class InterceptorChain
             // destroy if failed to initialize all interceptors.
             destroy();
 
-            if ( t instanceof Exception )
+            if ( t instanceof LdapException )
             {
-                throw ( Exception ) t;
+                throw ( LdapException ) t;
             }
             else
             {
@@ -541,7 +541,7 @@ public class InterceptorChain
     }
 
 
-    public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws Exception
+    public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -551,9 +551,9 @@ public class InterceptorChain
         {
             return head.getRootDSE( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -563,7 +563,7 @@ public class InterceptorChain
     }
 
 
-    public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -573,9 +573,9 @@ public class InterceptorChain
         {
             return head.getMatchedName( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -585,7 +585,7 @@ public class InterceptorChain
     }
 
 
-    public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( GetSuffixOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -595,9 +595,9 @@ public class InterceptorChain
         {
             return head.getSuffix( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -607,7 +607,7 @@ public class InterceptorChain
     }
 
 
-    public boolean compare( CompareOperationContext opContext ) throws Exception
+    public boolean compare( CompareOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -617,9 +617,9 @@ public class InterceptorChain
         {
             return head.compare( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -629,7 +629,7 @@ public class InterceptorChain
     }
 
 
-    public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception
+    public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -639,9 +639,9 @@ public class InterceptorChain
         {
             return head.listSuffixes( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -673,7 +673,7 @@ public class InterceptorChain
     }
 
 
-    public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws Exception
+    public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -683,9 +683,9 @@ public class InterceptorChain
         {
             head.removeContextPartition( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -728,7 +728,7 @@ public class InterceptorChain
     }
 
 
-    public void delete( DeleteOperationContext opContext ) throws Exception
+    public void delete( DeleteOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -739,9 +739,9 @@ public class InterceptorChain
         {
             head.delete( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -750,7 +750,7 @@ public class InterceptorChain
     }
 
 
-    public void add( AddOperationContext opContext ) throws Exception
+    public void add( AddOperationContext opContext ) throws LdapException
     {
         Element node = getStartingEntry();
         Interceptor head = node.interceptor;
@@ -760,9 +760,9 @@ public class InterceptorChain
         {
             head.add( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -813,7 +813,7 @@ public class InterceptorChain
     }
 
 
-    public void modify( ModifyOperationContext opContext ) throws Exception
+    public void modify( ModifyOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -824,9 +824,9 @@ public class InterceptorChain
         {
             head.modify( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -835,7 +835,7 @@ public class InterceptorChain
     }
 
 
-    public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+    public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -846,9 +846,9 @@ public class InterceptorChain
         {
             return head.list( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -858,7 +858,7 @@ public class InterceptorChain
     }
 
 
-    public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+    public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -868,9 +868,9 @@ public class InterceptorChain
         {
             return head.search( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -880,7 +880,7 @@ public class InterceptorChain
     }
 
 
-    public Entry lookup( LookupOperationContext opContext ) throws Exception
+    public Entry lookup( LookupOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -890,9 +890,9 @@ public class InterceptorChain
         {
             return head.lookup( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -902,7 +902,7 @@ public class InterceptorChain
     }
 
 
-    public boolean hasEntry( EntryOperationContext opContext ) throws Exception
+    public boolean hasEntry( EntryOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -912,9 +912,9 @@ public class InterceptorChain
         {
             return head.hasEntry( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -924,7 +924,7 @@ public class InterceptorChain
     }
 
 
-    public void rename( RenameOperationContext opContext ) throws Exception
+    public void rename( RenameOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -935,9 +935,9 @@ public class InterceptorChain
         {
             head.rename( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -946,7 +946,7 @@ public class InterceptorChain
     }
 
 
-    public void move( MoveOperationContext opContext ) throws Exception
+    public void move( MoveOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -957,9 +957,9 @@ public class InterceptorChain
         {
             head.move( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -968,7 +968,7 @@ public class InterceptorChain
     }
 
 
-    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
+    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException
     {
         Element entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -979,9 +979,9 @@ public class InterceptorChain
         {
             head.moveAndRename( next, opContext );
         }
-        catch ( Exception ne )
+        catch ( LdapException le )
         {
-            throw ne;
+            throw le;
         }
         catch ( Throwable e )
         {
@@ -1063,7 +1063,7 @@ public class InterceptorChain
                 }
 
 
-                public boolean compare( CompareOperationContext opContext ) throws Exception
+                public boolean compare( CompareOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1072,9 +1072,9 @@ public class InterceptorChain
                     {
                         return interceptor.compare( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1084,7 +1084,7 @@ public class InterceptorChain
                 }
 
 
-                public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws Exception
+                public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1093,9 +1093,9 @@ public class InterceptorChain
                     {
                         return interceptor.getRootDSE( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1105,7 +1105,7 @@ public class InterceptorChain
                 }
 
 
-                public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+                public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1114,9 +1114,9 @@ public class InterceptorChain
                     {
                         return interceptor.getMatchedName( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1126,7 +1126,7 @@ public class InterceptorChain
                 }
 
 
-                public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+                public DN getSuffix( GetSuffixOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1135,9 +1135,9 @@ public class InterceptorChain
                     {
                         return interceptor.getSuffix( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1147,7 +1147,7 @@ public class InterceptorChain
                 }
 
 
-                public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception
+                public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1156,9 +1156,9 @@ public class InterceptorChain
                     {
                         return interceptor.listSuffixes( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1168,7 +1168,7 @@ public class InterceptorChain
                 }
 
 
-                public void delete( DeleteOperationContext opContext ) throws Exception
+                public void delete( DeleteOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1177,9 +1177,9 @@ public class InterceptorChain
                     {
                         interceptor.delete( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1188,7 +1188,7 @@ public class InterceptorChain
                 }
 
 
-                public void add( AddOperationContext opContext ) throws Exception
+                public void add( AddOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1197,9 +1197,9 @@ public class InterceptorChain
                     {
                         interceptor.add( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1208,7 +1208,7 @@ public class InterceptorChain
                 }
 
 
-                public void modify( ModifyOperationContext opContext ) throws Exception
+                public void modify( ModifyOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1217,9 +1217,9 @@ public class InterceptorChain
                     {
                         interceptor.modify( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1228,7 +1228,7 @@ public class InterceptorChain
                 }
 
 
-                public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+                public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1237,9 +1237,9 @@ public class InterceptorChain
                     {
                         return interceptor.list( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1249,7 +1249,7 @@ public class InterceptorChain
                 }
 
 
-                public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+                public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1258,9 +1258,9 @@ public class InterceptorChain
                     {
                         return interceptor.search( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1270,7 +1270,7 @@ public class InterceptorChain
                 }
 
 
-                public Entry lookup( LookupOperationContext opContext ) throws Exception
+                public Entry lookup( LookupOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1279,9 +1279,9 @@ public class InterceptorChain
                     {
                         return interceptor.lookup( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1291,7 +1291,7 @@ public class InterceptorChain
                 }
 
 
-                public boolean hasEntry( EntryOperationContext opContext ) throws Exception
+                public boolean hasEntry( EntryOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1300,9 +1300,9 @@ public class InterceptorChain
                     {
                         return interceptor.hasEntry( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1312,7 +1312,7 @@ public class InterceptorChain
                 }
 
 
-                public void rename( RenameOperationContext opContext ) throws Exception
+                public void rename( RenameOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1321,9 +1321,9 @@ public class InterceptorChain
                     {
                         interceptor.rename( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1332,7 +1332,7 @@ public class InterceptorChain
                 }
 
 
-                public void move( MoveOperationContext opContext ) throws Exception
+                public void move( MoveOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1341,9 +1341,9 @@ public class InterceptorChain
                     {
                         interceptor.move( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1352,7 +1352,7 @@ public class InterceptorChain
                 }
 
 
-                public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
+                public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1361,9 +1361,9 @@ public class InterceptorChain
                     {
                         interceptor.moveAndRename( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1412,7 +1412,7 @@ public class InterceptorChain
                 }
 
 
-                public void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception
+                public void addContextPartition( AddContextPartitionOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1421,9 +1421,9 @@ public class InterceptorChain
                     {
                         interceptor.addContextPartition( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {
@@ -1433,7 +1433,7 @@ public class InterceptorChain
                 }
 
 
-                public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws Exception
+                public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1442,9 +1442,9 @@ public class InterceptorChain
                     {
                         interceptor.removeContextPartition( next.nextInterceptor, opContext );
                     }
-                    catch ( Exception ne )
+                    catch ( LdapException le )
                     {
-                        throw ne;
+                        throw le;
                     }
                     catch ( Throwable e )
                     {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Thu Jun  3 17:05:26 2010
@@ -61,102 +61,102 @@ public interface NextInterceptor
     /**
      * Calls the next interceptor's {@link Interceptor#compare( NextInterceptor, CompareOperationContext )}.
      */
-    boolean compare( CompareOperationContext opContext ) throws Exception;
+    boolean compare( CompareOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#getRootDSE( NextInterceptor, GetRootDSEOperationContext )}.
      */
-    ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws Exception;
+    ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#getMatchedName( NextInterceptor, GetMatchedNameOperationContext )}.
      */
-    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#getSuffix( NextInterceptor, GetSuffixOperationContext )}.
      */
-    DN getSuffix( GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix( GetSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#listSuffixes( NextInterceptor, ListSuffixOperationContext )}.
      */
-    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception;
+    Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link DefaultPartitionNexus#addContextPartition( AddContextPartitionOperationContext )}.
      */
-    void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception;
+    void addContextPartition( AddContextPartitionOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link DefaultPartitionNexus#removeContextPartition( RemoveContextPartitionOperationContext )}.
      */
-    void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws Exception;
+    void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#delete(NextInterceptor, DeleteOperationContext )}.
      */
-    void delete( DeleteOperationContext opContext ) throws Exception;
+    void delete( DeleteOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#add( NextInterceptor, AddOperationContext )}.
      */
-    void add( AddOperationContext opContext ) throws Exception;
+    void add( AddOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#modify( NextInterceptor, ModifyOperationContext )}.
      */
-    void modify( ModifyOperationContext opContext ) throws Exception;
+    void modify( ModifyOperationContext opContext ) throws LdapException;
 
     /**
      * Calls the next interceptor's {@link Interceptor#list( NextInterceptor, ListOperationContext )}.
      */
-    EntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
+    EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#search( NextInterceptor, SearchOperationContext opContext )}.
      */
-    EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
+    EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#lookup( NextInterceptor, LookupOperationContext )}.
      */
-    Entry lookup( LookupOperationContext opContext ) throws Exception;
+    Entry lookup( LookupOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#hasEntry( NextInterceptor, EntryOperationContext )}.
      */
-    boolean hasEntry( EntryOperationContext opContext ) throws Exception;
+    boolean hasEntry( EntryOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#rename( NextInterceptor, RenameOperationContext )}.
      */
-    void rename( RenameOperationContext opContext ) throws Exception;
+    void rename( RenameOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#move( NextInterceptor, MoveOperationContext )}.
      */
-    void move( MoveOperationContext opContext ) throws Exception;
+    void move( MoveOperationContext opContext ) throws LdapException;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#moveAndRename( NextInterceptor, MoveAndRenameOperationContext )}.
      */
-    void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception;
+    void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Thu Jun  3 17:05:26 2010
@@ -30,8 +30,9 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -283,7 +284,7 @@ public abstract class AbstractOperationC
     }
     
     
-    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws Exception
+    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws LdapException
     {
         EntryOperationContext opContext = new EntryOperationContext( session, dn );
         setup( opContext );
@@ -292,7 +293,7 @@ public abstract class AbstractOperationC
     }
     
     
-    public void add( Entry entry, Collection<String> byPassed ) throws Exception
+    public void add( Entry entry, Collection<String> byPassed ) throws LdapException
     {
         AddOperationContext opContext = new AddOperationContext( session, entry );
         setup( opContext );
@@ -301,7 +302,7 @@ public abstract class AbstractOperationC
     }
     
     
-    public void delete( DN dn, Collection<String> byPassed ) throws Exception
+    public void delete( DN dn, Collection<String> byPassed ) throws LdapException
     {
         DeleteOperationContext opContext = new DeleteOperationContext( session, dn );
         setup( opContext );
@@ -310,7 +311,7 @@ public abstract class AbstractOperationC
     }
     
     
-    public void modify( DN dn, List<Modification> mods, Collection<String> byPassed ) throws Exception
+    public void modify( DN dn, List<Modification> mods, Collection<String> byPassed ) throws LdapException
     {
         ModifyOperationContext opContext = new ModifyOperationContext( session, dn, mods );
         setup( opContext );
@@ -328,7 +329,7 @@ public abstract class AbstractOperationC
     }
 
 
-    public Entry lookup( LookupOperationContext opContext ) throws Exception
+    public Entry lookup( LookupOperationContext opContext ) throws LdapException
     {
         if ( opContext != next )
         {
@@ -339,7 +340,7 @@ public abstract class AbstractOperationC
     }
 
 
-    public Entry lookup( DN dn, Collection<String> byPassed ) throws Exception
+    public Entry lookup( DN dn, Collection<String> byPassed ) throws LdapException
     {
         LookupOperationContext opContext = newLookupContext( dn );
         opContext.setByPassed( byPassed );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Thu Jun  3 17:05:26 2010
@@ -37,6 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -399,13 +400,13 @@ public class BindOperationContext implem
     }
 
 
-    public Entry lookup( LookupOperationContext opContext ) throws Exception
+    public Entry lookup( LookupOperationContext opContext ) throws LdapException
     {
         return session.getDirectoryService().getOperationManager().lookup( opContext );
     }
 
 
-    public Entry lookup( DN dn, Collection<String> byPassed ) throws Exception
+    public Entry lookup( DN dn, Collection<String> byPassed ) throws LdapException
     {
         LookupOperationContext opContext = newLookupContext( dn );
         opContext.setByPassed( byPassed );
@@ -469,19 +470,19 @@ public class BindOperationContext implem
     }
 
 
-    public void add( Entry entry, Collection<String> bypass ) throws Exception
+    public void add( Entry entry, Collection<String> bypass ) throws LdapException
     {
         throw new NotImplementedException();
     }
 
 
-    public void delete( DN dn, Collection<String> bypass ) throws Exception
+    public void delete( DN dn, Collection<String> bypass ) throws LdapException
     {
         throw new NotImplementedException();
     }
 
 
-    public void modify( DN dn, List<Modification> mods, Collection<String> bypass ) throws Exception
+    public void modify( DN dn, List<Modification> mods, Collection<String> bypass ) throws LdapException
     {
         throw new NotImplementedException();
     }
@@ -496,7 +497,7 @@ public class BindOperationContext implem
     }
     
     
-    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws Exception
+    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws LdapException
     {
         EntryOperationContext opContext = new EntryOperationContext( session, dn );
         setup( opContext );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Thu Jun  3 17:05:26 2010
@@ -23,8 +23,6 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
@@ -34,6 +32,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.LdapException;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -119,7 +118,7 @@ public class ModifyOperationContext exte
 
 
     public static List<Modification> createModItems( Entry serverEntry, ModificationOperation modOp )
-        throws NamingException
+        throws LdapException
     {
         List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Thu Jun  3 17:05:26 2010
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
@@ -115,7 +116,7 @@ public class MoveAndRenameOperationConte
      * @return the normalized new name after move and rename
      * @throws Exception if the name cannot be normalized
      */
-    public DN getNewDn() throws Exception
+    public DN getNewDn() throws LdapException
     {
         if ( newDn == null )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Thu Jun  3 17:05:26 2010
@@ -27,8 +27,9 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.Interceptor;
-import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -297,19 +298,19 @@ public interface OperationContext
     LookupOperationContext newLookupContext( DN dn );
 
     
-    Entry lookup( DN dn, Collection<String> byPass ) throws Exception;
+    Entry lookup( DN dn, Collection<String> byPass ) throws LdapException;
     
     
-    Entry lookup( LookupOperationContext lookupContext ) throws Exception;
+    Entry lookup( LookupOperationContext lookupContext ) throws LdapException;
     
     
-    void modify( DN dn, List<Modification> mods, Collection<String> byPass ) throws Exception;
+    void modify( DN dn, List<Modification> mods, Collection<String> byPass ) throws LdapException;
     
     
-    void add( Entry entry, Collection<String> byPass ) throws Exception;
+    void add( Entry entry, Collection<String> byPass ) throws LdapException;
     
     
-    void delete( DN dn, Collection<String> byPass ) throws Exception;
+    void delete( DN dn, Collection<String> byPass ) throws LdapException;
 
 
     /**
@@ -320,7 +321,7 @@ public interface OperationContext
      * @return true if the entry exists, false if it does not
      * @throws Exception on failure to perform this operation
      */
-    boolean hasEntry( DN dn, Collection<String> byPass ) throws Exception;
+    boolean hasEntry( DN dn, Collection<String> byPass ) throws LdapException;
     
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Thu Jun  3 17:05:26 2010
@@ -25,6 +25,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
@@ -124,7 +125,7 @@ public class RenameOperationContext exte
     /**
      * @return The new DN either computed if null or already computed
      */
-    public DN getNewDn() throws Exception
+    public DN getNewDn() throws LdapException
     {
         return newDn;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Thu Jun  3 17:05:26 2010
@@ -28,6 +28,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
@@ -95,7 +96,7 @@ public class SearchOperationContext exte
      * @param filter the filter AST to use for the search
      * @param searchControls the search controls
      */
-    public SearchOperationContext( CoreSession session, DN dn, ExprNode filter, SearchControls searchControls ) throws Exception
+    public SearchOperationContext( CoreSession session, DN dn, ExprNode filter, SearchControls searchControls ) throws LdapException
     {
         super( session, dn );
         this.filter = filter;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Thu Jun  3 17:05:26 2010
@@ -26,11 +26,13 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -127,7 +129,7 @@ public abstract class SearchingOperation
     }
     
     
-    protected void setReturningAttributes( String[] attributesIds ) throws Exception
+    protected void setReturningAttributes( String[] attributesIds ) throws LdapException
     {
         if ( attributesIds != null && attributesIds.length != 0 )
         {



Mime
View raw message