directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r811726 [2/3] - in /directory/apacheds/branches/apacheds-schema: core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/java/org/apache/directo...
Date Sat, 05 Sep 2009 23:54:04 GMT
Added: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=811726&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (added)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Sat Sep  5 23:53:58 2009
@@ -0,0 +1,132 @@
+package org.apache.directory.server.core.partition;
+
+
+import java.util.Set;
+
+import org.apache.directory.server.core.entry.ClonedServerEntry;
+import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
+import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
+import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
+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.name.LdapDN;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+
+public interface PartitionNexus extends Partition
+{
+
+    /** the admin super user uid */
+    public static final String ADMIN_UID = "admin";
+    
+    /** the initial admin passwd set on startup */
+    public static final String ADMIN_PASSWORD_STRING = "secret";
+    
+    public static final byte[] ADMIN_PASSWORD_BYTES = StringTools.getBytesUtf8( ADMIN_PASSWORD_STRING );
+
+
+    /**
+     * Get's the RootDSE entry for the DSA.
+     *
+     * @return the attributes of the RootDSE
+     */
+    public ClonedServerEntry getRootDSE( GetRootDSEOperationContext getRootDSEContext );
+
+
+    /**
+     * Add a partition to the server.
+     * 
+     * @param opContext The Add Partition context
+     * @throws Exception If the addition can't be done
+     */
+    public void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception;
+
+
+    /**
+     * Remove a partition from the server.
+     * 
+     * @param opContext The Remove Partition context
+     * @throws Exception If the removal can't be done
+     */
+    public void removeContextPartition( RemoveContextPartitionOperationContext removeContextPartition )
+        throws Exception;
+
+
+    /**
+     * @return The ou=system partition 
+     */
+    public Partition getSystemPartition();
+
+
+    /**
+     * Get's the partition corresponding to a distinguished name.  This 
+     * name need not be the name of the partition suffix.  When used in 
+     * conjunction with get suffix this can properly find the partition 
+     * associated with the DN.  Make sure to use the normalized DN.
+     * 
+     * @param dn the normalized distinguished name to get a partition for
+     * @return the partition containing the entry represented by the dn
+     * @throws Exception if there is no partition for the dn
+     */
+    public Partition getPartition( LdapDN dn ) throws Exception;
+
+
+    /**
+     * Gets the most significant Dn that exists within the server for any Dn.
+     *
+     * @param getMatchedNameContext the context containing the  distinguished name 
+     * to use for matching.
+     * @return a distinguished name representing the matching portion of dn,
+     * as originally provided by the user on creation of the matched entry or 
+     * the empty string distinguished name if no match was found.
+     * @throws Exception if there are any problems
+     */
+    public LdapDN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws Exception;
+
+
+    /**
+     * Gets the distinguished name of the suffix that would hold an entry with
+     * the supplied distinguished name parameter.  If the DN argument does not
+     * fall under a partition suffix then the empty string Dn is returned.
+     *
+     * @param suffixContext the Context containing normalized distinguished
+     * name to use for finding a suffix.
+     * @return the suffix portion of dn, or the valid empty string Dn if no
+     * naming context was found for dn.
+     * @throws Exception if there are any problems
+     */
+    public LdapDN getSuffix( GetSuffixOperationContext getSuffixContext ) throws Exception;
+
+
+    /**
+     * Gets an iteration over the Name suffixes of the partitions managed by this
+     * {@link DefaultPartitionNexus}.
+     *
+     * @return Iteration over ContextPartition suffix names as Names.
+     * @throws Exception if there are any problems
+     */
+    public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws Exception;
+
+
+    /**
+     * Adds a set of supportedExtension (OID Strings) to the RootDSE.
+     * 
+     * @param extensionOids a set of OID strings to add to the supportedExtension 
+     * attribute in the RootDSE
+     */
+    public void registerSupportedExtensions( Set<String> extensionOids ) throws Exception;
+
+
+    /**
+     * Adds a set of supportedSaslMechanisms (OID Strings) to the RootDSE.
+     * 
+     * @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 boolean compare( CompareOperationContext opContext ) throws Exception;
+}
\ No newline at end of file

Added: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaChangeManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaChangeManager.java?rev=811726&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaChangeManager.java (added)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaChangeManager.java Sat Sep  5 23:53:58 2009
@@ -0,0 +1,92 @@
+package org.apache.directory.server.core.schema;
+
+
+import javax.naming.NamingException;
+
+import org.apache.directory.server.core.entry.ClonedServerEntry;
+import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.shared.ldap.entry.ModificationOperation;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.SchemaObject;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+
+
+public interface SchemaChangeManager
+{
+
+    public abstract Registries getGlobalRegistries();
+
+
+    public abstract Registries getRegistries( LdapDN dn );
+
+
+    public abstract void add( AddOperationContext opContext ) throws Exception;
+
+
+    public abstract void delete( DeleteOperationContext opContext, ClonedServerEntry entry, boolean doCascadeDelete )
+        throws Exception;
+
+
+    public abstract void modify( ModifyOperationContext opContext, ModificationOperation modOp, ServerEntry mods,
+        ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws Exception;
+
+
+    public abstract void modify( ModifyOperationContext opContext, ServerEntry entry, ServerEntry targetEntry,
+        boolean doCascadeModify ) throws Exception;
+
+
+    public abstract void modifyRn( RenameOperationContext opContext, ServerEntry entry, boolean doCascadeModify )
+        throws Exception;
+
+
+    public abstract void replace( MoveOperationContext opContext, ServerEntry entry, boolean cascade ) throws Exception;
+
+
+    public abstract void move( MoveAndRenameOperationContext opContext, ServerEntry entry, boolean cascade )
+        throws Exception;
+
+
+    /**
+     * Translates modify operations on schema subentries into one or more operations 
+     * on meta schema entities within the ou=schema partition and updates the registries
+     * accordingly.  This uses direct access to the partition to bypass all interceptors.
+     * 
+     * @param name the name of the subentry
+     * @param mods the modification operations performed on the subentry
+     * @param subentry the attributes of the subentry
+     * @param targetSubentry the target subentry after being modified
+     * @param doCascadeModify determines if a cascading operation should be performed
+     * to effect all dependents on the changed entity
+     * @throws NamingException if the operation fails
+     */
+    public abstract void modifySchemaSubentry( ModifyOperationContext opContext, ServerEntry subentry,
+        ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception;
+
+
+    /**
+     * Translates modify operations on schema subentries into one or more operations 
+     * on meta schema entities within the ou=schema partition and updates the registries
+     * accordingly.  This uses direct access to the partition to bypass all interceptors.
+     * 
+     * @param name the name of the subentry
+     * @param modOp the modification operation performed on the subentry
+     * @param mods the modification operations performed on the subentry
+     * @param subentry the attributes of the subentry
+     * @param targetSubentry the target subentry after being modified
+     * @param doCascadeModify determines if a cascading operation should be performed
+     * to effect all dependents on the changed entity
+     * @throws NamingException if the modify fails
+     */
+    public abstract void modifySchemaSubentry( ModifyOperationContext opContext, LdapDN name, int modOp,
+        ServerEntry mods, ServerEntry subentry, ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception;
+
+
+    public abstract String getSchema( SchemaObject schemaObject );
+
+}
\ No newline at end of file

Copied: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (from r811718, directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?p2=directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java&p1=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java&r1=811718&r2=811726&rev=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sat Sep  5 23:53:58 2009
@@ -20,12 +20,7 @@
 package org.apache.directory.server.core.schema;
 
 
-import java.util.HashSet; 
-import java.util.Map;
-import java.util.Set;
-
 import javax.naming.InvalidNameException;
-import javax.naming.NamingException;
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
@@ -46,15 +41,11 @@
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.server.core.partition.NullPartition;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
-import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.message.control.CascadeControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
-import org.apache.directory.shared.ldap.schema.registries.Schema;
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.schema.loader.ldif.JarLdifSchemaLoader;
 import org.slf4j.Logger;
@@ -115,11 +106,8 @@
     
     /** the registries managed by this SchemaPartition */
     private Registries registries = new Registries();
-    
-    /** the schema loader used: gets swapped out right after init */
-    private SchemaLoader loader = new JarLdifSchemaLoader();
 
-    private SchemaOperationControl schemaManager;
+    private SchemaChangeManager schemaManager;
     
     
     /**
@@ -134,17 +122,25 @@
 
 //        loader.loadWithDependencies( loader.getSchema( MetaSchemaConstants.SCHEMA_NAME ), registries );
 //        loader.loadWithDependencies( loader.getSchema( CoreSchemaConstants.SCHEMA_NAME ), registries );
+        
+        SchemaLoader loader = new JarLdifSchemaLoader();
         loader.loadAllEnabled( registries );  // @TODO remove this once we get the LDIF partition in place
         SerializableComparator.setRegistry( registries.getComparatorRegistry() );
     }
 
     
-    public SchemaOperationControl getSchemaControl()
+    public SchemaChangeManager getSchemaChangeManager()
     {
         return schemaManager;
     }
     
     
+    public void setSchemaChangeManager( SchemaChangeManager schemaManager )
+    {
+        this.schemaManager= schemaManager ;
+    }
+    
+    
     public Registries getRegistries()
     {
         return registries;
@@ -189,12 +185,6 @@
         try
         {
             wrapped.initialize( );
-            PartitionSchemaLoader partitionLoader = new PartitionSchemaLoader( wrapped, registries );
-            partitionLoader.loadAllEnabled( registries );
-            loader = partitionLoader;
-
-            SchemaPartitionDao dao = new SchemaPartitionDao( wrapped, registries );
-            schemaManager = new SchemaOperationControl( registries, partitionLoader, dao );
             
             if ( wrapped instanceof NullPartition )
             {
@@ -202,56 +192,6 @@
                 		"PLEASE REMOVE THIS CONDITION BY USING A VALID SCHEMA PARTITION!!!" );
                 return;
             }
-            
-            // --------------------------------------------------------------------
-            // Make sure all schema with attributes that are indexed are enabled
-            // --------------------------------------------------------------------
-
-            /*
-             * We need to make sure that every attribute indexed by a partition is
-             * loaded into the registries on the next step.  So here we must enable
-             * the schemas of those attributes so they are loaded into the global
-             * registries.
-             */
-            Map<String,Schema> schemaMap = dao.getSchemas();
-            Set<Partition> partitions = new HashSet<Partition>();
-            partitions.add( getDirectoryService().getSystemPartition() );
-            partitions.addAll( getDirectoryService().getPartitions() );
-
-            for ( Partition partition : partitions )
-            {
-                if ( partition instanceof BTreePartition )
-                {
-                    BTreePartition btpconf = ( BTreePartition ) partition;
-                    for ( Index<?,ServerEntry> index : btpconf.getIndexedAttributes() )
-                    {
-                        String schemaName = null;
-                        
-                        try
-                        {
-                            // Try to retrieve the AT in the registries
-                            AttributeType at = registries.getAttributeTypeRegistry().lookup( index.getAttributeId() );
-                            schemaName = dao.findSchema( at.getOid() );
-                        }
-                        catch ( Exception e )
-                        {
-                            // It does not exists: just use the attribute ID
-                            schemaName = dao.findSchema( index.getAttributeId() );
-                        }
-                        
-                        if ( schemaName == null )
-                        {
-                            throw new NamingException( "Index on unidentified attribute: " + index.toString() );
-                        }
-
-                        Schema schema = schemaMap.get( schemaName );
-                        if ( schema.isDisabled() )
-                        {
-                            dao.enableSchema( schemaName );
-                        }
-                    }
-                }
-            }
         }
         catch ( Exception e )
         {

Added: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=811726&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (added)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sat Sep  5 23:53:58 2009
@@ -0,0 +1,63 @@
+package org.apache.directory.server.core.schema;
+
+
+import javax.naming.NamingException;
+
+import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+
+
+public interface SchemaService
+{
+
+    /**
+     * Tells if the given DN is the schemaSubentry DN
+     * 
+     * @param dnString The DN we want to check
+     * @return <code>true</code> if the given DN is the Schema subentry DN
+     * @throws NamingException If the given DN is not valid
+     */
+    public abstract boolean isSchemaSubentry( String dnString ) throws NamingException;
+
+
+    /**
+     * @return the registries loaded from schemaPartition
+     */
+    public abstract Registries getRegistries();
+
+
+    public abstract SchemaPartition getSchemaPartition();
+
+
+    public abstract void setSchemaPartition( SchemaPartition schemaPartition );
+
+
+    /**
+     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
+     *
+     * @return the schemaSubentry
+     * @throws NamingException if there is a failure to access schema timestamps
+     */
+    public abstract ServerEntry getSubschemaEntryImmutable() throws Exception;
+
+
+    /**
+     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
+     *
+     * @return the schemaSubentry
+     * @throws NamingException if there is a failure to access schema timestamps
+     */
+    public abstract ServerEntry getSubschemaEntryCloned() throws Exception;
+
+
+    /**
+     * Gets the schemaSubentry based on specific search id parameters which
+     * include the special '*' and '+' operators.
+     *
+     * @param ids the ids of the attributes that should be returned from a search
+     * @return the subschema entry with the ids provided
+     * @throws NamingException if there are failures during schema info access
+     */
+    public abstract ServerEntry getSubschemaEntry( String[] ids ) throws Exception;
+
+}
\ No newline at end of file

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Sat Sep  5 23:53:58 2009
@@ -34,7 +34,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Sat Sep  5 23:53:58 2009
@@ -26,7 +26,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;

Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat Sep  5 23:53:58 2009
@@ -23,8 +23,8 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.OperationManager;
-import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;

Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sat Sep  5 23:53:58 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.event.DirectoryListener;

Modified: directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Sat Sep  5 23:53:58 2009
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ServerBinaryValue;
 import org.apache.directory.server.core.entry.ServerStringValue;
 import org.apache.directory.server.core.interceptor.context.CompareOperationContext;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Sat Sep  5 23:53:58 2009
@@ -29,8 +29,7 @@
 import javax.naming.ldap.Control;
 
 import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.DefaultDirectoryService.LogChange;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.changelog.LogChange;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerBinaryValue;
 import org.apache.directory.server.core.entry.ServerEntry;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Sep  5 23:53:58 2009
@@ -22,7 +22,6 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.authn.AuthenticationInterceptor;
-import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
 import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
 import org.apache.directory.server.core.changelog.ChangeLog;
@@ -52,11 +51,13 @@
 import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 
 import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexus;
 
 import org.apache.directory.server.core.referral.ReferralInterceptor;
 import org.apache.directory.server.core.replication.ReplicationConfiguration;
 import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.schema.DefaultSchemaService;
 import org.apache.directory.server.core.schema.SchemaService;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.core.subtree.SubentryInterceptor;
@@ -115,7 +116,7 @@
     private SchemaService schemaService;
     
     /** the root nexus */
-    private PartitionNexus partitionNexus;
+    private DefaultPartitionNexus partitionNexus;
 
     /** whether or not server is started for the first time */
     private boolean firstStart;
@@ -167,13 +168,6 @@
             "all taken into account";
 
     
-    /** A structure telling the changeLog what to do with the incoming change */
-    public enum LogChange
-    {
-        TRUE,  // The change must me stored 
-        FALSE  // The change must not be stred
-    };
-    
     /** The delay to wait between each sync on disk */
     private long syncPeriodMillis;
     
@@ -296,7 +290,7 @@
         journal = new DefaultJournal();
         syncPeriodMillis = DEFAULT_SYNC_PERIOD;
         csnFactory = new CsnFactory( replicaId );
-        schemaService = new SchemaService();
+        schemaService = new DefaultSchemaService();
     }
 
 
@@ -1035,7 +1029,7 @@
     }
 
 
-    public PartitionNexus getPartitionNexus()
+    public DefaultPartitionNexus getPartitionNexus()
     {
         return partitionNexus;
     }
@@ -1421,7 +1415,7 @@
         adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), this );
         
         // @TODO - NOTE: Need to find a way to instantiate without dependency on DPN
-        partitionNexus = new PartitionNexus( new DefaultServerEntry( getRegistries(), LdapDN.EMPTY_LDAPDN ) );
+        partitionNexus = new DefaultPartitionNexus( new DefaultServerEntry( getRegistries(), LdapDN.EMPTY_LDAPDN ) );
         partitionNexus.initialize( );
         partitionNexus.addContextPartition( new AddContextPartitionOperationContext( adminSession, schemaService.getSchemaPartition() ) );
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Sat Sep  5 23:53:58 2009
@@ -19,7 +19,8 @@
  */
 package org.apache.directory.server.core;
 
-import java.util.Set;
+
+import java.util.Set; 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.naming.NamingException;
@@ -37,6 +38,7 @@
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 
+
 /**
  * Implement a referral Manager, handling the requests from the LDAP protocol.
  * <br>

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AnonymousAuthenticator.java Sat Sep  5 23:53:58 2009
@@ -22,6 +22,7 @@
 
 import javax.naming.NamingException;
 
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sat Sep  5 23:53:58 2009
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Sat Sep  5 23:53:58 2009
@@ -23,13 +23,14 @@
 import javax.naming.Context;
 
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
 /**
- * Authenticates users who access {@link PartitionNexus}.
+ * Authenticates users who access {@link DefaultPartitionNexus}.
  * <p>
  * {@link Authenticator}s are registered to and configured by
  * {@link AuthenticationInterceptor} interceptor.

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Sat Sep  5 23:53:58 2009
@@ -34,6 +34,7 @@
 import javax.naming.NamingException;
 
 import org.apache.commons.collections.map.LRUMap;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
 import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
 import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java Sat Sep  5 23:53:58 2009
@@ -22,6 +22,7 @@
 
 import javax.naming.NamingException;
 
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sat Sep  5 23:53:58 2009
@@ -34,7 +34,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.authz.support.ACDFEngine;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Sat Sep  5 23:53:58 2009
@@ -30,7 +30,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilter;
@@ -48,6 +48,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -63,7 +64,7 @@
 
 
 /**
- * An {@link Interceptor} that controls access to {@link PartitionNexus}.
+ * An {@link Interceptor} that controls access to {@link DefaultPartitionNexus}.
  * If a user tries to perform any operations that requires
  * permission he or she doesn't have, {@link NoPermissionException} will be
  * thrown and therefore the current invocation chain will terminate.

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Sat Sep  5 23:53:58 2009
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.slf4j.Logger;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Sat Sep  5 23:53:58 2009
@@ -36,7 +36,7 @@
 import java.util.Properties;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.ListCursor;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Sat Sep  5 23:53:58 2009
@@ -19,7 +19,7 @@
 package org.apache.directory.server.core.journal;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java Sat Sep  5 23:53:58 2009
@@ -29,7 +29,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sat Sep  5 23:53:58 2009
@@ -43,7 +43,7 @@
 import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
-import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -65,7 +65,7 @@
 /**
  * A name normalization service.  This service makes sure all relative and distinguished
  * names are normalized before calls are made against the respective interface methods
- * on {@link PartitionNexus}.
+ * on {@link DefaultPartitionNexus}.
  * 
  * The Filters are also normalized.
  * 

Copied: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (from r811718, directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?p2=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java&p1=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java&r1=811718&r2=811726&rev=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sat Sep  5 23:53:58 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
@@ -113,10 +113,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class PartitionNexus implements Partition
+public class DefaultPartitionNexus implements Partition, PartitionNexus
 {
     /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( PartitionNexus.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DefaultPartitionNexus.class );
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
@@ -124,13 +124,6 @@
     /** the vendorName string proudly set to: Apache Software Foundation*/
     private static final String ASF = "Apache Software Foundation";
 
-    /** the admin super user uid */
-    public static final String ADMIN_UID = "admin";
-    
-    /** the initial admin passwd set on startup */
-    public static final String ADMIN_PASSWORD_STRING = "secret";
-    public static final byte[] ADMIN_PASSWORD_BYTES = StringTools.getBytesUtf8( ADMIN_PASSWORD_STRING );
-    
     /** the read only rootDSE attributes */
     private final ServerEntry rootDSE;
 
@@ -166,7 +159,7 @@
      * @param rootDSE the root entry for the DSA
      * @throws javax.naming.Exception on failure to initialize
      */
-    public PartitionNexus( ServerEntry rootDSE ) throws Exception
+    public DefaultPartitionNexus( ServerEntry rootDSE ) throws Exception
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
@@ -216,8 +209,8 @@
     }
 
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#initialize()
      */
     public void initialize( ) throws Exception
     {
@@ -368,8 +361,8 @@
     }
     
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#destroy()
      */
     public synchronized void destroy()
     {
@@ -401,10 +394,8 @@
     }
 
 
-    /**
-     * Always returns the string "NEXUS".
-     *
-     * @return the string "NEXUS"
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getId()
      */
     public String getId()
     {
@@ -412,10 +403,8 @@
     }
 
 
-    /**
-     * Not supported!
-     *
-     * @throws UnsupportedOperationException everytime
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#setId(java.lang.String)
      */
     public void setId( String id )
     {
@@ -423,8 +412,8 @@
     }
 
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getRegistries()
      */
     public Registries getRegistries()
     {
@@ -432,8 +421,8 @@
     }
     
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#setRegistries(org.apache.directory.shared.ldap.schema.registries.Registries)
      */
     public void setRegistries( Registries registries )
     {
@@ -441,9 +430,8 @@
     }
     
     
-    /**
-     * Always returns the empty String "".
-     * @return the empty String ""
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getSuffixDn()
      */
     public LdapDN getSuffixDn()
     {
@@ -451,15 +439,17 @@
     }
 
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getSuffix()
+     */
     public String getSuffix()
     {
         return StringTools.EMPTY;
     }
     
     
-    /**
-     * Unsupported operation on the Nexus.
-     * @throws UnsupportedOperationException everytime
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#setSuffix(java.lang.String)
      */
     public void setSuffix( String suffix )
     {
@@ -467,8 +457,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#isInitialized()
      */
     public boolean isInitialized()
     {
@@ -476,8 +466,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#sync()
      */
     public void sync() throws Exception
     {
@@ -512,8 +502,8 @@
     // ------------------------------------------------------------------------
     // DirectoryPartition Interface Method Implementations
     // ------------------------------------------------------------------------
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#add(org.apache.directory.server.core.interceptor.context.AddOperationContext)
      */
     public void add( AddOperationContext addContext ) throws Exception
     {
@@ -522,8 +512,8 @@
     }
     
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#bind(org.apache.directory.server.core.interceptor.context.BindOperationContext)
      */
     public void bind( BindOperationContext bindContext ) throws Exception
     {
@@ -532,14 +522,8 @@
     }
 
     
-    /**
-     * Performs a comparison check to see if an attribute of an entry has
-     * a specified value.
-     *
-     * @param compareContext the context used to compare
-     * @return true if the entry contains an attribute with the value, false otherwise
-     * @throws Exception if there is a problem accessing the entry and its values
-     * @throws Exception 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#compare(org.apache.directory.server.core.interceptor.context.CompareOperationContext)
      */
     public boolean compare( CompareOperationContext compareContext ) throws Exception
     {
@@ -593,8 +577,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext)
      */
     public void delete( DeleteOperationContext deleteContext ) throws Exception
     {
@@ -603,8 +587,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#hasEntry(org.apache.directory.server.core.interceptor.context.EntryOperationContext)
      */
     public boolean hasEntry( EntryOperationContext opContext ) throws Exception
     {
@@ -625,8 +609,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#list(org.apache.directory.server.core.interceptor.context.ListOperationContext)
      */
     public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
     {
@@ -635,8 +619,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#lookup(org.apache.directory.server.core.interceptor.context.LookupOperationContext)
      */
     public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
     {
@@ -671,8 +655,8 @@
     }
 
 
-    /**
-     * Not Implemented. This method is only available for backend Partitions.
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#lookup(java.lang.Long)
      */
     public ClonedServerEntry lookup( Long id ) throws Exception
     {
@@ -682,8 +666,8 @@
     }
 
     
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#modify(org.apache.directory.server.core.interceptor.context.ModifyOperationContext)
      */
     public void modify( ModifyOperationContext modifyContext ) throws Exception
     {
@@ -698,8 +682,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#move(org.apache.directory.server.core.interceptor.context.MoveOperationContext)
      */
     public void move( MoveOperationContext opContext ) throws Exception
     {
@@ -708,8 +692,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#moveAndRename(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext)
      */
     public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
     {
@@ -718,8 +702,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#rename(org.apache.directory.server.core.interceptor.context.RenameOperationContext)
      */
     public void rename( RenameOperationContext opContext ) throws Exception
     {
@@ -728,8 +712,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext)
      */
     public EntryFilteringCursor search( SearchOperationContext opContext )
         throws Exception
@@ -859,8 +843,8 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext)
      */
     public void unbind( UnbindOperationContext unbindContext ) throws Exception
     {
@@ -869,10 +853,8 @@
     }
 
 
-    /**
-     * Get's the RootDSE entry for the DSA.
-     *
-     * @return the attributes of the RootDSE
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getRootDSE(org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext)
      */
     public ClonedServerEntry getRootDSE( GetRootDSEOperationContext getRootDSEContext )
     {
@@ -880,11 +862,8 @@
     }
 
 
-    /**
-     * Add a partition to the server.
-     * 
-     * @param opContext The Add Partition context
-     * @throws Exception If the addition can't be done
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#addContextPartition(org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext)
      */
     public synchronized void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception
     {
@@ -931,11 +910,8 @@
     }
 
 
-    /**
-     * Remove a partition from the server.
-     * 
-     * @param opContext The Remove Partition context
-     * @throws Exception If the removal can't be done
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#removeContextPartition(org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext)
      */
     public synchronized void removeContextPartition( RemoveContextPartitionOperationContext removeContextPartition ) throws Exception
     {
@@ -980,8 +956,8 @@
     }
 
 
-    /**
-     * @return The ou=system partition 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getSystemPartition()
      */
     public Partition getSystemPartition()
     {
@@ -989,15 +965,8 @@
     }
 
 
-    /**
-     * Get's the partition corresponding to a distinguished name.  This 
-     * name need not be the name of the partition suffix.  When used in 
-     * conjunction with get suffix this can properly find the partition 
-     * associated with the DN.  Make sure to use the normalized DN.
-     * 
-     * @param dn the normalized distinguished name to get a partition for
-     * @return the partition containing the entry represented by the dn
-     * @throws Exception if there is no partition for the dn
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.name.LdapDN)
      */
     public Partition getPartition( LdapDN dn ) throws Exception
     {
@@ -1014,15 +983,8 @@
     }
 
 
-    /**
-     * Gets the most significant Dn that exists within the server for any Dn.
-     *
-     * @param getMatchedNameContext the context containing the  distinguished name 
-     * to use for matching.
-     * @return a distinguished name representing the matching portion of dn,
-     * as originally provided by the user on creation of the matched entry or 
-     * the empty string distinguished name if no match was found.
-     * @throws Exception if there are any problems
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getMatchedName(org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext)
      */
     public LdapDN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws Exception
     {
@@ -1042,16 +1004,8 @@
     }
 
 
-    /**
-     * Gets the distinguished name of the suffix that would hold an entry with
-     * the supplied distinguished name parameter.  If the DN argument does not
-     * fall under a partition suffix then the empty string Dn is returned.
-     *
-     * @param suffixContext the Context containing normalized distinguished
-     * name to use for finding a suffix.
-     * @return the suffix portion of dn, or the valid empty string Dn if no
-     * naming context was found for dn.
-     * @throws Exception if there are any problems
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#getSuffix(org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext)
      */
     public LdapDN getSuffix( GetSuffixOperationContext getSuffixContext ) throws Exception
     {
@@ -1060,12 +1014,8 @@
     }
 
 
-    /**
-     * Gets an iteration over the Name suffixes of the partitions managed by this
-     * {@link PartitionNexus}.
-     *
-     * @return Iteration over ContextPartition suffix names as Names.
-     * @throws Exception if there are any problems
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#listSuffixes(org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext)
      */
     public Set<String> listSuffixes( ListSuffixOperationContext emptyContext ) throws Exception
     {
@@ -1073,11 +1023,8 @@
     }
 
 
-    /**
-     * Adds a set of supportedExtension (OID Strings) to the RootDSE.
-     * 
-     * @param extensionOids a set of OID strings to add to the supportedExtension 
-     * attribute in the RootDSE
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#registerSupportedExtensions(java.util.Set)
      */
     public void registerSupportedExtensions( Set<String> extensionOids ) throws Exception
     {
@@ -1096,11 +1043,8 @@
     }
 
 
-    /**
-     * Adds a set of supportedSaslMechanisms (OID Strings) to the RootDSE.
-     * 
-     * @param extensionOids a set of OID strings to add to the supportedSaslMechanisms 
-     * attribute in the RootDSE
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.PartitionNexus#registerSupportedSaslMechanisms(java.util.Set)
      */
     public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws Exception
     {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sat Sep  5 23:53:58 2009
@@ -67,9 +67,6 @@
 {
     private static final Logger LOG = LoggerFactory.getLogger( ReferralInterceptor.class );
 
-    /** The directoryService */
-    private DirectoryService directoryService;
-    
     private PartitionNexus nexus;
 
     /** The attributeType registry */
@@ -210,7 +207,6 @@
         nexus = directoryService.getPartitionNexus();
         registries = directoryService.getRegistries();
         atRegistry = registries.getAttributeTypeRegistry();
-        this.directoryService = directoryService;
 
         // Initialize the referralManager
         referralManager = new ReferralManagerImpl( directoryService );

Copied: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaChangeManager.java (from r811718, directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaChangeManager.java?p2=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaChangeManager.java&p1=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java&r1=811718&r2=811726&rev=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaChangeManager.java Sat Sep  5 23:53:58 2009
@@ -20,8 +20,7 @@
 package org.apache.directory.server.core.schema;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.ArrayList; 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -30,16 +29,11 @@
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.authn.AuthenticationInterceptor;
-import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
-import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
-import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerModification;
-import org.apache.directory.server.core.exception.ExceptionInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
@@ -47,7 +41,7 @@
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
-import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -97,9 +91,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaOperationControl
+public class DefaultSchemaChangeManager implements SchemaChangeManager
 {
-    private static final Logger LOG = LoggerFactory.getLogger( SchemaOperationControl.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DefaultSchemaChangeManager.class );
 
     // indices of handlers and object ids into arrays
     private static final int COMPARATOR_INDEX = 0;
@@ -141,7 +135,6 @@
         "metaDITContentRule",
         "metaNameForm"
     };
-    private static final java.util.Collection<String> SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS;
 
     private final MetaSchemaHandler metaSchemaHandler;
     private final Registries registries;
@@ -176,25 +169,10 @@
         VALID_OU_VALUES.add( SchemaConstants.NAME_FORMS_AT.toLowerCase() );
         VALID_OU_VALUES.add( SchemaConstants.DIT_CONTENT_RULES_AT.toLowerCase() );
         VALID_OU_VALUES.add( SchemaConstants.DIT_STRUCTURE_RULES_AT.toLowerCase() );
-        
-        HashSet<String> c = new HashSet<String>();
-        c.add( NormalizationInterceptor.class.getName() );
-        c.add( AuthenticationInterceptor.class.getName() );
-        c.add( AciAuthorizationInterceptor.class.getName() );
-        c.add( DefaultAuthorizationInterceptor.class.getName() );
-        c.add( ExceptionInterceptor.class.getName() );
-//        c.add( ChangeLogInterceptor.class.getName() );
-//        c.add( OperationalAttributeInterceptor.class.getName() );
-        c.add( SchemaInterceptor.class.getName() );
-//        c.add( SubentryInterceptor.class.getName() );
-        c.add( CollectiveAttributeInterceptor.class.getName() );
-//        c.add( EventInterceptor.class.getName() );
-//        c.add( TriggerInterceptor.class.getName() );
-        SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS = Collections.unmodifiableCollection( c );
     }
 
 
-    public SchemaOperationControl( Registries registries, PartitionSchemaLoader loader, SchemaPartitionDao dao )
+    public DefaultSchemaChangeManager( Registries registries, PartitionSchemaLoader loader, SchemaPartitionDao dao )
         throws Exception
     {
         this.registries = registries;
@@ -275,12 +253,18 @@
     }
     
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#getGlobalRegistries()
+     */
     public Registries getGlobalRegistries()
     {
         return registries;
     }
     
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#getRegistries(org.apache.directory.shared.ldap.name.LdapDN)
+     */
     public Registries getRegistries( LdapDN dn )
     {
         LOG.error( "Ignoring request for specific registries under dn {}", dn );
@@ -288,6 +272,9 @@
     }
 
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#add(org.apache.directory.server.core.interceptor.context.AddOperationContext)
+     */
     public void add( AddOperationContext opContext ) throws Exception
     {
         EntryAttribute oc = opContext.getEntry().get( objectClassAT );
@@ -337,6 +324,9 @@
     }
     
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext, org.apache.directory.server.core.entry.ClonedServerEntry, boolean)
+     */
     public void delete( DeleteOperationContext opContext, ClonedServerEntry entry, boolean doCascadeDelete ) 
         throws Exception
     {
@@ -386,6 +376,9 @@
     }
     
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modify(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.entry.ModificationOperation, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     */
     public void modify( ModifyOperationContext opContext, ModificationOperation modOp, ServerEntry mods, 
         ServerEntry entry, ServerEntry targetEntry, boolean cascade ) throws Exception
     {
@@ -415,6 +408,9 @@
     }
 
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modify(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     */
     public void modify( ModifyOperationContext opContext, ServerEntry entry, 
         ServerEntry targetEntry, boolean doCascadeModify ) throws Exception
     {
@@ -451,6 +447,9 @@
     }
 
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifyRn(org.apache.directory.server.core.interceptor.context.RenameOperationContext, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     */
     public void modifyRn( RenameOperationContext opContext, ServerEntry entry, boolean doCascadeModify ) 
         throws Exception
     {
@@ -480,6 +479,9 @@
     }
 
 
+    /* (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.ServerEntry, boolean)
+     */
     public void replace( MoveOperationContext opContext, ServerEntry entry, boolean cascade ) throws Exception
     {
         EntryAttribute oc = entry.get( objectClassAT );
@@ -508,6 +510,9 @@
     }
 
 
+    /* (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.ServerEntry, boolean)
+     */
     public void move( MoveAndRenameOperationContext opContext, ServerEntry entry, boolean cascade ) throws Exception
     {
         EntryAttribute oc = entry.get( objectClassAT );
@@ -538,18 +543,8 @@
     }
 
     
-    /**
-     * Translates modify operations on schema subentries into one or more operations 
-     * on meta schema entities within the ou=schema partition and updates the registries
-     * accordingly.  This uses direct access to the partition to bypass all interceptors.
-     * 
-     * @param name the name of the subentry
-     * @param mods the modification operations performed on the subentry
-     * @param subentry the attributes of the subentry
-     * @param targetSubentry the target subentry after being modified
-     * @param doCascadeModify determines if a cascading operation should be performed
-     * to effect all dependents on the changed entity
-     * @throws NamingException if the operation fails
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
      */
     public void modifySchemaSubentry( ModifyOperationContext opContext, 
         ServerEntry subentry, ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception 
@@ -591,19 +586,8 @@
     }
     
     
-    /**
-     * Translates modify operations on schema subentries into one or more operations 
-     * on meta schema entities within the ou=schema partition and updates the registries
-     * accordingly.  This uses direct access to the partition to bypass all interceptors.
-     * 
-     * @param name the name of the subentry
-     * @param modOp the modification operation performed on the subentry
-     * @param mods the modification operations performed on the subentry
-     * @param subentry the attributes of the subentry
-     * @param targetSubentry the target subentry after being modified
-     * @param doCascadeModify determines if a cascading operation should be performed
-     * to effect all dependents on the changed entity
-     * @throws NamingException if the modify fails
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.LdapDN, int, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
      */
     public void modifySchemaSubentry( ModifyOperationContext opContext, LdapDN name, int modOp, ServerEntry mods, 
         ServerEntry subentry, ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception
@@ -646,6 +630,9 @@
     }
 
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#getSchema(org.apache.directory.shared.ldap.schema.SchemaObject)
+     */
     public String getSchema( SchemaObject schemaObject ) 
     {
         if ( schemaObject.getExtensions().containsKey( MetaSchemaConstants.X_SCHEMA ) )
@@ -963,6 +950,6 @@
         LdapDN name = new LdapDN( ServerDNConstants.SCHEMA_TIMESTAMP_ENTRY_DN );
         name.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         
-        opContext.modify( name, mods, SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS );
+        opContext.modify( name, mods, ByPassConstants.SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS );
     }
 }

Copied: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (from r811718, directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?p2=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java&p1=directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java&r1=811718&r2=811726&rev=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sat Sep  5 23:53:58 2009
@@ -56,7 +56,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaService
+public class DefaultSchemaService implements SchemaService
 {
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
@@ -73,18 +73,25 @@
     private LdapDN schemaModificationAttributesDN;
 
     
-    public SchemaService() throws Exception
+    public DefaultSchemaService() throws Exception
     {
         schemaPartition = new SchemaPartition();
     }
     
+    
+    public void initialize() throws Exception
+    {
+        PartitionSchemaLoader partitionLoader = new PartitionSchemaLoader( schemaPartition, schemaPartition.getRegistries() );
+        partitionLoader.loadAllEnabled( schemaPartition.getRegistries() );
 
-    /**
-     * Tells if the given DN is the schemaSubentry DN
-     * 
-     * @param dnString The DN we want to check
-     * @return <code>true</code> if the given DN is the Schema subentry DN
-     * @throws NamingException If the given DN is not valid
+        SchemaPartitionDao dao = new SchemaPartitionDao( schemaPartition, schemaPartition.getRegistries() );
+        SchemaChangeManager schemaManager = new DefaultSchemaChangeManager( schemaPartition.getRegistries(), partitionLoader, dao );
+        schemaPartition.setSchemaChangeManager( schemaManager );
+    }
+    
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#isSchemaSubentry(java.lang.String)
      */
     public boolean isSchemaSubentry( String dnString ) throws NamingException
     {
@@ -99,8 +106,8 @@
     }
 
 
-    /**
-     * @return the registries loaded from schemaPartition
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#getRegistries()
      */
     public final Registries getRegistries()
     {
@@ -108,12 +115,18 @@
     }
     
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#getSchemaPartition()
+     */
     public SchemaPartition getSchemaPartition()
     {
         return schemaPartition;
     }
     
     
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#setSchemaPartition(org.apache.directory.server.core.schema.SchemaPartition)
+     */
     public void setSchemaPartition( SchemaPartition schemaPartition )
     {
         this.schemaPartition = schemaPartition;
@@ -391,11 +404,8 @@
     }
 
 
-    /**
-     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
-     *
-     * @return the schemaSubentry
-     * @throws NamingException if there is a failure to access schema timestamps
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#getSubschemaEntryImmutable()
      */
     public ServerEntry getSubschemaEntryImmutable() throws Exception
     {
@@ -409,11 +419,8 @@
     }
 
 
-    /**
-     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
-     *
-     * @return the schemaSubentry
-     * @throws NamingException if there is a failure to access schema timestamps
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#getSubschemaEntryCloned()
      */
     public ServerEntry getSubschemaEntryCloned() throws Exception
     {
@@ -427,13 +434,8 @@
     }
 
 
-    /**
-     * Gets the schemaSubentry based on specific search id parameters which
-     * include the special '*' and '+' operators.
-     *
-     * @param ids the ids of the attributes that should be returned from a search
-     * @return the subschema entry with the ids provided
-     * @throws NamingException if there are failures during schema info access
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.schema.SchemaService#getSubschemaEntry(java.lang.String[])
      */
     public ServerEntry getSubschemaEntry( String[] ids ) throws Exception
     {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat Sep  5 23:53:58 2009
@@ -165,7 +165,7 @@
      */
     private LdapDN schemaModificationAttributesDN;
 
-    private SchemaOperationControl schemaManager;
+    private SchemaChangeManager schemaManager;
 
     private SchemaService schemaService;
 
@@ -210,7 +210,7 @@
         schemaBaseDN = new LdapDN( ServerDNConstants.OU_SCHEMA_DN );
         schemaBaseDN.normalize( atRegistry.getNormalizerMapping() );
         schemaService = directoryService.getSchemaService();
-        schemaManager = schemaService.getSchemaPartition().getSchemaControl();
+        schemaManager = schemaService.getSchemaPartition().getSchemaChangeManager();
 
         // stuff for dealing with subentries (garbage for now)
         Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Sat Sep  5 23:53:58 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sat Sep  5 23:53:58 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.DefaultServerEntry;

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=811726&r1=811725&r2=811726&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sat Sep  5 23:53:58 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;



Mime
View raw message