directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r951068 [2/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
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/journal/Journal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/journal/Journal.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/journal/Journal.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/journal/Journal.java Thu Jun  3 17:05:26 2010
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
 
 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;
 
 
@@ -70,7 +71,7 @@ public interface Journal
      * @param forward LDIF of the change going to the next state
      * @throws Exception if there are problems logging the change
      */
-    void log( LdapPrincipal principal, long revision, LdifEntry entry ) throws Exception;
+    void log( LdapPrincipal principal, long revision, LdifEntry entry ) throws LdapException;
 
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Thu Jun  3 17:05:26 2010
@@ -21,11 +21,12 @@ package org.apache.directory.server.core
 
 
 import javax.naming.InvalidNameException;
-import javax.naming.NameNotFoundException;
 
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.shared.ldap.exception.LdapException;
+import org.apache.directory.shared.ldap.exception.LdapOtherException;
 
 
 /**
@@ -52,7 +53,7 @@ public abstract class AbstractPartition 
      * {@link #doInit()} returns without any errors.  {@link #destroy()} is called automatically
      * as a clean-up process if {@link #doInit()} throws an exception.
      */
-    public final void initialize( ) throws Exception
+    public final void initialize( ) throws LdapException
     {
         if ( initialized )
         {
@@ -73,7 +74,14 @@ public abstract class AbstractPartition 
         {
             if ( !initialized )
             {
-                destroy();
+                try
+                {
+                    destroy();
+                }
+                catch ( Exception e )
+                {
+                    throw new LdapOtherException( e.getMessage() );
+                }
             }
         }
     }
@@ -130,13 +138,13 @@ public abstract class AbstractPartition 
      * if it returns an entry by default.  Please override this method if
      * there is more effective way for your implementation.
      */
-    public boolean hasEntry( EntryOperationContext entryContext ) throws Exception
+    public boolean hasEntry( EntryOperationContext entryContext ) throws LdapException
     {
         try
         {
             return entryContext.lookup( entryContext.getDn(), ByPassConstants.LOOKUP_BYPASS ) != null; 
         }
-        catch ( NameNotFoundException e )
+        catch ( LdapException e )
         {
             return false;
         }
@@ -148,5 +156,5 @@ public abstract class AbstractPartition 
      * with null <tt>attributeIds</tt> by default.  Please override
      * this method if there is more effective way for your implementation.
      */
-    public abstract ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws Exception;
+    public abstract ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Thu Jun  3 17:05:26 2010
@@ -74,7 +74,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#add(org.apache.directory.server.core.interceptor.context.AddOperationContext)
      */
-    public void add( AddOperationContext opContext ) throws Exception
+    public void add( AddOperationContext opContext ) throws LdapException
     {
     }
 
@@ -90,7 +90,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext)
      */
-    public void delete( DeleteOperationContext opContext ) throws Exception
+    public void delete( DeleteOperationContext opContext ) throws LdapException
     {
     }
 
@@ -116,7 +116,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#list(org.apache.directory.server.core.interceptor.context.ListOperationContext)
      */
-    public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+    public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
     {
         return new EntryFilteringCursor()
         {
@@ -299,7 +299,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#modify(org.apache.directory.server.core.interceptor.context.ModifyOperationContext)
      */
-    public void modify( ModifyOperationContext opContext ) throws Exception
+    public void modify( ModifyOperationContext opContext ) throws LdapException
     {
     }
 
@@ -307,7 +307,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#move(org.apache.directory.server.core.interceptor.context.MoveOperationContext)
      */
-    public void move( MoveOperationContext opContext ) throws Exception
+    public void move( MoveOperationContext opContext ) throws LdapException
     {
     }
 
@@ -315,7 +315,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#moveAndRename(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext)
      */
-    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
+    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException
     {
     }
 
@@ -323,7 +323,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#rename(org.apache.directory.server.core.interceptor.context.RenameOperationContext)
      */
-    public void rename( RenameOperationContext opContext ) throws Exception
+    public void rename( RenameOperationContext opContext ) throws LdapException
     {
     }
 
@@ -331,7 +331,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext)
      */
-    public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+    public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
     {
         return null;
     }
@@ -393,7 +393,7 @@ public class NullPartition extends Abstr
 
 
     @Override
-    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws Exception
+    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return null;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Thu Jun  3 17:05:26 2010
@@ -111,7 +111,7 @@ public interface Partition
      *
      * @throws Exception if initialization fails in any way
      */
-    void initialize() throws Exception;
+    void initialize() throws LdapException;
 
 
     /**
@@ -154,16 +154,16 @@ public interface Partition
      * delete from this ContextPartition.
      * @throws Exception if there are any problems
      */
-    void delete( DeleteOperationContext opContext ) throws Exception;
+    void delete( DeleteOperationContext opContext ) throws LdapException;
 
 
     /**
      * Adds an entry to this ContextPartition.
      *
      * @param opContext the context used  to add and entry to this ContextPartition
-     * @throws Exception if there are any problems
+     * @throws LdapException if there are any problems
      */
-    void add( AddOperationContext opContext ) throws Exception;
+    void add( AddOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -180,7 +180,7 @@ public interface Partition
      * @see javax.naming.directory.DirContext#REMOVE_ATTRIBUTE
      * @see javax.naming.directory.DirContext#REPLACE_ATTRIBUTE
      */
-    void modify( ModifyOperationContext opContext ) throws Exception;
+    void modify( ModifyOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -193,7 +193,7 @@ public interface Partition
      * @return a NamingEnumeration containing objects of type {@link ServerSearchResult}
      * @throws Exception if there are any problems
      */
-    EntryFilteringCursor list( ListOperationContext opContext ) throws Exception;
+    EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -208,7 +208,7 @@ public interface Partition
      * @throws Exception if there are any problems
      * @return a NamingEnumeration containing objects of type 
      */
-    EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception;
+    EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -223,7 +223,7 @@ public interface Partition
      * @return an Attributes object representing the entry
      * @throws Exception if there are any problems
      */
-    ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws Exception;
+    ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException;
 
 
     /**
@@ -233,7 +233,7 @@ public interface Partition
      * @return true if the entry exists, false if it does not
      * @throws Exception if there are any problems
      */
-    boolean hasEntry( EntryOperationContext opContext ) throws Exception;
+    boolean hasEntry( EntryOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -245,7 +245,7 @@ public interface Partition
      * @param opContext the modify DN context
      * @throws Exception if there are any problems
      */
-    void rename( RenameOperationContext opContext ) throws Exception;
+    void rename( RenameOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -255,7 +255,7 @@ public interface Partition
      * @param opContext The context containing the DNs to move
      * @throws Exception if there are any problems
      */
-    void move( MoveOperationContext opContext ) throws Exception;
+    void move( MoveOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -270,7 +270,7 @@ public interface Partition
      * the modifyDN operation
      * @throws Exception if there are any problems
      */
-    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/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Thu Jun  3 17:05:26 2010
@@ -30,6 +30,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -69,7 +70,7 @@ public interface PartitionNexus extends 
      * @param opContext The Add Partition context
      * @throws Exception If the addition can't be done
      */
-    public void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception;
+    public void addContextPartition( AddContextPartitionOperationContext opContext ) throws LdapException;
 
 
     /**
@@ -79,7 +80,7 @@ public interface PartitionNexus extends 
      * @throws Exception If the removal can't be done
      */
     public void removeContextPartition( RemoveContextPartitionOperationContext removeContextPartition )
-        throws Exception;
+        throws LdapException;
 
 
     /**
@@ -98,7 +99,7 @@ public interface PartitionNexus extends 
      * @return the partition containing the entry represented by the dn
      * @throws Exception if there is no partition for the dn
      */
-    public Partition getPartition( DN dn ) throws Exception;
+    public Partition getPartition( DN dn ) throws LdapException;
 
 
     /**
@@ -111,7 +112,7 @@ public interface PartitionNexus extends 
      * the empty string distinguished name if no match was found.
      * @throws Exception if there are any problems
      */
-    public DN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws Exception;
+    public DN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws LdapException;
 
 
     /**
@@ -125,7 +126,7 @@ public interface PartitionNexus extends 
      * naming context was found for dn.
      * @throws Exception if there are any problems
      */
-    public DN getSuffix( GetSuffixOperationContext getSuffixContext ) throws Exception;
+    public DN getSuffix( GetSuffixOperationContext getSuffixContext ) throws LdapException;
 
 
     /**
@@ -135,7 +136,7 @@ public interface PartitionNexus extends 
      * @return Iteration over ContextPartition suffix names as Names.
      * @throws Exception if there are any problems
      */
-    public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws Exception;
+    public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws LdapException;
 
 
     /**
@@ -144,7 +145,7 @@ public interface PartitionNexus extends 
      * @param extensionOids a set of OID strings to add to the supportedExtension 
      * attribute in the RootDSE
      */
-    public void registerSupportedExtensions( Set<String> extensionOids ) throws Exception;
+    public void registerSupportedExtensions( Set<String> extensionOids ) throws LdapException;
 
 
     /**
@@ -153,8 +154,8 @@ public interface PartitionNexus extends 
      * @param extensionOids a set of OID strings to add to the supportedSaslMechanisms 
      * attribute in the RootDSE
      */
-    public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws Exception;
+    public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws LdapException;
 
 
-    public boolean compare( CompareOperationContext opContext ) throws Exception;
+    public boolean compare( CompareOperationContext opContext ) throws LdapException;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Thu Jun  3 17:05:26 2010
@@ -37,7 +37,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapOtherException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -289,7 +291,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadAttributeTypes( Schema... schemas ) throws Exception
+    public List<Entry> loadAttributeTypes( Schema... schemas ) throws LdapException
     {
         List<Entry> attributeTypeList = new ArrayList<Entry>();
 
@@ -308,12 +310,19 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            // Loop on all the AttributeTypes and add them to the list
-            while ( list.next() )
+            try
             {
-                Entry result = list.get();
-
-                attributeTypeList.add( result );
+                // Loop on all the AttributeTypes and add them to the list
+                while ( list.next() )
+                {
+                    Entry result = list.get();
+    
+                    attributeTypeList.add( result );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -324,7 +333,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadComparators( Schema... schemas ) throws Exception
+    public List<Entry> loadComparators( Schema... schemas ) throws LdapException
     {
         List<Entry> comparatorList = new ArrayList<Entry>();
 
@@ -346,11 +355,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
             {
-                ClonedServerEntry entry = list.get();
-
-                comparatorList.add( entry );
+                while ( list.next() )
+                {
+                    ClonedServerEntry entry = list.get();
+    
+                    comparatorList.add( entry );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -361,7 +377,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadDitContentRules( Schema... schemas ) throws Exception
+    public List<Entry> loadDitContentRules( Schema... schemas ) throws LdapException
     {
         LOG.error( I18n.err( I18n.ERR_86 ) );
 
@@ -372,7 +388,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadDitStructureRules( Schema... schemas ) throws Exception
+    public List<Entry> loadDitStructureRules( Schema... schemas ) throws LdapException
     {
         LOG.error( I18n.err( I18n.ERR_87 ) );
 
@@ -383,7 +399,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadMatchingRules( Schema... schemas ) throws Exception
+    public List<Entry> loadMatchingRules( Schema... schemas ) throws LdapException
     {
         List<Entry> matchingRuleList = new ArrayList<Entry>();
 
@@ -405,11 +421,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
             {
-                Entry entry = list.get();
-
-                matchingRuleList.add( entry );
+                while ( list.next() )
+                {
+                    Entry entry = list.get();
+    
+                    matchingRuleList.add( entry );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -420,7 +443,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadMatchingRuleUses( Schema... schemas ) throws Exception
+    public List<Entry> loadMatchingRuleUses( Schema... schemas ) throws LdapException
     {
         LOG.error( I18n.err( I18n.ERR_88 ) );
 
@@ -431,7 +454,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadNameForms( Schema... schemas ) throws Exception
+    public List<Entry> loadNameForms( Schema... schemas ) throws LdapException
     {
         LOG.error( I18n.err( I18n.ERR_89 ) );
 
@@ -442,7 +465,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadNormalizers( Schema... schemas ) throws Exception
+    public List<Entry> loadNormalizers( Schema... schemas ) throws LdapException
     {
         List<Entry> normalizerList = new ArrayList<Entry>();
 
@@ -464,11 +487,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
             {
-                ClonedServerEntry entry = list.get();
-
-                normalizerList.add( entry );
+                while ( list.next() )
+                {
+                    ClonedServerEntry entry = list.get();
+    
+                    normalizerList.add( entry );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -479,7 +509,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadObjectClasses( Schema... schemas ) throws Exception
+    public List<Entry> loadObjectClasses( Schema... schemas ) throws LdapException
     {
         List<Entry> objectClassList = new ArrayList<Entry>();
 
@@ -501,11 +531,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
             {
-                ClonedServerEntry entry = list.get();
-
-                objectClassList.add( entry );
+                while ( list.next() )
+                {
+                    ClonedServerEntry entry = list.get();
+    
+                    objectClassList.add( entry );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -516,7 +553,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadSyntaxes( Schema... schemas ) throws Exception
+    public List<Entry> loadSyntaxes( Schema... schemas ) throws LdapException
     {
         List<Entry> syntaxList = new ArrayList<Entry>();
 
@@ -538,11 +575,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
             {
-                Entry entry = list.get();
-
-                syntaxList.add( entry );
+                while ( list.next() )
+                {
+                    Entry entry = list.get();
+    
+                    syntaxList.add( entry );
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 
@@ -553,7 +597,7 @@ public class PartitionSchemaLoader exten
     /**
      * {@inheritDoc}
      */
-    public List<Entry> loadSyntaxCheckers( Schema... schemas ) throws Exception
+    public List<Entry> loadSyntaxCheckers( Schema... schemas ) throws LdapException
     {
         List<Entry> syntaxCheckerList = new ArrayList<Entry>();
 
@@ -575,11 +619,18 @@ public class PartitionSchemaLoader exten
 
             EntryFilteringCursor list = partition.list( new ListOperationContext( null, dn ) );
 
-            while ( list.next() )
+            try
+            {            
+                while ( list.next() )
+                {
+                    Entry entry = list.get();
+    
+                    syntaxCheckerList.add( entry );
+                }
+            }
+            catch ( Exception e )
             {
-                Entry entry = list.get();
-
-                syntaxCheckerList.add( entry );
+                throw new LdapOtherException( e.getMessage() );
             }
         }
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Thu Jun  3 17:05:26 2010
@@ -271,7 +271,7 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public void add( AddOperationContext opContext ) throws Exception
+    public void add( AddOperationContext opContext ) throws LdapException
     {
         // At this point, the added SchemaObject does not exist in the partition
         // We have to check if it's enabled and then inject it into the registries
@@ -283,7 +283,7 @@ public final class SchemaPartition exten
         {
             wrapped.add( opContext );
         }
-        catch ( Exception e )
+        catch ( LdapException e )
         {
             // If something went wrong, we have to unregister the schemaObject
             // from the registries
@@ -307,7 +307,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext)
      */
-    public void delete( DeleteOperationContext opContext ) throws Exception
+    public void delete( DeleteOperationContext opContext ) throws LdapException
     {
         boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
 
@@ -318,7 +318,7 @@ public final class SchemaPartition exten
         {
             wrapped.delete( opContext );
         }
-        catch ( Exception e )
+        catch ( LdapException e )
         {
             // TODO : If something went wrong, what should we do here ?
             throw e;
@@ -331,7 +331,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#list(org.apache.directory.server.core.interceptor.context.ListOperationContext)
      */
-    public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+    public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
     {
         return wrapped.list( opContext );
     }
@@ -340,7 +340,7 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public boolean hasEntry( EntryOperationContext entryContext ) throws Exception
+    public boolean hasEntry( EntryOperationContext entryContext ) throws LdapException
     {
         return wrapped.hasEntry( entryContext );
     }
@@ -349,7 +349,7 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public void modify( ModifyOperationContext opContext ) throws Exception
+    public void modify( ModifyOperationContext opContext ) throws LdapException
     {
         Entry entry = opContext.getEntry();
 
@@ -380,7 +380,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#move(org.apache.directory.server.core.interceptor.context.MoveOperationContext)
      */
-    public void move( MoveOperationContext opContext ) throws Exception
+    public void move( MoveOperationContext opContext ) throws LdapException
     {
         boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
         Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
@@ -393,7 +393,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#moveAndRename(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext)
      */
-    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
+    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException
     {
         boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
         Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
@@ -406,7 +406,7 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public void rename( RenameOperationContext opContext ) throws Exception
+    public void rename( RenameOperationContext opContext ) throws LdapException
     {
         boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
 
@@ -424,7 +424,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext)
      */
-    public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+    public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
     {
         return wrapped.search( opContext );
     }
@@ -442,7 +442,7 @@ public final class SchemaPartition exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#lookup(org.apache.directory.server.core.interceptor.context.LookupOperationContext)
      */
-    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws Exception
+    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return wrapped.lookup( lookupContext );
     }
@@ -459,7 +459,7 @@ public final class SchemaPartition exten
      * 
      * @throws NamingException if the update fails
      */
-    private void updateSchemaModificationAttributes( OperationContext opContext ) throws Exception
+    private void updateSchemaModificationAttributes( OperationContext opContext ) throws LdapException
     {
         String modifiersName = opContext.getSession().getEffectivePrincipal().getName();
         String modifyTimestamp = DateUtils.getGeneralizedTime();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Thu Jun  3 17:05:26 2010
@@ -36,7 +36,7 @@ public interface SchemaService
      *
      * @throws Exception If the initializaion fails
      */
-    void initialize() throws Exception;
+    void initialize() throws LdapException;
 
 
     /**
@@ -45,7 +45,7 @@ public interface SchemaService
      * @return the schemaSubentry
      * @throws Exception if there is a failure to access schema timestamps
      */
-    Entry getSubschemaEntryImmutable() throws Exception;
+    Entry getSubschemaEntryImmutable() throws LdapException;
 
 
     /**
@@ -54,7 +54,7 @@ public interface SchemaService
      * @return the schemaSubentry
      * @throws Exception if there is a failure to access schema timestamps
      */
-    Entry getSubschemaEntryCloned() throws Exception;
+    Entry getSubschemaEntryCloned() throws LdapException;
 
 
     /**
@@ -65,5 +65,5 @@ public interface SchemaService
      * @return the subschema entry with the ids provided
      * @throws Exception if there are failures during schema info access
      */
-    Entry getSubschemaEntry( String[] ids ) throws Exception;
+    Entry getSubschemaEntry( String[] ids ) throws LdapException;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Thu Jun  3 17:05:26 2010
@@ -31,8 +31,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapOtherException;
@@ -150,11 +150,11 @@ public abstract class AbstractRegistrySy
      * @return The schema name
      * @throws NamingException If we got an error
      */
-    protected String getSchemaName( DN dn ) throws NamingException
+    protected String getSchemaName( DN dn ) throws LdapException
     {
         if ( dn.size() < 2 )
         {
-            throw new NamingException( I18n.err( I18n.ERR_276 ) );
+            throw new LdapInvalidDnException( I18n.err( I18n.ERR_276 ) );
         }
         
         RDN rdn = dn.getRdn( 1 );
@@ -162,7 +162,7 @@ public abstract class AbstractRegistrySy
     }
 
 
-    protected void checkOidIsUnique( Entry entry ) throws Exception
+    protected void checkOidIsUnique( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 
@@ -177,7 +177,7 @@ public abstract class AbstractRegistrySy
      * Check that a SchemaObject exists in the global OidRegsitry, and if so,
      * return it.
      */
-    protected SchemaObject checkOidExists( Entry entry ) throws Exception
+    protected SchemaObject checkOidExists( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 
@@ -230,7 +230,7 @@ public abstract class AbstractRegistrySy
     }
 
 
-    protected void checkOidIsUnique( String oid ) throws Exception
+    protected void checkOidIsUnique( String oid ) throws LdapException
     {
         if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
@@ -244,7 +244,7 @@ public abstract class AbstractRegistrySy
      * Add a new SchemaObject to the schema content, assuming that
      * it has an associated schema and that this schema is loaded
      */
-    protected void addToSchema( SchemaObject schemaObject, String schemaName ) throws Exception
+    protected void addToSchema( SchemaObject schemaObject, String schemaName ) throws LdapException
     {
         if ( isSchemaLoaded( schemaName ) )
         {
@@ -286,7 +286,7 @@ public abstract class AbstractRegistrySy
      * Delete a SchemaObject from the schema registry, assuming that
      * it has an associated schema and that this schema is loaded
      */
-    protected void deleteFromSchema( SchemaObject schemaObject, String schemaName ) throws Exception
+    protected void deleteFromSchema( SchemaObject schemaObject, String schemaName ) throws LdapException
     {
         if ( isSchemaLoaded( schemaName ) )
         {
@@ -319,22 +319,7 @@ public abstract class AbstractRegistrySy
      * {@inheritDoc}
      */
     public abstract boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) 
-        throws Exception;
-    
-    
-    /*public final boolean modify( DN name, ModificationOperation modOp, Entry mods, Entry entry, Entry targetEntry, 
-        boolean cascade ) throws Exception
-    {
-        return modify( name, entry, targetEntry, cascade );
-    }
-
-
-    public final boolean modify( DN name, List<Modification> mods, Entry entry,
-        Entry targetEntry, boolean cascade ) throws Exception
-    {
-        return modify( name, entry, targetEntry, cascade );
-    }
-    */
+        throws LdapException;
     
     
     protected Set<String> getOids( Set<Entry> results ) throws Exception
@@ -352,7 +337,7 @@ public abstract class AbstractRegistrySy
     }
     
     
-    protected String getOid( Entry entry ) throws Exception
+    protected String getOid( Entry entry ) throws LdapException
     {
         EntryAttribute oid = entry.get( m_oidAT );
         
@@ -371,7 +356,7 @@ public abstract class AbstractRegistrySy
      * @param obj The SchemaObject to unregister
      * @throws Exception If the unregistering failed
      */
-    protected void unregisterOids( SchemaObject obj ) throws Exception
+    protected void unregisterOids( SchemaObject obj ) throws LdapException
     {
         schemaManager.getGlobalOidRegistry().unregister( obj.getOid() );
     }
@@ -383,7 +368,7 @@ public abstract class AbstractRegistrySy
      * @param obj The SchemaObject to register
      * @throws Exception If the registering failed
      */
-    protected void registerOids( SchemaObject obj ) throws Exception
+    protected void registerOids( SchemaObject obj ) throws LdapException
     {
         schemaManager.getGlobalOidRegistry().register( obj );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -25,6 +25,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -65,7 +66,7 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -113,7 +114,7 @@ public class AttributeTypeSynchronizer e
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -141,7 +142,7 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -193,7 +194,7 @@ public class AttributeTypeSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
         AttributeType oldAt = factory
@@ -236,7 +237,7 @@ public class AttributeTypeSynchronizer e
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -287,7 +288,7 @@ public class AttributeTypeSynchronizer e
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -72,7 +72,7 @@ public class ComparatorSynchronizer exte
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -98,7 +98,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -146,7 +146,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -224,7 +224,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
 
@@ -263,7 +263,7 @@ public class ComparatorSynchronizer exte
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -296,7 +296,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -336,7 +336,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    private void checkOidIsUniqueForComparator( Entry entry ) throws Exception
+    private void checkOidIsUniqueForComparator( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 
@@ -352,7 +352,7 @@ public class ComparatorSynchronizer exte
      * Check that a Comparator exists in the ComparatorRegistry, and if so,
      * return it.
      */
-    protected LdapComparator<?> checkComparatorOidExists( Entry entry ) throws Exception
+    protected LdapComparator<?> checkComparatorOidExists( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -20,10 +20,9 @@
 package org.apache.directory.server.core.schema.registries.synchronizers;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -57,7 +56,7 @@ public class DitContentRuleSynchronizer 
      */
     @Override
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) 
-        throws NamingException
+        throws LdapException
     {
         // TODO Auto-generated method stub
         return SCHEMA_UNCHANGED;
@@ -67,7 +66,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws NamingException
+    public void add( Entry entry ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -76,7 +75,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -86,7 +85,7 @@ public class DitContentRuleSynchronizer 
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, java.lang.String, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -96,7 +95,7 @@ public class DitContentRuleSynchronizer 
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
      */
     public void move( DN oriChildName, DN newParentName, Entry entry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -105,7 +104,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -20,10 +20,9 @@
 package org.apache.directory.server.core.schema.registries.synchronizers;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -56,7 +55,7 @@ public class DitStructureRuleSynchronize
      */
     @Override
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
         return SCHEMA_UNCHANGED;
@@ -66,7 +65,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws NamingException
+    public void add( Entry entry ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -75,7 +74,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -88,7 +87,7 @@ public class DitStructureRuleSynchronize
      * java.lang.String, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -101,7 +100,7 @@ public class DitStructureRuleSynchronize
      * javax.naming.directory.Attributes)
      */
     public void move( DN oriChildName, DN newParentName, Entry entry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -110,7 +109,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -68,7 +68,7 @@ public class MatchingRuleSynchronizer ex
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -95,7 +95,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -143,7 +143,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -196,7 +196,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -222,7 +222,7 @@ public class MatchingRuleSynchronizer ex
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -257,7 +257,7 @@ public class MatchingRuleSynchronizer ex
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -24,6 +24,7 @@ import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
@@ -56,7 +57,7 @@ public class MatchingRuleUseSynchronizer
      */
     @Override
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
         return SCHEMA_UNCHANGED;
@@ -66,7 +67,7 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws NamingException
+    public void add( Entry entry ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -75,21 +76,21 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
 
 
     public void move( DN oriChildName, DN newParentName,
-        Entry entry, boolean cascade ) throws NamingException
+        Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -98,7 +99,7 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -20,10 +20,9 @@
 package org.apache.directory.server.core.schema.registries.synchronizers;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.NameForm;
@@ -55,7 +54,7 @@ public class NameFormSynchronizer extend
      */
     @Override
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         return SCHEMA_UNCHANGED;
     }
@@ -64,7 +63,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws NamingException
+    public void add( Entry entry ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -73,7 +72,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws NamingException
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -85,7 +84,7 @@ public class NameFormSynchronizer extend
      * RDN, boolean, javax.naming.directory.Attributes)
      */
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn,
-        boolean deleteOldRn, Entry entry, boolean cascade ) throws NamingException
+        boolean deleteOldRn, Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -97,7 +96,7 @@ public class NameFormSynchronizer extend
      * org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
      */
     public void move( DN oriChildName, DN newParentName, Entry entry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
@@ -106,7 +105,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws NamingException
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -71,7 +71,7 @@ public class NormalizerSynchronizer exte
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -97,7 +97,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -155,7 +155,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -199,7 +199,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -234,7 +234,7 @@ public class NormalizerSynchronizer exte
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -264,7 +264,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -292,7 +292,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    private void checkOidIsUniqueForNormalizer( String oid ) throws Exception
+    private void checkOidIsUniqueForNormalizer( String oid ) throws LdapException
     {
         if ( schemaManager.getNormalizerRegistry().contains( oid ) )
         {
@@ -302,7 +302,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    private void checkOidIsUniqueForNormalizer( Entry entry ) throws Exception
+    private void checkOidIsUniqueForNormalizer( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -67,7 +67,7 @@ public class ObjectClassSynchronizer ext
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -91,7 +91,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -140,7 +140,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -192,7 +192,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
         ObjectClass oldOc = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -243,7 +243,7 @@ public class ObjectClassSynchronizer ext
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -288,7 +288,7 @@ public class ObjectClassSynchronizer ext
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java Thu Jun  3 17:05:26 2010
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
 
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
@@ -48,7 +49,7 @@ public interface RegistrySynchronizer
      * @param entry The SchemObject to add
      * @throws Exception If the addition failed
      */
-    void add( Entry entry ) throws Exception;
+    void add( Entry entry ) throws LdapException;
     
     
     /**
@@ -58,7 +59,7 @@ public interface RegistrySynchronizer
      * @param cascaded unused
      * @throws Exception If the deletion failed
      */
-    void delete( Entry entry, boolean cascaded ) throws Exception;
+    void delete( Entry entry, boolean cascaded ) throws LdapException;
     
     
     /**
@@ -69,7 +70,7 @@ public interface RegistrySynchronizer
      * @param cascaded unused
      * @throws Exception If the rename failed
      */
-    void rename( Entry entry, RDN newRdn, boolean cascaded ) throws Exception;
+    void rename( Entry entry, RDN newRdn, boolean cascaded ) throws LdapException;
     
 
     /**
@@ -82,10 +83,10 @@ public interface RegistrySynchronizer
      * @throws Exception If the modification failed
      */
     boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascaded )
-        throws Exception;
+        throws LdapException;
     
     void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, Entry entry,
-        boolean cascaded ) throws Exception;
+        boolean cascaded ) throws LdapException;
     
-    void move( DN oriChildName, DN newParentName, Entry entry, boolean cascaded ) throws Exception;
+    void move( DN oriChildName, DN newParentName, Entry entry, boolean cascaded ) throws LdapException;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Thu Jun  3 17:05:26 2010
@@ -35,9 +35,10 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -152,7 +153,7 @@ public class RegistrySynchronizerAdaptor
      * @param opContext The Add context, containing the entry to be added
      * @throws Exception If the addition failed 
      */
-    public void add( AddOperationContext opContext ) throws Exception
+    public void add( AddOperationContext opContext ) throws LdapException
     {
         EntryAttribute oc = opContext.getEntry().get( objectClassAT );
         
@@ -218,7 +219,7 @@ public class RegistrySynchronizerAdaptor
      * {@inheritDoc}
      */
     public void delete( DeleteOperationContext opContext, boolean doCascadeDelete ) 
-        throws Exception
+        throws LdapException
     {
         Entry entry = opContext.getEntry();
         
@@ -273,7 +274,7 @@ public class RegistrySynchronizerAdaptor
      * @param doCascadeModify Not used
      * @throws Exception If the modification failed
      */
-    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean doCascadeModify ) throws Exception
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean doCascadeModify ) throws LdapException
     {
         Entry entry = opContext.getEntry();
         EntryAttribute oc = entry.get( objectClassAT );
@@ -315,7 +316,7 @@ public class RegistrySynchronizerAdaptor
      * @throws Exception If the rename failed
      */
     public void rename( RenameOperationContext opContext, boolean doCascadeModify ) 
-        throws Exception
+        throws LdapException
     {
         Entry originalEntry = opContext.getEntry().getOriginalEntry();
         EntryAttribute oc = originalEntry.get( objectClassAT );
@@ -345,7 +346,7 @@ public class RegistrySynchronizerAdaptor
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeManager#replace(org.apache.directory.server.core.interceptor.context.MoveOperationContext, org.apache.directory.server.core.entry.Entry, boolean)
      */
-    public void move( MoveOperationContext opContext, Entry entry, boolean cascade ) throws Exception
+    public void move( MoveOperationContext opContext, Entry entry, boolean cascade ) throws LdapException
     {
         EntryAttribute oc = entry.get( objectClassAT );
         
@@ -374,7 +375,7 @@ public class RegistrySynchronizerAdaptor
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeManager#move(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext, org.apache.directory.server.core.entry.Entry, boolean)
      */
-    public void moveAndRename( MoveAndRenameOperationContext opContext, Entry entry, boolean cascade ) throws Exception
+    public void moveAndRename( MoveAndRenameOperationContext opContext, Entry entry, boolean cascade ) throws LdapException
     {
         EntryAttribute oc = entry.get( objectClassAT );
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.NamingException;
+
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.i18n.I18n;
@@ -114,7 +116,7 @@ public class SchemaSynchronizer implemen
      * Depending in the existence of this attribute in the previous entry, we will
      * have to update the entry or not.
      */
-    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) throws Exception
+    public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade ) throws LdapException
     {
         Entry entry = opContext.getEntry();
         List<Modification> mods = opContext.getModItems(); 
@@ -157,7 +159,7 @@ public class SchemaSynchronizer implemen
      * @param name the dn of the new metaSchema object
      * @param entry the attributes of the new metaSchema object
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -227,7 +229,7 @@ public class SchemaSynchronizer implemen
      * @param name the dn of the metaSchema object being deleted
      * @param entry the attributes of the metaSchema object 
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         EntryAttribute cn = entry.get( cnAT );
         String schemaName = cn.getString();
@@ -261,7 +263,7 @@ public class SchemaSynchronizer implemen
      * @param entry the entry of the metaSchema object before the rename
      * @param newRdn the new commonName of the metaSchema object
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String rdnAttribute = newRdn.getUpType();
         String rdnAttributeOid = registries.getAttributeTypeRegistry().getOidByName( rdnAttribute );
@@ -391,7 +393,7 @@ public class SchemaSynchronizer implemen
      * </pre>
      */
     private boolean modifyDisable( ModifyOperationContext opContext, ModificationOperation modOp, 
-        EntryAttribute disabledInMods, EntryAttribute disabledInEntry ) throws Exception
+        EntryAttribute disabledInMods, EntryAttribute disabledInEntry ) throws LdapException
     {
         DN name = opContext.getDn();
         
@@ -477,7 +479,7 @@ public class SchemaSynchronizer implemen
     }
 
     
-    private boolean disableSchema( String schemaName ) throws Exception
+    private boolean disableSchema( String schemaName ) throws LdapException
     {
         Schema schema = registries.getLoadedSchema( schemaName );
 
@@ -536,7 +538,7 @@ public class SchemaSynchronizer implemen
      * Enabling a schema consist on switching all of its schema element to enable.
      * We have to do it on a temporary registries.
      */
-    private boolean enableSchema( String schemaName ) throws Exception
+    private boolean enableSchema( String schemaName ) throws LdapException
     {
         Schema schema = registries.getLoadedSchema( schemaName );
 
@@ -559,7 +561,7 @@ public class SchemaSynchronizer implemen
      * @throws NamingException if the dependencies do not resolve or are not
      * loaded (enabled)
      */
-    private void checkForDependencies( boolean isEnabled, Entry entry ) throws Exception
+    private void checkForDependencies( boolean isEnabled, Entry entry ) throws LdapException
     {
         EntryAttribute dependencies = entry.get( this.dependenciesAT );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -70,7 +70,7 @@ public class SyntaxCheckerSynchronizer e
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -96,7 +96,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -143,7 +143,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -219,7 +219,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -252,7 +252,7 @@ public class SyntaxCheckerSynchronizer e
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -291,7 +291,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -319,7 +319,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    private void checkOidIsUniqueForSyntaxChecker( Entry entry ) throws Exception
+    private void checkOidIsUniqueForSyntaxChecker( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 
@@ -335,7 +335,7 @@ public class SyntaxCheckerSynchronizer e
      * Check that a SyntaxChecker exists in the SyntaxCheckerRegistry, and if so,
      * return it.
      */
-    protected SyntaxChecker checkSyntaxCheckerOidExists( Entry entry ) throws Exception
+    protected SyntaxChecker checkSyntaxCheckerOidExists( Entry entry ) throws LdapException
     {
         String oid = getOid( entry );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=951068&r1=951067&r2=951068&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Thu Jun  3 17:05:26 2010
@@ -74,7 +74,7 @@ public class SyntaxSynchronizer extends 
      * {@inheritDoc}
      */
     public boolean modify( ModifyOperationContext opContext, Entry targetEntry, boolean cascade )
-        throws Exception
+        throws LdapException
     {
         DN name = opContext.getDn();
         Entry entry = opContext.getEntry();
@@ -98,7 +98,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void add( Entry entry ) throws Exception
+    public void add( Entry entry ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -198,7 +198,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void delete( Entry entry, boolean cascade ) throws Exception
+    public void delete( Entry entry, boolean cascade ) throws LdapException
     {
         DN dn = entry.getDn();
         DN parentDn = ( DN ) dn.clone();
@@ -252,7 +252,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws Exception
+    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -290,7 +290,7 @@ public class SyntaxSynchronizer extends 
 
 
     public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
-        Entry entry, boolean cascade ) throws Exception
+        Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -335,7 +335,7 @@ public class SyntaxSynchronizer extends 
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );



Mime
View raw message