directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r658861 [1/2] - /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/
Date Wed, 21 May 2008 20:50:35 GMT
Author: elecharny
Date: Wed May 21 13:50:34 2008
New Revision: 658861

URL: http://svn.apache.org/viewvc?rev=658861&view=rev
Log:
fixing issues with Cursor verses NamingEnumeration usage in Interceptors

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java Wed May 21 13:50:34 2008
@@ -22,7 +22,6 @@
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -34,7 +33,7 @@
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 
-import javax.naming.NamingException;
+//import javax.naming.NamingException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -54,7 +53,7 @@
     protected final SchemaEntityFactory factory;
 
     
-    protected AbstractSchemaChangeHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    protected AbstractSchemaChangeHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         this.targetRegistries = targetRegistries;
         this.loader = loader;
@@ -63,7 +62,7 @@
     }
     
     
-    protected void checkOidIsUnique( ServerEntry entry ) throws NamingException
+    protected void checkOidIsUnique( ServerEntry entry ) throws Exception
     {
         String oid = getOid( entry );
 
@@ -75,7 +74,7 @@
     }
 
 
-    protected void checkOidIsUnique( SchemaObject schemaObject ) throws NamingException
+    protected void checkOidIsUnique( SchemaObject schemaObject ) throws Exception
     {
         String oid = schemaObject.getOid();
 
@@ -87,7 +86,7 @@
     }
 
 
-    protected void checkOidIsUnique( String oid ) throws NamingException
+    protected void checkOidIsUnique( String oid ) throws Exception
     {
         if ( targetRegistries.getOidRegistry().hasOid( oid ) )
         {
@@ -98,28 +97,28 @@
     
     
     protected abstract void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) 
-        throws NamingException;
+        throws Exception;
     
     
     public final void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, ServerEntry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws Exception
     {
         modify( name, entry, targetEntry, cascade );
     }
 
 
     public final void modify( LdapDN name, List<Modification> mods, ServerEntry entry,
-        ServerEntry targetEntry, boolean cascade ) throws NamingException
+        ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         modify( name, entry, targetEntry, cascade );
     }
 
     
-    protected Set<String> getOids( Set<ServerSearchResult> results ) throws NamingException
+    protected Set<String> getOids( Set<ServerEntry> results ) throws Exception
     {
         Set<String> oids = new HashSet<String>( results.size() );
         
-        for ( ServerSearchResult result : results )
+        for ( ServerEntry result : results )
         {
             LdapDN dn = result.getDn();
             dn.normalize( this.targetRegistries.getAttributeTypeRegistry().getNormalizerMapping() );
@@ -130,7 +129,7 @@
     }
     
     
-    protected String getOid( ServerEntry entry ) throws NamingException
+    protected String getOid( ServerEntry entry ) throws Exception
     {
         EntryAttribute oid = entry.get( m_oidAT );
         
@@ -143,25 +142,25 @@
     }
     
     
-    protected String getSchemaName( LdapDN name ) throws NamingException
+    protected String getSchemaName( LdapDN name ) throws Exception
     {
         return MetaSchemaUtils.getSchemaName( name );
     }
     
     
-    protected Schema getSchema( LdapDN name ) throws NamingException
+    protected Schema getSchema( LdapDN name ) throws Exception
     {
         return loader.getSchema( MetaSchemaUtils.getSchemaName( name ) );
     }
     
     
-    protected void unregisterOids( String oid ) throws NamingException
+    protected void unregisterOids( String oid ) throws Exception
     {
         targetRegistries.getOidRegistry().unregister( oid );
     }
     
     
-    protected void registerOids( SchemaObject obj ) throws NamingException
+    protected void registerOids( SchemaObject obj ) throws Exception
     {
         String[] names = obj.getNames();
         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Wed May 21 13:50:34 2008
@@ -235,7 +235,7 @@
      * @return the set of attributeType objects for the descriptions 
      * @throws NamingException if there are problems parsing the descriptions
      */
-    public AttributeType[] parseAttributeTypes( EntryAttribute attr ) throws NamingException
+    public AttributeType[] parseAttributeTypes( EntryAttribute attr ) throws Exception
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -370,7 +370,7 @@
      * @return the set of objectClass objects for the descriptions 
      * @throws NamingException if there are problems parsing the descriptions
      */
-    public ObjectClass[] parseObjectClasses( EntryAttribute attr ) throws NamingException
+    public ObjectClass[] parseObjectClasses( EntryAttribute attr ) throws Exception
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -518,7 +518,7 @@
      * @return the set of Syntax objects for the descriptions 
      * @throws NamingException if there are problems parsing the descriptions
      */
-    public Syntax[] parseSyntaxes( EntryAttribute attr ) throws NamingException
+    public Syntax[] parseSyntaxes( EntryAttribute attr ) throws Exception
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -572,7 +572,7 @@
      * @return the set of matchingRule objects for the descriptions 
      * @throws NamingException if there are problems parsing the descriptions
      */
-    public MatchingRule[] parseMatchingRules( EntryAttribute attr ) throws NamingException
+    public MatchingRule[] parseMatchingRules( EntryAttribute attr ) throws Exception
     {
         if ( attr == null || attr.size() == 0 )
         {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java Wed May 21 13:50:34 2008
@@ -26,7 +26,6 @@
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
@@ -54,7 +53,7 @@
     
 
     public MetaAttributeTypeHandler( Registries targetRegistries, PartitionSchemaLoader loader, SchemaPartitionDao dao ) 
-        throws NamingException
+        throws Exception
     {
         super( targetRegistries, loader );
         
@@ -64,7 +63,7 @@
 
 
     protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         String oid = getOid( entry );
         Schema schema = getSchema( name );
@@ -78,7 +77,7 @@
     }
     
     
-    public void add( AttributeType at ) throws NamingException
+    public void add( AttributeType at ) throws Exception
     {
         Schema schema = dao.getSchema( at.getSchema() );
         if ( ! schema.isDisabled() )
@@ -92,7 +91,7 @@
     }
 
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -105,11 +104,11 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( name );
         AttributeType at = factory.getAttributeType( entry, targetRegistries, schemaName );
-        Set<ServerSearchResult> dependees = dao.listAttributeTypeDependents( at );
+        Set<ServerEntry> dependees = dao.listAttributeTypeDependents( at );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -124,7 +123,7 @@
     }
 
 
-    public void delete( AttributeType at, boolean cascade ) throws NamingException
+    public void delete( AttributeType at, boolean cascade ) throws Exception
     {
         Schema schema = loader.getSchema( at.getSchema() );
         if ( ! schema.isDisabled() )
@@ -135,11 +134,11 @@
     }
 
 
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         Schema schema = getSchema( name );
         AttributeType oldAt = factory.getAttributeType( entry, targetRegistries, schema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listAttributeTypeDependents( oldAt );
+        Set<ServerEntry> dependees = dao.listAttributeTypeDependents( oldAt );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -171,12 +170,12 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         AttributeType oldAt = factory.getAttributeType( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listAttributeTypeDependents( oldAt );
+        Set<ServerEntry> dependees = dao.listAttributeTypeDependents( oldAt );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -212,12 +211,12 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         AttributeType oldAt = factory.getAttributeType( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listAttributeTypeDependents( oldAt );
+        Set<ServerEntry> dependees = dao.listAttributeTypeDependents( oldAt );
         
         if ( dependees != null && dependees.size() > 0 )
         {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java Wed May 21 13:50:34 2008
@@ -63,7 +63,7 @@
 
     
 
-    public MetaComparatorHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    public MetaComparatorHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         this.comparatorRegistry = targetRegistries.getComparatorRegistry();
@@ -75,7 +75,7 @@
     }
 
     
-    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws NamingException
+    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         Comparator comparator = factory.getComparator( targetEntry, targetRegistries );
@@ -90,7 +90,7 @@
     }
 
     
-    private ComparatorDescription getComparatorDescription( String schemaName, ServerEntry entry ) throws NamingException
+    private ComparatorDescription getComparatorDescription( String schemaName, ServerEntry entry ) throws Exception
     {
         ComparatorDescription description = new ComparatorDescription();
         description.setNumericOid( getOid( entry ) );
@@ -118,7 +118,7 @@
     }
     
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -136,7 +136,7 @@
     }
     
     
-    public void add( ComparatorDescription comparatorDescription ) throws NamingException
+    public void add( ComparatorDescription comparatorDescription ) throws Exception
     {
         Comparator comparator = factory.getComparator( comparatorDescription, targetRegistries );
         String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
@@ -155,7 +155,7 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         delete( oid, cascade );
@@ -179,7 +179,7 @@
     }
 
     
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
 
@@ -207,7 +207,7 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -243,7 +243,7 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -284,7 +284,7 @@
     }
 
 
-    private void checkOidIsUniqueForComparator( ServerEntry entry ) throws NamingException
+    private void checkOidIsUniqueForComparator( ServerEntry entry ) throws Exception
     {
         String oid = getOid( entry );
         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java Wed May 21 13:50:34 2008
@@ -38,7 +38,7 @@
 public class MetaDitContentRuleHandler extends AbstractSchemaChangeHandler
 {
 
-    protected MetaDitContentRuleHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    protected MetaDitContentRuleHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         // TODO Auto-generated constructor stub

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java Wed May 21 13:50:34 2008
@@ -38,7 +38,7 @@
 public class MetaDitStructureRuleHandler extends AbstractSchemaChangeHandler
 {
 
-    protected MetaDitStructureRuleHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    protected MetaDitStructureRuleHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         // TODO Auto-generated constructor stub

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java Wed May 21 13:50:34 2008
@@ -26,7 +26,6 @@
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
 import org.apache.directory.server.schema.registries.Registries;
@@ -53,7 +52,7 @@
 
     
     public MetaMatchingRuleHandler( Registries targetRegistries, PartitionSchemaLoader loader, SchemaPartitionDao dao ) 
-        throws NamingException
+        throws Exception
     {
         super( targetRegistries, loader );
         
@@ -63,7 +62,7 @@
 
 
     protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         Schema schema = getSchema( name );
@@ -77,7 +76,7 @@
     }
 
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -90,11 +89,11 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( name );
         MatchingRule mr = factory.getMatchingRule( entry, targetRegistries, schemaName );
-        Set<ServerSearchResult> dependees = dao.listMatchingRuleDependents( mr );
+        Set<ServerEntry> dependees = dao.listMatchingRuleDependents( mr );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -109,7 +108,7 @@
     }
 
 
-    public void delete( MatchingRule mr, boolean cascade ) throws NamingException
+    public void delete( MatchingRule mr, boolean cascade ) throws Exception
     {
         Schema schema = loader.getSchema( mr.getSchema() );
         if ( ! schema.isDisabled() )
@@ -120,11 +119,11 @@
     }
 
     
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         Schema schema = getSchema( name );
         MatchingRule oldMr = factory.getMatchingRule( entry, targetRegistries, schema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listMatchingRuleDependents( oldMr );
+        Set<ServerEntry> dependees = dao.listMatchingRuleDependents( oldMr );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -157,12 +156,12 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn, 
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         MatchingRule oldMr = factory.getMatchingRule( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listMatchingRuleDependents( oldMr );
+        Set<ServerEntry> dependees = dao.listMatchingRuleDependents( oldMr );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -199,12 +198,12 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         MatchingRule oldMr = factory.getMatchingRule( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listMatchingRuleDependents( oldMr );
+        Set<ServerEntry> dependees = dao.listMatchingRuleDependents( oldMr );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -255,7 +254,7 @@
     }
 
 
-    public void add( MatchingRule mr ) throws NamingException
+    public void add( MatchingRule mr ) throws Exception
     {
         Schema schema = loader.getSchema( mr.getSchema() );
         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java Wed May 21 13:50:34 2008
@@ -38,7 +38,7 @@
 public class MetaMatchingRuleUseHandler extends AbstractSchemaChangeHandler
 {
 
-    protected MetaMatchingRuleUseHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    protected MetaMatchingRuleUseHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         // TODO Auto-generated constructor stub

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java Wed May 21 13:50:34 2008
@@ -38,7 +38,7 @@
 public class MetaNameFormHandler extends AbstractSchemaChangeHandler
 {
 
-    protected MetaNameFormHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    protected MetaNameFormHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         // TODO Auto-generated constructor stub

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Wed May 21 13:50:34 2008
@@ -62,7 +62,7 @@
     private final AttributeType fqcnAT;
     
 
-    public MetaNormalizerHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    public MetaNormalizerHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         this.normalizerRegistry = targetRegistries.getNormalizerRegistry();
@@ -76,7 +76,7 @@
 
     
     
-    private NormalizerDescription getNormalizerDescription( String schemaName, ServerEntry entry ) throws NamingException
+    private NormalizerDescription getNormalizerDescription( String schemaName, ServerEntry entry ) throws Exception
     {
         NormalizerDescription description = new NormalizerDescription();
         description.setNumericOid( getOid( entry ) );
@@ -104,7 +104,7 @@
     }
     
     
-    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws NamingException
+    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         Normalizer normalizer = factory.getNormalizer( targetEntry, targetRegistries );
@@ -120,7 +120,7 @@
     }
 
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -138,7 +138,7 @@
     }
 
     
-    public void add( NormalizerDescription normalizerDescription ) throws NamingException
+    public void add( NormalizerDescription normalizerDescription ) throws Exception
     {
         Normalizer normalizer = factory.getNormalizer( normalizerDescription, targetRegistries );
         String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
@@ -157,7 +157,7 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         delete( getOid( entry ), cascade );
     }
@@ -180,7 +180,7 @@
     }
     
 
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
 
@@ -210,7 +210,7 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -246,7 +246,7 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -287,7 +287,7 @@
     }
 
 
-    private void checkOidIsUniqueForNormalizer( ServerEntry entry ) throws NamingException
+    private void checkOidIsUniqueForNormalizer( ServerEntry entry ) throws Exception
     {
         String oid = getOid( entry );
         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java Wed May 21 13:50:34 2008
@@ -26,7 +26,6 @@
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.ObjectClassRegistry;
 import org.apache.directory.server.schema.registries.Registries;
@@ -53,7 +52,7 @@
 
 
     public MetaObjectClassHandler( Registries targetRegistries, PartitionSchemaLoader loader, SchemaPartitionDao dao ) 
-        throws NamingException
+        throws Exception
     {
         super( targetRegistries, loader );
         
@@ -63,7 +62,7 @@
 
 
     protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         Schema schema = getSchema( name );
@@ -77,7 +76,7 @@
     }
 
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -90,11 +89,11 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         String schemaName = getSchemaName( name );
         ObjectClass oc = factory.getObjectClass( entry, targetRegistries, schemaName );
-        Set<ServerSearchResult> dependees = dao.listObjectClassDependents( oc );
+        Set<ServerEntry> dependees = dao.listObjectClassDependents( oc );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -109,7 +108,7 @@
     }
 
 
-    public void delete( ObjectClass oc, boolean cascade ) throws NamingException
+    public void delete( ObjectClass oc, boolean cascade ) throws Exception
     {
         Schema schema = loader.getSchema( oc.getSchema() );
         
@@ -122,11 +121,11 @@
     }
 
 
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         Schema schema = getSchema( name );
         ObjectClass oldOc = factory.getObjectClass( entry, targetRegistries, schema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listObjectClassDependents( oldOc );
+        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldOc );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -158,12 +157,12 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         ObjectClass oldOc = factory.getObjectClass( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listObjectClassDependents( oldOc );
+        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldOc );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -199,12 +198,12 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         Schema oldSchema = getSchema( oriChildName );
         ObjectClass oldAt = factory.getObjectClass( entry, targetRegistries, oldSchema.getSchemaName() );
-        Set<ServerSearchResult> dependees = dao.listObjectClassDependents( oldAt );
+        Set<ServerEntry> dependees = dao.listObjectClassDependents( oldAt );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -255,7 +254,7 @@
     }
 
 
-    public void add( ObjectClass oc ) throws NamingException
+    public void add( ObjectClass oc ) throws Exception
     {
         Schema schema = loader.getSchema( oc.getSchema() );
         if ( ! schema.isDisabled() )

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java Wed May 21 13:50:34 2008
@@ -88,7 +88,7 @@
      * @param entry the entry after the modifications have been applied
      */
     public void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, 
-        ServerEntry targetEntry, boolean cascade ) throws NamingException
+        ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         EntryAttribute disabledInMods = mods.get( disabledAT );
         
@@ -129,7 +129,7 @@
      * @param entry the entry after the modifications have been applied
      */
     public void modify( LdapDN name, List<Modification> mods, ServerEntry entry,
-        ServerEntry targetEntry, boolean cascade ) throws NamingException
+        ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         EntryAttribute disabledInEntry = entry.get( disabledAT );
         Modification disabledModification = ServerEntryUtils.getModificationItem( mods, disabledAT );
@@ -176,7 +176,7 @@
      * @param name the dn of the new metaSchema object
      * @param entry the attributes of the new metaSchema object
      */
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -243,7 +243,7 @@
      * @param name the dn of the metaSchema object being deleted
      * @param entry the attributes of the metaSchema object 
      */
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         EntryAttribute cn = entry.get( cnAT );
         String schemaName = cn.getString();
@@ -274,7 +274,7 @@
      * @param entry the entry of the metaSchema object before the rename
      * @param newRdn the new commonName of the metaSchema object
      */
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         String rdnAttribute = newRdn.getUpType();
         String rdnAttributeOid = globalRegistries.getOidRegistry().getOid( rdnAttribute );
@@ -381,7 +381,7 @@
 
     
     private void disable( LdapDN name, ModificationOperation modOp, EntryAttribute disabledInMods, EntryAttribute disabledInEntry )
-        throws NamingException
+        throws Exception
     {
         switch ( modOp )
         {
@@ -446,7 +446,7 @@
     }
 
 
-    private void disableSchema( String schemaName ) throws NamingException
+    private void disableSchema( String schemaName ) throws Exception
     {
         Set<String> dependents = loader.listEnabledDependentSchemaNames( schemaName );
         if ( ! dependents.isEmpty() )
@@ -464,7 +464,7 @@
      * TODO - for now we're just going to add the schema to the global 
      * registries ... we may need to add it to more than that though later.
      */
-    private void enableSchema( String schemaName ) throws NamingException
+    private void enableSchema( String schemaName ) throws Exception
     {
         if ( globalRegistries.getLoadedSchemas().containsKey( schemaName ) )
         {
@@ -486,7 +486,7 @@
      * @throws NamingException if the dependencies do not resolve or are not
      * loaded (enabled)
      */
-    private void checkForDependencies( boolean isEnabled, ServerEntry entry ) throws NamingException
+    private void checkForDependencies( boolean isEnabled, ServerEntry entry ) throws Exception
     {
         EntryAttribute dependencies = entry.get( this.dependenciesAT );
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Wed May 21 13:50:34 2008
@@ -62,7 +62,7 @@
     private final AttributeType fqcnAT;
     
 
-    public MetaSyntaxCheckerHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws NamingException
+    public MetaSyntaxCheckerHandler( Registries targetRegistries, PartitionSchemaLoader loader ) throws Exception
     {
         super( targetRegistries, loader );
         this.syntaxCheckerRegistry = targetRegistries.getSyntaxCheckerRegistry();
@@ -75,7 +75,7 @@
 
 
     private SyntaxCheckerDescription getSyntaxCheckerDescription( String schemaName, ServerEntry entry ) 
-        throws NamingException
+        throws Exception
     {
         SyntaxCheckerDescription description = new SyntaxCheckerDescription();
         description.setNumericOid( getOid( entry ) );
@@ -103,7 +103,7 @@
     }
 
     
-    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws NamingException
+    protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         SyntaxChecker syntaxChecker = factory.getSyntaxChecker( targetEntry, targetRegistries );
@@ -120,7 +120,7 @@
     }
 
 
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -144,7 +144,7 @@
     }
 
 
-    public void add( SyntaxCheckerDescription syntaxCheckerDescription ) throws NamingException
+    public void add( SyntaxCheckerDescription syntaxCheckerDescription ) throws Exception
     {
         SyntaxChecker syntaxChecker = factory.getSyntaxChecker( syntaxCheckerDescription, targetRegistries );
         String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
@@ -164,7 +164,7 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         delete( getOid( entry ), cascade );
     }
@@ -187,7 +187,7 @@
     }
 
 
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
 
@@ -222,7 +222,7 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn, 
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
@@ -265,7 +265,7 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java Wed May 21 13:50:34 2008
@@ -26,7 +26,6 @@
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
@@ -53,7 +52,7 @@
 
     
     public MetaSyntaxHandler( Registries targetRegistries, PartitionSchemaLoader loader, SchemaPartitionDao dao ) 
-        throws NamingException
+        throws Exception
     {
         super( targetRegistries, loader );
 
@@ -63,7 +62,7 @@
 
     
     protected void modify( LdapDN name, ServerEntry entry, ServerEntry targetEntry, 
-        boolean cascade ) throws NamingException
+        boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         Schema schema = getSchema( name );
@@ -77,7 +76,7 @@
     }
 
     
-    public void add( LdapDN name, ServerEntry entry ) throws NamingException
+    public void add( LdapDN name, ServerEntry entry ) throws Exception
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
@@ -90,11 +89,11 @@
     }
 
 
-    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
+    public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws Exception
     {
         String oid = getOid( entry );
         
-        Set<ServerSearchResult> dependees = dao.listSyntaxDependents( oid );
+        Set<ServerEntry> dependees = dao.listSyntaxDependents( oid );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -112,7 +111,7 @@
     }
 
 
-    public void delete( Syntax syntax, boolean cascade ) throws NamingException
+    public void delete( Syntax syntax, boolean cascade ) throws Exception
     {
         Schema schema = loader.getSchema( syntax.getSchema() );
         if ( ! schema.isDisabled() )
@@ -125,11 +124,11 @@
     }
 
     
-    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+    public void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
     {
         String oldOid = getOid( entry );
 
-        Set<ServerSearchResult> dependees = dao.listSyntaxDependents( oldOid );
+        Set<ServerEntry> dependees = dao.listSyntaxDependents( oldOid );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -165,12 +164,12 @@
 
 
     public void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
-        ServerEntry entry, boolean cascade ) throws NamingException
+        ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oldOid = getOid( entry );
 
-        Set<ServerSearchResult> dependees = dao.listSyntaxDependents( oldOid );
+        Set<ServerEntry> dependees = dao.listSyntaxDependents( oldOid );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -210,12 +209,12 @@
 
 
     public void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) 
-        throws NamingException
+        throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
         
-        Set<ServerSearchResult> dependees = dao.listSyntaxDependents( oid );
+        Set<ServerEntry> dependees = dao.listSyntaxDependents( oid );
         
         if ( dependees != null && dependees.size() > 0 )
         {
@@ -276,7 +275,7 @@
      * @param syntax the syntax that is to be added to this handler's registries
      * @throws NamingException if there are problems access schema data
      */
-    public void add( Syntax syntax ) throws NamingException
+    public void add( Syntax syntax ) throws Exception
     {
         Schema schema = loader.getSchema( syntax.getSchema() );
         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Wed May 21 13:50:34 2008
@@ -33,12 +33,11 @@
 import java.util.Set;
 import java.util.Stack;
 
-import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
 import org.apache.directory.server.constants.MetaSchemaConstants;
+import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
@@ -103,7 +102,7 @@
     private static Map<String, LdapDN> staticSyntaxCheckersDNs = new HashMap<String, LdapDN>();
     private static Map<String, LdapDN> staticSyntaxesDNs = new HashMap<String, LdapDN>();
     
-    public PartitionSchemaLoader( Partition partition, Registries registries ) throws NamingException
+    public PartitionSchemaLoader( Partition partition, Registries registries ) throws Exception
     {
         this.factory = new SchemaEntityFactory( registries );
         this.partition = partition;
@@ -129,7 +128,7 @@
         initStaticDNs( "inetorgperson" );
     }
     
-    private void initStaticDNs( String schemaName ) throws NamingException
+    private void initStaticDNs( String schemaName ) throws Exception
     {
         
         // Initialize AttributeType Dns
@@ -175,7 +174,7 @@
      * @param targetRegistries
      * @throws NamingException
      */
-    public void loadEnabled( Registries targetRegistries ) throws NamingException
+    public void loadEnabled( Registries targetRegistries ) throws Exception
     {
         /* 
          * We need to load all names and oids into the oid registry regardless of
@@ -197,11 +196,11 @@
          * OID registry.  To prevent this we need to load all the OID's in advance
          * regardless of whether they are used or not.
          */
-        NamingEnumeration<ServerSearchResult> ne = dao.listAllNames();
+        Cursor<ServerEntry> ne = dao.listAllNames();
         
-        while ( ne.hasMore() )
+        while ( ne.next() )
         {
-            ServerEntry entry = ne.next().getServerEntry();
+            ServerEntry entry = ne.get();
             String oid = entry.get( mOidAT ).getString();
             EntryAttribute names = entry.get( mNameAT );
             targetRegistries.getOidRegistry().register( oid, oid );
@@ -243,19 +242,19 @@
      * @return a set of schemas (String names) that depend on the schema
      * @throws NamingException if there are problems searching the schema partition
      */
-    public Set<String> listDependentSchemaNames( String schemaName ) throws NamingException
+    public Set<String> listDependentSchemaNames( String schemaName ) throws Exception
     {
         Set<String> dependees = new HashSet<String>();
-        Set<ServerSearchResult> results = dao.listSchemaDependents( schemaName );
+        Set<ServerEntry> results = dao.listSchemaDependents( schemaName );
         
         if ( results.isEmpty() )
         {
             return dependees;
         }
         
-        for ( ServerSearchResult sr: results )
+        for ( ServerEntry sr: results )
         {
-            EntryAttribute cn = sr.getServerEntry().get( cnAT );
+            EntryAttribute cn = sr.get( cnAT );
             dependees.add( cn.getString() );
         }
         
@@ -271,19 +270,19 @@
      * @return a set of enabled schemas (String names) that depend on the schema
      * @throws NamingException if there are problems searching the schema partition
      */
-    public Set<String> listEnabledDependentSchemaNames( String schemaName ) throws NamingException
+    public Set<String> listEnabledDependentSchemaNames( String schemaName ) throws Exception
     {
         Set<String> dependees = new HashSet<String>();
-        Set<ServerSearchResult> results = dao.listEnabledSchemaDependents( schemaName );
+        Set<ServerEntry> results = dao.listEnabledSchemaDependents( schemaName );
         
         if ( results.isEmpty() )
         {
             return dependees;
         }
         
-        for ( ServerSearchResult sr: results )
+        for ( ServerEntry sr: results )
         {
-            EntryAttribute cn = sr.getServerEntry().get( cnAT );
+            EntryAttribute cn = sr.get( cnAT );
             dependees.add( cn.getString() );
         }
         
@@ -291,31 +290,31 @@
     }
 
     
-    public Map<String,Schema> getSchemas() throws NamingException
+    public Map<String,Schema> getSchemas() throws Exception
     {
         return dao.getSchemas();
     }
 
     
-    public Set<String> getSchemaNames() throws NamingException
+    public Set<String> getSchemaNames() throws Exception
     {
         return dao.getSchemaNames();
     }
     
     
-    public Schema getSchema( String schemaName ) throws NamingException
+    public Schema getSchema( String schemaName ) throws Exception
     {
         return dao.getSchema( schemaName );
     }
 
 
-    public Schema getSchema( String schemaName, Properties schemaProperties ) throws NamingException
+    public Schema getSchema( String schemaName, Properties schemaProperties ) throws Exception
     {
         return getSchema( schemaName );
     }
 
 
-    public final void loadWithDependencies( Collection<Schema> schemas, Registries targetRegistries ) throws NamingException
+    public final void loadWithDependencies( Collection<Schema> schemas, Registries targetRegistries ) throws Exception
     {
         HashMap<String,Schema> notLoaded = new HashMap<String,Schema>();
 
@@ -336,7 +335,7 @@
     /**
      * {@link SchemaLoader#load(Schema, Registries, boolean)}
      */
-    public final void load( Schema schema, Registries targetRegistries, boolean isDepLoad ) throws NamingException
+    public final void load( Schema schema, Registries targetRegistries, boolean isDepLoad ) throws Exception
     {
         // if we're loading a dependency and it has not been enabled on 
         // disk then enable it on disk before we proceed to load it
@@ -400,7 +399,7 @@
     }
 
 
-    private void loadObjectClasses( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadObjectClasses( Schema schema, Registries targetRegistries ) throws Exception
     {
         /**
          * Sometimes search may return child objectClasses before their superiors have
@@ -425,11 +424,11 @@
         
         LOG.debug( "{} schema: loading objectClasses", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -439,7 +438,7 @@
             {
                 targetRegistries.getObjectClassRegistry().register( oc );
             }
-            catch ( NamingException ne )
+            catch ( Exception ne )
             {
                 deferred.add( oc );
             }
@@ -466,13 +465,13 @@
         {
             LOG.debug( "Deferred queue size = {}", deferred.size() );
             ObjectClass oc = deferred.removeFirst();
-            NamingException lastException = null;
+            Exception lastException = null;
             
             try
             {
                 targetRegistries.getObjectClassRegistry().register( oc );
             }
-            catch ( NamingException ne )
+            catch ( Exception ne )
             {
                 deferred.addLast( oc );
                 lastException = ne;
@@ -506,7 +505,7 @@
     }
 
 
-    private void loadAttributeTypes( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadAttributeTypes( Schema schema, Registries targetRegistries ) throws Exception
     {
         LinkedList<AttributeType> deferred = new LinkedList<AttributeType>();
         
@@ -526,11 +525,11 @@
         
         LOG.debug( "{} schema: loading attributeTypes", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+        	ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -539,7 +538,7 @@
             {
                 targetRegistries.getAttributeTypeRegistry().register( at );
             }
-            catch ( NamingException ne )
+            catch ( Exception ne )
             {
                 deferred.add( at );
             }
@@ -566,13 +565,13 @@
         {
             LOG.debug( "Deferred queue size = {}", deferred.size() );
             AttributeType at = deferred.removeFirst();
-            NamingException lastException = null;
+            Exception lastException = null;
             
             try
             {
                 targetRegistries.getAttributeTypeRegistry().register( at );
             }
-            catch ( NamingException ne )
+            catch ( Exception ne )
             {
                 deferred.addLast( at );
                 lastException = ne;
@@ -606,7 +605,7 @@
     }
 
 
-    private void loadMatchingRules( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadMatchingRules( Schema schema, Registries targetRegistries ) throws Exception
     {
         LdapDN dn = staticMatchingRulesDNs.get( schema.getSchemaName() );
         
@@ -624,11 +623,11 @@
         
         LOG.debug( "{} schema: loading matchingRules", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -639,7 +638,7 @@
     }
 
 
-    private void loadSyntaxes( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadSyntaxes( Schema schema, Registries targetRegistries ) throws Exception
     {
         LdapDN dn = staticSyntaxesDNs.get( schema.getSchemaName() );
         
@@ -657,11 +656,11 @@
         
         LOG.debug( "{} schema: loading syntaxes", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -671,7 +670,7 @@
     }
 
 
-    private void loadSyntaxCheckers( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadSyntaxCheckers( Schema schema, Registries targetRegistries ) throws Exception
     {
         LdapDN dn = staticSyntaxCheckersDNs.get( schema.getSchemaName() );
         
@@ -689,11 +688,11 @@
         
         LOG.debug( "{} schema: loading syntaxCheckers", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -705,7 +704,7 @@
     }
 
 
-    private void loadNormalizers( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadNormalizers( Schema schema, Registries targetRegistries ) throws Exception
     {
         LdapDN dn = staticNormalizersDNs.get( schema.getSchemaName() );
         
@@ -723,11 +722,11 @@
         
         LOG.debug( "{} schema: loading normalizers", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -738,7 +737,7 @@
     }
 
 
-    private String getOid( ServerEntry entry ) throws NamingException
+    private String getOid( ServerEntry entry ) throws Exception
     {
         EntryAttribute oid = entry.get( mOidAT );
         
@@ -751,7 +750,7 @@
     }
 
     
-    private NormalizerDescription getNormalizerDescription( String schemaName, ServerEntry entry ) throws NamingException
+    private NormalizerDescription getNormalizerDescription( String schemaName, ServerEntry entry ) throws Exception
     {
         NormalizerDescription description = new NormalizerDescription();
         description.setNumericOid( getOid( entry ) );
@@ -778,12 +777,12 @@
     }
 
     
-    private ServerEntry lookupPartition( LdapDN dn ) throws NamingException
+    private ServerEntry lookupPartition( LdapDN dn ) throws Exception
     {
         return partition.lookup( new LookupOperationContext( registries, dn ) );
     }
     
-    private void loadComparators( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadComparators( Schema schema, Registries targetRegistries ) throws Exception
     {
         LdapDN dn = staticComparatorsDNs.get( schema.getSchemaName() );
         
@@ -801,11 +800,11 @@
         
         LOG.debug( "{} schema: loading comparators", schema.getSchemaName() );
         
-        NamingEnumeration<ServerSearchResult> list = partition.list( new ListOperationContext( registries, dn ) );
+        Cursor<ServerEntry> list = partition.list( new ListOperationContext( registries, dn ) );
         
-        while ( list.hasMore() )
+        while ( list.next() )
         {
-        	ServerSearchResult result = list.next();
+            ServerEntry result = list.get();
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
@@ -816,7 +815,7 @@
     }
 
 
-    private ComparatorDescription getComparatorDescription( String schemaName, ServerEntry entry ) throws NamingException
+    private ComparatorDescription getComparatorDescription( String schemaName, ServerEntry entry ) throws Exception
     {
         ComparatorDescription description = new ComparatorDescription();
         description.setNumericOid( getOid( entry ) );
@@ -845,7 +844,7 @@
 
     
     private SyntaxCheckerDescription getSyntaxCheckerDescription( String schemaName, ServerEntry entry ) 
-        throws NamingException
+        throws Exception
     {
         SyntaxCheckerDescription description = new SyntaxCheckerDescription();
         description.setNumericOid( getOid( entry ) );
@@ -873,7 +872,7 @@
     }
 
     
-    public void loadWithDependencies( Schema schema, Registries registries ) throws NamingException
+    public void loadWithDependencies( Schema schema, Registries registries ) throws Exception
     {
         HashMap<String,Schema> notLoaded = new HashMap<String,Schema>();
         notLoaded.put( schema.getSchemaName(), schema );                        

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java?rev=658861&r1=658860&r2=658861&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java Wed May 21 13:50:34 2008
@@ -26,7 +26,6 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 
-import javax.naming.NamingException;
 import java.util.List;
 
 
@@ -39,20 +38,20 @@
  */
 public interface SchemaChangeHandler
 {
-    void add( LdapDN name, ServerEntry entry ) throws NamingException;
+    void add( LdapDN name, ServerEntry entry ) throws Exception;
     
-    void delete( LdapDN name, ServerEntry entry, boolean cascaded ) throws NamingException;
+    void delete( LdapDN name, ServerEntry entry, boolean cascaded ) throws Exception;
     
-    void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascaded ) throws NamingException;
+    void rename( LdapDN name, ServerEntry entry, Rdn newRdn, boolean cascaded ) throws Exception;
     
     void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry, ServerEntry targetEntry, boolean cascaded ) 
-        throws NamingException;
+        throws Exception;
     
     void modify( LdapDN name, List<Modification> mods, ServerEntry entry, ServerEntry targetEntry, boolean cascaded )
-        throws NamingException;
+        throws Exception;
     
     void move( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn, ServerEntry entry,
-        boolean cascaded ) throws NamingException;
+        boolean cascaded ) throws Exception;
     
-    void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascaded ) throws NamingException;
+    void replace( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascaded ) throws Exception;
 }



Mime
View raw message