directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r764131 [2/16] - in /directory: apacheds/trunk/ apacheds/trunk/core-avl/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ apached...
Date Sat, 11 Apr 2009 01:03:25 GMT

Propchange: directory/apacheds/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Apr 11 01:03:00 2009
@@ -0,0 +1 @@
+/directory/apacheds/branches/apacheds-replication:749790-764110

Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Sat Apr 11 01:03:00 2009
@@ -34,9 +34,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-      <artifactId>apacheds-core-cursor</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <version>${org.apache.directory.shared.version}</version>
+      <artifactId>shared-cursor</artifactId>
     </dependency>
   </dependencies>
   

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java Sat Apr 11 01:03:00 2009
@@ -19,9 +19,10 @@
  */
 package org.apache.directory.server.core.avltree;
 
+import org.apache.directory.shared.ldap.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+
 
-import org.apache.directory.server.core.cursor.AbstractCursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 
 
 /**

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java Sat Apr 11 01:03:00 2009
@@ -20,12 +20,15 @@
 package org.apache.directory.server.core.avltree;
 
 
-import static org.junit.Assert.*;
-
 import java.util.Comparator;
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 
 /**

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat Apr 11 01:03:00 2009
@@ -25,8 +25,6 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.OperationManager;
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.cursor.EmptyCursor;
-import org.apache.directory.server.core.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
@@ -52,6 +50,8 @@
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
+import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;

Modified: directory/apacheds/trunk/core-splay/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-splay/pom.xml?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core-splay/pom.xml (original)
+++ directory/apacheds/trunk/core-splay/pom.xml Sat Apr 11 01:03:00 2009
@@ -34,9 +34,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
-      <artifactId>apacheds-core-cursor</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <version>${org.apache.directory.shared.version}</version>
+      <artifactId>shared-cursor</artifactId>
     </dependency>
   </dependencies>
   

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Sat Apr 11 01:03:00 2009
@@ -117,6 +117,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <version>${org.apache.directory.shared.version}</version>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
     </dependency>

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/CoreSession.java Sat Apr 11 01:03:00 2009
@@ -37,14 +37,14 @@
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -250,21 +250,21 @@
      * Adds an entry into the DirectoryService associated with this CoreSession.
      * The entry is built using the received AddRequest.
      * 
-     * @param AddRequest the request to execute
+     * @param InternalAddRequest the request to execute
      * @exception Exception on failures to add the entry
      */
-    void add( AddRequest addRequest ) throws Exception;
+    void add( InternalAddRequest addRequest ) throws Exception;
     
     
     /**
      * Adds an entry into the DirectoryService associated with this CoreSession.
      * The entry is built using the received AddRequest.
      * 
-     * @param AddRequest the request to execute
+     * @param InternalAddRequest the request to execute
      * @param log a flag set if the added entry should be stored in the changeLog
      * @exception Exception on failures to add the entry
      */
-    void add( AddRequest addRequest, LogChange log ) throws Exception;
+    void add( InternalAddRequest addRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -298,7 +298,7 @@
      * @param compareRequest the received request
      * @throws Exception if there are failures while comparing
      */
-    boolean compare( CompareRequest compareRequest ) throws Exception;
+    boolean compare( InternalCompareRequest compareRequest ) throws Exception;
 
     
     /**
@@ -320,10 +320,10 @@
     void delete( LdapDN dn, LogChange log ) throws Exception;
     
     
-    void delete( DeleteRequest deleteRequest ) throws Exception;
+    void delete( InternalDeleteRequest deleteRequest ) throws Exception;
     
     
-    void delete( DeleteRequest deleteRequest, LogChange log ) throws Exception;
+    void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws Exception;
 
     
     /**
@@ -429,10 +429,10 @@
     void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
-    void modify( ModifyRequest modifyRequest ) throws Exception;
+    void modify( InternalModifyRequest modifyRequest ) throws Exception;
     
     
-    void modify( ModifyRequest modifyRequest, LogChange log ) throws Exception;
+    void modify( InternalModifyRequest modifyRequest, LogChange log ) throws Exception;
 
     
     /**
@@ -489,7 +489,7 @@
      * @param modifyDnRequest The ModifyDN request
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void move( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -499,7 +499,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -573,7 +573,7 @@
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -584,7 +584,7 @@
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -657,7 +657,7 @@
      * @param modifyDnRequest The requested modification
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void rename( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -667,7 +667,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -770,11 +770,11 @@
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
 
 
-    EntryFilteringCursor search( SearchRequest searchRequest ) throws Exception;
+    EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws Exception;
 
 
     void unbind() throws Exception;
     
     
-    void unbind( UnbindRequest unbindRequest ) throws Exception;
+    void unbind( InternalUnbindRequest unbindRequest ) throws Exception;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Sat Apr 11 01:03:00 2009
@@ -57,14 +57,14 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -164,7 +164,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void add( AddRequest addRequest ) throws Exception
+    public void add( InternalAddRequest addRequest ) throws Exception
     {
         add( addRequest, LogChange.TRUE );
     }
@@ -173,7 +173,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void add( AddRequest addRequest, LogChange log ) throws Exception
+    public void add( InternalAddRequest addRequest, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, addRequest );
 
@@ -765,7 +765,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean compare( CompareRequest compareRequest ) throws Exception
+    public boolean compare( InternalCompareRequest compareRequest ) throws Exception
     {
         CompareOperationContext opContext = new CompareOperationContext( this, compareRequest );
         OperationManager operationManager = directoryService.getOperationManager();
@@ -778,7 +778,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( DeleteRequest deleteRequest ) throws Exception
+    public void delete( InternalDeleteRequest deleteRequest ) throws Exception
     {
         delete( deleteRequest, LogChange.TRUE );
     }
@@ -787,7 +787,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( DeleteRequest deleteRequest, LogChange log ) throws Exception
+    public void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws Exception
     {
         DeleteOperationContext opContext = new DeleteOperationContext( this, deleteRequest );
         
@@ -810,7 +810,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( ModifyRequest modifyRequest ) throws Exception
+    public void modify( InternalModifyRequest modifyRequest ) throws Exception
     {
         modify( modifyRequest, LogChange.TRUE );
     }
@@ -819,7 +819,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( ModifyRequest modifyRequest, LogChange log ) throws Exception
+    public void modify( InternalModifyRequest modifyRequest, LogChange log ) throws Exception
     {
         ModifyOperationContext opContext = new ModifyOperationContext( this, modifyRequest );
 
@@ -834,7 +834,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void move( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         move( modifyDnRequest, LogChange.TRUE );
     }
@@ -843,7 +843,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         MoveOperationContext opContext = new MoveOperationContext( this, modifyDnRequest );
         
@@ -858,7 +858,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         moveAndRename( modifyDnRequest, LogChange.TRUE );
     }
@@ -867,7 +867,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         MoveAndRenameOperationContext opContext = new MoveAndRenameOperationContext( this, modifyDnRequest );
 
@@ -882,7 +882,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void rename( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         rename( modifyDnRequest, LogChange.TRUE );
     }
@@ -891,7 +891,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         RenameOperationContext opContext = new RenameOperationContext( this, modifyDnRequest );
 
@@ -903,7 +903,7 @@
     }
 
 
-    public EntryFilteringCursor search( SearchRequest searchRequest ) throws Exception
+    public EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws Exception
     {
         SearchOperationContext opContext = new SearchOperationContext( this, searchRequest );
         OperationManager operationManager = directoryService.getOperationManager();
@@ -920,7 +920,7 @@
     }
 
 
-    public void unbind( UnbindRequest unbindRequest )
+    public void unbind( InternalUnbindRequest unbindRequest )
     {
         // TODO Auto-generated method stub
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Apr 11 01:03:00 2009
@@ -32,7 +32,6 @@
 import org.apache.directory.server.core.changelog.Tag;
 import org.apache.directory.server.core.changelog.TaggableSearchableChangeLogStore;
 import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.event.EventInterceptor;
@@ -46,6 +45,9 @@
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
+import org.apache.directory.server.core.journal.DefaultJournal;
+import org.apache.directory.server.core.journal.Journal;
+import org.apache.directory.server.core.journal.JournalInterceptor;
 import org.apache.directory.server.core.normalization.NormalizationInterceptor;
 import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
@@ -80,6 +82,7 @@
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -149,6 +152,9 @@
     /** the change log service */
     private ChangeLog changeLog;
     
+    /** the journal service */
+    private Journal journal;
+    
     /** 
      * the interface used to perform various operations on this 
      * DirectoryService
@@ -200,6 +206,7 @@
     {
         setDefaultInterceptorConfigurations();
         changeLog = new DefaultChangeLog();
+        journal = new DefaultJournal();
         
         // --------------------------------------------------------------------
         // Load the bootstrap schemas to start up the schema partition
@@ -250,16 +257,41 @@
     public static final int MAX_SIZE_LIMIT_DEFAULT = 100;
     public static final int MAX_TIME_LIMIT_DEFAULT = 10000;
 
+    /** The instance Id */
     private String instanceId;
+    
+    /** The server working directory */
     private File workingDirectory = new File( "server-work" );
+    
+    /** 
+     * A flag used to shutdown the VM when stopping the server. Useful
+     * when the server is standalone. If the server is embedded, we don't
+     * want to shutdown the VM
+     */
     private boolean exitVmOnShutdown = true; // allow by default
+    
+    /** A flag used to indicate that a shutdown hook has been installed */
     private boolean shutdownHookEnabled = true; // allow by default
+    
+    /** Manage anonymous access to entries other than the RootDSE */
     private boolean allowAnonymousAccess = true; // allow by default
+    
+    /** Manage the basic access control checks */
     private boolean accessControlEnabled; // off by default
+    
+    /** Manage the operational attributes denormalization */
     private boolean denormalizeOpAttrsEnabled; // off by default
+    
+    /** The list of declared interceptors */
     private List<Interceptor> interceptors;
+    
+    /** The System partition */
     private Partition systemPartition;
+    
+    /** The set of all declared partitions */
     private Set<Partition> partitions = new HashSet<Partition>();
+    
+    /** A list of LDIF entries to inject at startup */
     private List<? extends LdifEntry> testEntries = new ArrayList<LdifEntry>(); // List<Attributes>
     private EventService eventService;
 
@@ -269,9 +301,6 @@
     private int maxPDUSize = Integer.MAX_VALUE;
 
 
-    /**
-     * @org.apache.xbean.Property hidden="true"
-     */
     public void setInstanceId( String instanceId )
     {
         this.instanceId = instanceId;
@@ -287,7 +316,6 @@
     /**
      * Gets the {@link Partition}s used by this DirectoryService.
      *
-     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.partition.Partition"
      * @return the set of partitions used
      */
     public Set<? extends Partition> getPartitions()
@@ -301,7 +329,6 @@
     /**
      * Sets {@link Partition}s used by this DirectoryService.
      *
-     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.partition.Partition"
      * @param partitions the partitions to used
      */
     public void setPartitions( Set<? extends Partition> partitions )
@@ -388,7 +415,6 @@
     /**
      * Sets the interceptors in the server.
      *
-     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.interceptor.Interceptor"
      * @param interceptors the interceptors to be used in the server.
      */
     public void setInterceptors( List<Interceptor> interceptors ) 
@@ -412,7 +438,6 @@
      * Returns test directory entries({@link LdifEntry}) to be loaded while
      * bootstrapping.
      *
-     * @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
      * @return test entries to load during bootstrapping
      */
     public List<LdifEntry> getTestEntries()
@@ -427,7 +452,6 @@
      * Sets test directory entries({@link Attributes}) to be loaded while
      * bootstrapping.
      *
-     * @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
      * @param testEntries the test entries to load while bootstrapping
      */
     public void setTestEntries( List<? extends LdifEntry> testEntries )
@@ -463,9 +487,6 @@
     }
 
 
-    /**
-     * @org.apache.xbean.Property hidden="true"
-     */
     public void setShutdownHookEnabled( boolean shutdownHookEnabled )
     {
         this.shutdownHookEnabled = shutdownHookEnabled;
@@ -502,30 +523,61 @@
     }
 
 
+    /**
+     * return true if the operational attributes must be normalized when returned
+     */
     public boolean isDenormalizeOpAttrsEnabled()
     {
         return denormalizeOpAttrsEnabled;
     }
 
 
+    /**
+     * Sets whether the operational attributes are denormalized when returned
+     * @param denormalizeOpAttrsEnabled The flag value
+     */
     public void setDenormalizeOpAttrsEnabled( boolean denormalizeOpAttrsEnabled )
     {
         this.denormalizeOpAttrsEnabled = denormalizeOpAttrsEnabled;
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLog getChangeLog()
     {
         return changeLog;
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    public Journal getJournal()
+    {
+        return journal;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
     public void setChangeLog( ChangeLog changeLog )
     {
         this.changeLog = changeLog;
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setJournal( Journal journal )
+    {
+        this.journal = journal;
+    }
+
+
     public void addPartition( Partition parition ) throws Exception
     {
         partitions.add( parition );
@@ -579,6 +631,7 @@
         list.add( new CollectiveAttributeInterceptor() );
         list.add( new EventInterceptor() );
         list.add( new TriggerInterceptor() );
+        list.add( new JournalInterceptor() );
 
         setInterceptors( list );
     }
@@ -878,13 +931,20 @@
             return;
         }
 
-        this.changeLog.sync();
-        this.changeLog.destroy();
-
-        this.partitionNexus.sync();
-        this.partitionNexus.destroy();
-        this.interceptorChain.destroy();
-        this.started = false;
+        // Shutdown the changelog
+        changeLog.sync();
+        changeLog.destroy();
+        
+        // Shutdown the journal
+        journal.destroy();
+
+        // Shutdown the partition
+        partitionNexus.sync();
+        partitionNexus.destroy();
+        
+        // And shutdown the server
+        interceptorChain.destroy();
+        started = false;
         setDefaultInterceptorConfigurations();
     }
 
@@ -899,7 +959,6 @@
 
     /**
      * Set the referralManager
-     * @org.apache.xbean.Property hidden="true"
      * @param referralManager The initialized referralManager
      */
     public void setReferralManager( ReferralManager referralManager )
@@ -917,9 +976,6 @@
     }
 
 
-    /**
-     * @org.apache.xbean.Property hidden="true"
-     */
     public void setRegistries( Registries registries )
     {
         this.registries = registries;
@@ -932,9 +988,6 @@
     }
 
 
-    /**
-     * @org.apache.xbean.Property hidden="true"
-     */
     public void setSchemaService( SchemaService schemaService )
     {
         this.schemaService = schemaService;
@@ -1447,6 +1500,12 @@
                 partitionNexus.getRootDSE( null ).getOriginalEntry().add( SchemaConstants.CHANGELOG_CONTEXT_AT, clSuffix );
             }
         }
+        
+        // Initialize the journal if it's enabled
+        //if ( journal.isEnabled() )
+        {
+            journal.init( this );
+        }
 
         if ( LOG.isDebugEnabled() )
         {
@@ -1557,9 +1616,6 @@
     }
 
 
-    /**
-     * @org.apache.xbean.Property hidden="true"
-     */
     public void setEventService( EventService eventService )
     {
         this.eventService = eventService;
@@ -1650,6 +1706,14 @@
      */
     public void setReplicaId( int replicaId )
     {
-        this.replicaId = replicaId;
+        if ( ( replicaId < 0 ) || ( replicaId > 999 ) )
+        {
+            LOG.error( "The replicaId must be in [0, 999]" );
+            this.replicaId = 0;
+        }
+        else
+        {
+            this.replicaId = replicaId;
+        }
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java Sat Apr 11 01:03:00 2009
@@ -27,6 +27,7 @@
 import org.apache.directory.server.core.event.EventService;
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.journal.Journal;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.schema.SchemaService;
@@ -103,6 +104,8 @@
 
     /**
      * Inject the registries into the directory service
+     * 
+     * @org.apache.xbean.Property hidden="true"
      * @param registries The new registries
      */
     void setRegistries( Registries registries );
@@ -117,6 +120,7 @@
     /**
      * Set the referralManager
      * 
+     * @org.apache.xbean.Property hidden="true"
      * @param referralManager The initialized referralManager
      */
     void setReferralManager( ReferralManager referralManager );
@@ -125,12 +129,17 @@
     SchemaService getSchemaService();
 
 
+    /**
+     * @org.apache.xbean.Property hidden="true"
+     */
     void setSchemaService( SchemaService schemaService );
     
     
     EventService getEventService();
     
-    
+    /**
+     * @org.apache.xbean.Property hidden="true"
+     */
     void setEventService( EventService eventService );
 
 
@@ -210,6 +219,9 @@
         throws Exception;
 
     
+    /**
+     * @org.apache.xbean.Property hidden="true"
+     */
     void setInstanceId( String instanceId );
 
 
@@ -227,6 +239,7 @@
     /**
      * Sets {@link Partition}s used by this DirectoryService.
      *
+     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.partition.Partition"
      * @param partitions the partitions to used
      */
     void setPartitions( Set<? extends Partition> partitions );
@@ -297,12 +310,19 @@
     /**
      * Sets the interceptors in the server.
      *
+     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.interceptor.Interceptor"
      * @param interceptors the interceptors to be used in the server.
      */
     void setInterceptors( List<Interceptor> interceptors );
 
 
     /**
+     * {@inheritDoc}
+     */
+    void setJournal( Journal journal );
+
+    
+    /**
      * Returns test directory entries({@link LdifEntry}) to be loaded while
      * bootstrapping.
      *
@@ -315,6 +335,7 @@
      * Sets test directory entries({@link Attributes}) to be loaded while
      * bootstrapping.
      *
+     * @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
      * @param testEntries the test entries to load while bootstrapping
      */
     void setTestEntries( List<? extends LdifEntry> testEntries );
@@ -343,6 +364,7 @@
      * registers a JVM shutdown hook to flush caches and synchronize to disk safely.  This is
      * enabled by default.
      *
+     * @org.apache.xbean.Property hidden="true"
      * @param shutdownHookEnabled true to enable the shutdown hook, false to disable
      */
     void setShutdownHookEnabled( boolean shutdownHookEnabled );
@@ -378,7 +400,7 @@
     /**
      * Gets the ChangeLog service for this DirectoryService used for tracking
      * changes (revisions) to the server and using them to revert the server
-     * to earier revisions.
+     * to earlier revisions.
      *
      * @return the change log service
      */
@@ -386,6 +408,15 @@
 
 
     /**
+     * Gets the Journal service for this DirectoryService used for tracking
+     * changes to the server.
+     *
+     * @return the journal service
+     */
+    Journal getJournal();
+
+
+    /**
      * Sets the ChangeLog service for this DirectoryService used for tracking
      * changes (revisions) to the server and using them to revert the server
      * to earier revisions.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java Sat Apr 11 01:03:00 2009
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Sat Apr 11 01:03:00 2009
@@ -37,8 +37,8 @@
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.ListCursor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.ListCursor;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.util.DateUtils;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java Sat Apr 11 01:03:00 2009
@@ -19,8 +19,7 @@
  */
 package org.apache.directory.server.core.changelog;
 
-
-import org.apache.directory.server.core.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -56,7 +56,7 @@
     }
     
     
-    public NotificationCriteria( SearchRequest req )
+    public NotificationCriteria( InternalSearchRequest req )
     {
         this.scope = req.getScope();
         this.aliasDerefMode = req.getDerefAliases();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,6 @@
 
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.cursor.EmptyCursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -47,6 +46,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java Sat Apr 11 01:03:00 2009
@@ -25,13 +25,13 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.CursorIterator;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java Sat Apr 11 01:03:00 2009
@@ -22,9 +22,9 @@
 
 import java.util.List;
 
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Sat Apr 11 01:03:00 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -89,7 +89,7 @@
     }
 
 
-    public AddOperationContext( CoreSession session, AddRequest addRequest ) throws Exception
+    public AddOperationContext( CoreSession session, InternalAddRequest addRequest ) throws Exception
     {
         super( session );
         entry = new ClonedServerEntry( 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Sat Apr 11 01:03:00 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.message.CompareRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -106,7 +106,7 @@
     }
 
     
-    public CompareOperationContext( CoreSession session, CompareRequest compareRequest )
+    public CompareOperationContext( CoreSession session, InternalCompareRequest compareRequest )
     {
         super( session, compareRequest.getName() );
         this.oid = compareRequest.getAttributeId();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -64,7 +64,7 @@
     }
 
 
-    public DeleteOperationContext( CoreSession session, DeleteRequest deleteRequest )
+    public DeleteOperationContext( CoreSession session, InternalDeleteRequest deleteRequest )
     {
         super( session, deleteRequest.getName() );
         requestControls = deleteRequest.getControls();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Sat Apr 11 01:03:00 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -81,7 +81,7 @@
     }
 
 
-    public ModifyOperationContext( CoreSession session, ModifyRequest modifyRequest ) throws Exception
+    public ModifyOperationContext( CoreSession session, InternalModifyRequest modifyRequest ) throws Exception
     {
         super( session, modifyRequest.getName() );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -66,7 +66,7 @@
     }
 
 
-    public MoveAndRenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveAndRenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         // super sets the newRdn and the delOldRdn members and tests
         super( session, modifyDnRequest );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -59,7 +59,7 @@
     }
 
     
-    public MoveOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.parent = modifyDnRequest.getNewSuperior();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Sat Apr 11 01:03:00 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -77,7 +77,7 @@
     }
 
 
-    public RenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public RenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.newRdn = modifyDnRequest.getNewRdn();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Sat Apr 11 01:03:00 2009
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -61,7 +61,7 @@
      * Creates a new instance of SearchOperationContext.
      * @throws Exception 
      */
-    public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws Exception
+    public SearchOperationContext( CoreSession session, InternalSearchRequest searchRequest ) throws Exception
     {
         super( session );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 
 
 /**
@@ -43,7 +43,7 @@
     }
     
 
-    public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
+    public UnbindOperationContext( CoreSession session, InternalUnbindRequest unbindRequest )
     {
         super( session, session.getEffectivePrincipal().getJndiName() );
         this.setRequestControls( unbindRequest.getControls() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,6 @@
 
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.cursor.EmptyCursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -48,6 +47,7 @@
 import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/ByPassConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/ByPassConstants.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/ByPassConstants.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/ByPassConstants.java Sat Apr 11 01:03:00 2009
@@ -32,6 +32,7 @@
 import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.server.core.exception.ExceptionInterceptor;
 import org.apache.directory.server.core.interceptor.Interceptor;
+import org.apache.directory.server.core.journal.JournalInterceptor;
 import org.apache.directory.server.core.normalization.NormalizationInterceptor;
 import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 import org.apache.directory.server.core.schema.SchemaInterceptor;
@@ -98,6 +99,7 @@
         c.add( SchemaInterceptor.class.getName() );
         c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
@@ -110,6 +112,7 @@
         c.add( SchemaInterceptor.class.getName() );
         c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         HAS_ENTRY_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
@@ -122,6 +125,7 @@
         c.add( SchemaInterceptor.class.getName() );
         c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         LOOKUP_COLLECTIVE_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
@@ -132,6 +136,7 @@
         c.add( OperationalAttributeInterceptor.class.getName() );
         c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         GETMATCHEDDN_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
@@ -143,6 +148,7 @@
         c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
         c.add( TriggerInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS = Collections.unmodifiableCollection( c );
         
         c = new HashSet<String>();
@@ -157,6 +163,7 @@
         c.add( CollectiveAttributeInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
         c.add( TriggerInterceptor.class.getName() );
+        c.add( JournalInterceptor.class.getName() );
         GET_ROOT_DSE_BYPASS = Collections.unmodifiableCollection( c );
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sat Apr 11 01:03:00 2009
@@ -25,7 +25,6 @@
 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.cursor.SingletonCursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
@@ -61,6 +60,7 @@
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java Sat Apr 11 01:03:00 2009
@@ -22,13 +22,13 @@
 
 import java.util.Iterator;
 
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.CursorIterator;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Sat Apr 11 01:03:00 2009
@@ -45,9 +45,9 @@
 import javax.swing.table.DefaultTableModel;
 
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.apache.directory.shared.ldap.NotImplementedException;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat Apr 11 01:03:00 2009
@@ -37,8 +37,6 @@
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.cursor.EmptyCursor;
-import org.apache.directory.server.core.cursor.SingletonCursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.ServerAttribute;
@@ -67,6 +65,8 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
+import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat Apr 11 01:03:00 2009
@@ -30,9 +30,6 @@
 import org.apache.directory.server.core.ReferralManager;
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.changelog.ChangeLog;
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.CursorIterator;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -59,6 +56,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.UnbindOperationContext;
+import org.apache.directory.server.core.journal.Journal;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.schema.SchemaOperationControl;
@@ -70,6 +68,9 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -762,6 +763,12 @@
         }
 
 
+        public Journal getJournal()
+        {
+            return null;
+        }
+
+
         public ServerEntry newEntry( LdapDN dn ) throws NamingException
         {
             return null;
@@ -861,6 +868,11 @@
         {
             
         }
+
+        public void setJournal( Journal journal )
+        {
+            
+        }
     }
 
     

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Sat Apr 11 01:03:00 2009
@@ -34,6 +34,7 @@
 import org.apache.directory.server.core.event.EventService;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.server.core.journal.Journal;
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
@@ -555,6 +556,7 @@
         {
             
         }
+
         
         public ChangeLog getChangeLog()
         {
@@ -562,6 +564,12 @@
         }
 
 
+        public Journal getJournal()
+        {
+            return null;
+        }
+
+
         public ServerEntry newEntry( LdapDN dn ) throws NamingException
         {
             return null;
@@ -670,5 +678,12 @@
         {
             
         }
+
+
+        public void setJournal( Journal journal )
+        {
+            // TODO Auto-generated method stub
+            
+        }
     }
 }

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Sat Apr 11 01:03:00 2009
@@ -20,9 +20,10 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+
 import jdbm.helper.TupleBrowser;
 
 import java.io.IOException;

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Sat Apr 11 01:03:00 2009
@@ -24,10 +24,10 @@
 
 import org.apache.directory.server.core.avltree.AvlTree;
 import org.apache.directory.server.core.avltree.AvlTreeCursor;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Sat Apr 11 01:03:00 2009
@@ -24,12 +24,14 @@
 import jdbm.helper.MRU;
 import jdbm.recman.BaseRecordManager;
 import jdbm.recman.CacheRecordManager;
-import org.apache.directory.server.core.partition.impl.btree.*;
-import org.apache.directory.server.core.cursor.Cursor;
+
+import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
+import org.apache.directory.server.core.partition.impl.btree.LongComparator;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.IndexCursor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.util.SynchronizedLRUMap;

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sat Apr 11 01:03:00 2009
@@ -37,7 +37,6 @@
 import jdbm.recman.CacheRecordManager;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerBinaryValue;
@@ -53,6 +52,7 @@
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.MultiException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -1683,6 +1683,7 @@
         }
 
         Cursor<IndexEntry<Long,E>> children = list( id );
+        
         while ( children.next() )
         {
             // Get the child and its id

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Sat Apr 11 01:03:00 2009
@@ -22,18 +22,24 @@
 
 import jdbm.RecordManager;
 import jdbm.btree.BTree;
-import jdbm.helper.*;
+import jdbm.helper.Serializer;
+import jdbm.helper.TupleBrowser;
 
-import org.apache.directory.server.core.avltree.*;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.EmptyCursor;
-import org.apache.directory.server.core.cursor.SingletonCursor;
+import org.apache.directory.server.core.avltree.AvlTree;
+import org.apache.directory.server.core.avltree.AvlTreeCursor;
+import org.apache.directory.server.core.avltree.AvlTreeMarshaller;
+import org.apache.directory.server.core.avltree.LinkedAvlNode;
+import org.apache.directory.server.core.avltree.Marshaller;
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.xdbm.*;
+import org.apache.directory.server.xdbm.Table;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
+import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.util.SynchronizedLRUMap;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Comparator;
+import java.util.Map;
 
 
 /**

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java Sat Apr 11 01:03:00 2009
@@ -23,11 +23,11 @@
 import jdbm.helper.Tuple;
 import jdbm.helper.TupleBrowser;
 
-import org.apache.directory.server.core.cursor.AbstractCursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
-
 import java.util.Comparator;
 
+import org.apache.directory.shared.ldap.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+
 
 /**
  * Cursor over the keys of a JDBM BTree.  Obviously does not return duplicate

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java Sat Apr 11 01:03:00 2009
@@ -19,11 +19,11 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.server.core.avltree.AvlTree;
 import org.apache.directory.server.core.avltree.AvlTreeCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
 /**

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Sat Apr 11 01:03:00 2009
@@ -19,9 +19,9 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 import java.util.Comparator;
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Sat Apr 11 01:03:00 2009
@@ -19,9 +19,9 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 import java.io.IOException;
 

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Sat Apr 11 01:03:00 2009
@@ -22,10 +22,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
 import org.junit.Before;
 import org.junit.After;

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Sat Apr 11 01:03:00 2009
@@ -23,9 +23,9 @@
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.Table;
 import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.schema.SerializableComparator;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.junit.Before;
 import org.junit.After;
 import org.junit.Test;

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Sat Apr 11 01:03:00 2009
@@ -35,9 +35,9 @@
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.Cursor;
 
 import java.util.Set;
 import java.util.HashSet;



Mime
View raw message