directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1137310 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/ apacheds/trunk/core-api/src/main/java/org/apache/directory/s...
Date Sun, 19 Jun 2011 07:32:57 GMT
Author: elecharny
Date: Sun Jun 19 07:32:56 2011
New Revision: 1137310

URL: http://svn.apache.org/viewvc?rev=1137310&view=rev
Log:
o Replaced ClonedServerEntry by Entry whenever possible in the server
o Added some missing Javadoc

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplRequestHandler.java
    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/TupleCursor.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java Sun Jun 19 07:32:56 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 public class EntryToResponseCursor implements SearchCursor
 {
     /** the underlying cursor */
-    private Cursor<ClonedServerEntry> wrapped;
+    private Cursor<Entry> wrapped;
 
     /** a reference to hold the SearchResultDone response */
     private SearchResultDone searchDoneResp;
@@ -59,7 +59,7 @@ public class EntryToResponseCursor imple
     private int messageId;
 
 
-    public EntryToResponseCursor( int messageId, Cursor<ClonedServerEntry> wrapped )
+    public EntryToResponseCursor( int messageId, Cursor<Entry> wrapped )
     {
         this.wrapped = wrapped;
         this.messageId = messageId;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Sun Jun 19 07:32:56 2011
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.directory.ldap.client.api.EntryCursorImpl;
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.asn1.util.Oid;
@@ -1007,7 +1006,7 @@ public class LdapCoreSessionConnection i
             LOG.warn( e.getMessage(), e );
         }
 
-        return new EntryToResponseCursor( -1, new EmptyCursor<ClonedServerEntry>() );
+        return new EntryToResponseCursor( -1, new EmptyCursor<Entry>() );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java Sun Jun 19 07:32:56 2011
@@ -65,7 +65,7 @@ public class BaseEntryFilteringCursor im
     private final List<EntryFilter> filters;
     
     /** the first accepted search result that is pre fetched */
-    private ClonedServerEntry prefetched;
+    private Entry prefetched;
 
     
     // ------------------------------------------------------------------------
@@ -200,7 +200,7 @@ public class BaseEntryFilteringCursor im
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.filtering.EntryFilteringCursor#after(org.apache.directory.server.core.entry.ClonedServerEntry)
      */
-    public void after( ClonedServerEntry element ) throws Exception
+    public void after( Entry element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -237,7 +237,7 @@ public class BaseEntryFilteringCursor im
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.filtering.EntryFilteringCursor#before(org.apache.directory.server.core.entry.ClonedServerEntry)
      */
-    public void before( ClonedServerEntry element ) throws Exception
+    public void before( Entry element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -314,7 +314,7 @@ public class BaseEntryFilteringCursor im
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.filtering.EntryFilteringCursor#get()
      */
-    public ClonedServerEntry get() throws Exception
+    public Entry get() throws Exception
     {
         if ( available() )
         {
@@ -357,7 +357,7 @@ public class BaseEntryFilteringCursor im
     }
     
     
-    private void filterContents( ClonedServerEntry entry ) throws Exception
+    private void filterContents( Entry entry ) throws Exception
     {
         boolean typesOnly = getOperationContext().isTypesOnly();
 
@@ -369,9 +369,11 @@ public class BaseEntryFilteringCursor im
             return;
         }
 
+        Entry originalEntry = ((ClonedServerEntry)entry).getOriginalEntry();
+        
         if ( getOperationContext().isNoAttributes() )
         {
-            for ( AttributeType at : entry.getOriginalEntry().getAttributeTypes() )
+            for ( AttributeType at : originalEntry.getAttributeTypes() )
             {
                 entry.remove( entry.get( at ) );
             }
@@ -382,7 +384,7 @@ public class BaseEntryFilteringCursor im
         
         if ( getOperationContext().isAllUserAttributes() )
         {
-            for ( AttributeType at : entry.getOriginalEntry().getAttributeTypes() )
+            for ( AttributeType at : originalEntry.getAttributeTypes() )
             {
                 boolean isNotRequested = true;
                 
@@ -412,7 +414,7 @@ public class BaseEntryFilteringCursor im
         
         if ( getOperationContext().isAllOperationalAttributes() )
         {
-            for ( AttributeType at : entry.getOriginalEntry().getAttributeTypes() )
+            for ( AttributeType at : originalEntry.getAttributeTypes() )
             {
                 boolean isNotRequested = true;
                 
@@ -442,7 +444,7 @@ public class BaseEntryFilteringCursor im
         
         if ( getOperationContext().getReturningAttributes() != null )
         {
-            for ( AttributeType at : entry.getOriginalEntry().getAttributeTypes() )
+            for ( AttributeType at : originalEntry.getAttributeTypes() )
             {
                 boolean isNotRequested = true;
                 
@@ -483,7 +485,7 @@ public class BaseEntryFilteringCursor im
             throw new OperationAbandonedException();
         }
         
-        ClonedServerEntry tempResult = null;
+        Entry tempResult = null;
         
         outer: while ( wrapped.next() )
         {
@@ -561,7 +563,7 @@ public class BaseEntryFilteringCursor im
             throw new OperationAbandonedException();
         }
         
-        ClonedServerEntry tempResult = null;
+        Entry tempResult = null;
         
         outer: while ( wrapped.previous() )
         {
@@ -621,9 +623,9 @@ public class BaseEntryFilteringCursor im
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.filtering.EntryFilteringCursor#iterator()
      */
-    public Iterator<ClonedServerEntry> iterator()
+    public Iterator<Entry> iterator()
     {
-        return new CursorIterator<ClonedServerEntry>( this );
+        return new CursorIterator<Entry>( this );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java Sun Jun 19 07:32:56 2011
@@ -24,12 +24,12 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -143,7 +143,7 @@ public class CursorList implements Entry
      * @throws IllegalStateException if the underlying list is not sorted
      * and/or a comparator is not provided.
      */
-    public void before( ClonedServerEntry element ) throws Exception
+    public void before( Entry element ) throws Exception
     {
         // checkNotClosed( "before()" );
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02008_LIST_MAY_BE_SORTED ) );
@@ -153,7 +153,7 @@ public class CursorList implements Entry
     /**
      * {@inheritDoc}
      */
-    public void after( ClonedServerEntry element ) throws Exception
+    public void after( Entry element ) throws Exception
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_02008_LIST_MAY_BE_SORTED ) );
     }
@@ -364,7 +364,7 @@ public class CursorList implements Entry
     /**
      * {@inheritDoc}
      */
-    public ClonedServerEntry get() throws Exception
+    public Entry get() throws Exception
     {
         if ( index < start || index >= end )
         {
@@ -373,8 +373,9 @@ public class CursorList implements Entry
 
         if ( list.get( index ).available() )
         {
-            return ( ClonedServerEntry ) list.get( index ).get();
+            return list.get( index ).get();
         }
+        
         throw new InvalidCursorPositionException();
     }
 
@@ -462,7 +463,7 @@ public class CursorList implements Entry
     }
 
 
-    public Iterator<ClonedServerEntry> iterator()
+    public Iterator<Entry> iterator()
     {
         throw new UnsupportedOperationException();
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/EntryFilteringCursor.java Sun Jun 19 07:32:56 2011
@@ -22,9 +22,9 @@ package org.apache.directory.server.core
 
 import java.util.List;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface EntryFilteringCursor extends Cursor<ClonedServerEntry>
+public interface EntryFilteringCursor extends Cursor<Entry>
 {
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Sun Jun 19 07:32:56 2011
@@ -29,7 +29,6 @@ import javax.naming.ConfigurationExcepti
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -137,7 +136,7 @@ public class InterceptorChain
         }
 
 
-        public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext lookupContext )
+        public Entry lookup( NextInterceptor next, LookupOperationContext lookupContext )
             throws LdapException
         {
             return nexus.lookup( lookupContext );
@@ -570,7 +569,7 @@ public class InterceptorChain
             CoreSession adminSession = opContext.getSession().getDirectoryService().getAdminSession();
             
             LookupOperationContext lookupContext = new LookupOperationContext( adminSession, opContext.getDn(), SchemaConstants.ALL_ATTRIBUTES_ARRAY );
-            ClonedServerEntry foundEntry = opContext.getSession().getDirectoryService().getPartitionNexus().lookup( lookupContext );
+            Entry foundEntry = opContext.getSession().getDirectoryService().getPartitionNexus().lookup( lookupContext );
 
             if ( foundEntry != null )
             {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Sun Jun 19 07:32:56 2011
@@ -28,7 +28,6 @@ import java.util.Map;
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.LdapPrincipal;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -51,7 +50,7 @@ public abstract class AbstractOperationC
     protected Dn dn;
     
     /** The entry associated with the target entry of this OperationContext */
-    protected ClonedServerEntry entry;
+    protected Entry entry;
 
     /** The original Entry */
     protected Entry originalEntry;
@@ -448,7 +447,7 @@ public abstract class AbstractOperationC
     /**
      * @param entry the entry to set
      */
-    public void setEntry( ClonedServerEntry entry )
+    public void setEntry( Entry entry )
     {
         this.entry = entry;
     }
@@ -457,7 +456,7 @@ public abstract class AbstractOperationC
     /**
      * @return the entry
      */
-    public ClonedServerEntry getEntry()
+    public Entry getEntry()
     {
         return entry;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Sun Jun 19 07:32:56 2011
@@ -138,7 +138,7 @@ public interface OperationContext
      * 
      * @return target entry associated with the Dn of this OperationContext
      */
-    ClonedServerEntry getEntry();
+    Entry getEntry();
     
     
     /**
@@ -147,7 +147,7 @@ public interface OperationContext
      *
      * @param entry the entry whose Dn is associated with this OperationContext.
      */
-    void setEntry( ClonedServerEntry entry );
+    void setEntry( Entry entry );
     
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Sun Jun 19 07:32:56 2011
@@ -22,7 +22,6 @@ package org.apache.directory.server.core
 
 import javax.naming.InvalidNameException;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -163,7 +162,7 @@ public abstract class AbstractPartition 
      * with null <tt>attributeIds</tt> by default.  Please override
      * this method if there is more effective way for your implementation.
      */
-    public abstract ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException;
+    public abstract Entry lookup( LookupOperationContext lookupContext ) throws LdapException;
 
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Sun Jun 19 07:32:56 2011
@@ -27,7 +27,6 @@ import java.util.List;
 import javax.naming.InvalidNameException;
 
 import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilter;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -44,6 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -111,7 +111,7 @@ public class NullPartition extends Abstr
         return new EntryFilteringCursor()
         {
             
-            public Iterator<ClonedServerEntry> iterator()
+            public Iterator<Entry> iterator()
             {
                 return EmptyIterator.INSTANCE;
             }
@@ -146,7 +146,7 @@ public class NullPartition extends Abstr
             }
             
         
-            public ClonedServerEntry get() throws Exception
+            public Entry get() throws Exception
             {
                 return null;
             }
@@ -173,7 +173,7 @@ public class NullPartition extends Abstr
             }
             
         
-            public void before( ClonedServerEntry element ) throws Exception
+            public void before( Entry element ) throws Exception
             {
             }
             
@@ -189,7 +189,7 @@ public class NullPartition extends Abstr
             }
             
         
-            public void after( ClonedServerEntry element ) throws Exception
+            public void after( Entry element ) throws Exception
             {
             }
             
@@ -274,7 +274,7 @@ public class NullPartition extends Abstr
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.Partition#lookup(java.lang.Long)
      */
-    public ClonedServerEntry lookup( Long id ) throws Exception
+    public Entry lookup( Long id ) throws Exception
     {
         return null;
     }
@@ -377,7 +377,7 @@ public class NullPartition extends Abstr
 
 
     @Override
-    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
+    public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return null;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Sun Jun 19 07:32:56 2011
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core.partition;
 
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerSearchResult;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -35,6 +34,7 @@ import org.apache.directory.server.core.
 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.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -216,7 +216,7 @@ public interface Partition
      * @return an Attributes object representing the entry
      * @throws Exception if there are any problems
      */
-    ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException;
+    Entry lookup( LookupOperationContext lookupContext ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sun Jun 19 07:32:56 2011
@@ -25,7 +25,6 @@ import java.util.List;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -436,7 +435,7 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
+    public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return wrapped.lookup( lookupContext );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Sun Jun 19 07:32:56 2011
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 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;
@@ -35,8 +36,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
@@ -317,7 +318,7 @@ public class RegistrySynchronizerAdaptor
     public void rename( RenameOperationContext renameContext, boolean doCascadeModify ) 
         throws LdapException
     {
-        Entry originalEntry = renameContext.getEntry().getOriginalEntry();
+        Entry originalEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
         Attribute oc = originalEntry.get( objectClassAT );
         
         for ( Value<?> value:oc )

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java Sun Jun 19 07:32:56 2011
@@ -275,13 +275,13 @@ public class MockOperation implements Op
     }
 
 
-    public ClonedServerEntry getEntry()
+    public Entry getEntry()
     {
         return null;
     }
 
 
-    public void setEntry( ClonedServerEntry entry )
+    public void setEntry( Entry entry )
     {
     }
 

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java Sun Jun 19 07:32:56 2011
@@ -29,10 +29,10 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ArrayTreeCursor<K> extends AbstractCursor<K>
+public class ArrayTreeCursor<E> extends AbstractCursor<E>
 {
     /** The underlying ArrayTree */
-    private ArrayTree<K> array;
+    private ArrayTree<E> array;
 
     /** The current position/index in the array */
     private int current;
@@ -45,7 +45,7 @@ public class ArrayTreeCursor<K> extends 
      * Create a cursor on an ArrayTree
      * @param array The array we want a cursor for
      */
-    public ArrayTreeCursor( ArrayTree<K> array )
+    public ArrayTreeCursor( ArrayTree<E> array )
     {
         this.array = array;
         position = Position.BEFORE_FIRST;
@@ -55,7 +55,7 @@ public class ArrayTreeCursor<K> extends 
     /**
      * {@inheritDoc}
      */
-    public void after( K element ) throws Exception
+    public void after( E element ) throws Exception
     {
         checkNotClosed( "after" );
 
@@ -106,7 +106,7 @@ public class ArrayTreeCursor<K> extends 
     /**
      * {@inheritDoc}
      */
-    public void before( K element ) throws Exception
+    public void before( E element ) throws Exception
     {
         checkNotClosed( "before" );
 
@@ -170,7 +170,7 @@ public class ArrayTreeCursor<K> extends 
     /**
      * {@inheritDoc}
      */
-    public K get() throws Exception
+    public E get() throws Exception
     {
         checkNotClosed( "get" );
 

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=1137310&r1=1137309&r2=1137310&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 Sun Jun 19 07:32:56 2011
@@ -29,25 +29,25 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AvlTreeCursor<K> extends AbstractCursor<K>
+public class AvlTreeCursor<E> extends AbstractCursor<E>
 {
     /** The underlying AVL tree */
-    private AvlTree<K> tree;
+    private AvlTree<E> tree;
 
     /** The current node */
-    private LinkedAvlNode<K> node;
+    private LinkedAvlNode<E> node;
 
     /** The current position of this cursor, relative to the node */
     private Position position = Position.BEFORE_FIRST;
 
 
-    public AvlTreeCursor( AvlTree<K> tree )
+    public AvlTreeCursor( AvlTree<E> tree )
     {
         this.tree = tree;
     }
 
 
-    public void after( K element ) throws Exception
+    public void after( E element ) throws Exception
     {
         checkNotClosed( "after" );
 
@@ -87,7 +87,7 @@ public class AvlTreeCursor<K> extends Ab
     }
 
 
-    public void before( K element ) throws Exception
+    public void before( E element ) throws Exception
     {
         checkNotClosed( "before" );
 
@@ -140,7 +140,7 @@ public class AvlTreeCursor<K> extends Ab
     }
 
 
-    public K get() throws Exception
+    public E get() throws Exception
     {
         checkNotClosed( "get" );
 

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java Sun Jun 19 07:32:56 2011
@@ -29,6 +29,7 @@ import javax.naming.event.NamingExceptio
 import javax.naming.event.NamingListener;
 import javax.naming.event.ObjectChangeListener;
 
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.event.DirectoryListener;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -157,7 +158,7 @@ public class EventListenerAdapter implem
             Binding newBinding = new Binding( modifyContext.getDn().getName(), 
                 ServerEntryUtils.toBasicAttributes( modifyContext.getEntry() ), false );
             Binding oldBinding = new Binding( modifyContext.getDn().getName(), 
-                ServerEntryUtils.toBasicAttributes( modifyContext.getEntry().getOriginalEntry() ),  false );
+                ServerEntryUtils.toBasicAttributes( ((ClonedServerEntry)modifyContext.getEntry()).getOriginalEntry() ),  false );
             NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_CHANGED, 
                 newBinding, oldBinding, modifyContext );
 
@@ -185,7 +186,7 @@ public class EventListenerAdapter implem
                 Binding newBinding = new Binding( moveContext.getDn().getName(), 
                     ServerEntryUtils.toBasicAttributes( moveContext.getEntry() ), false );
                 Binding oldBinding = new Binding( moveContext.getDn().getName(), 
-                    ServerEntryUtils.toBasicAttributes( moveContext.getEntry().getOriginalEntry() ), false );
+                    ServerEntryUtils.toBasicAttributes( ((ClonedServerEntry)moveContext.getEntry()).getOriginalEntry() ), false );
                 NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED, 
                     newBinding, oldBinding, moveContext );
                 ( ( NamespaceChangeListener ) listener ).objectRenamed( evt );
@@ -210,7 +211,7 @@ public class EventListenerAdapter implem
                 Binding newBinding = new Binding( moveAndRenameContext.getDn().getName(), 
                     ServerEntryUtils.toBasicAttributes( moveAndRenameContext.getEntry() ), false );
                 Binding oldBinding = new Binding( moveAndRenameContext.getDn().getName(), 
-                    ServerEntryUtils.toBasicAttributes( moveAndRenameContext.getEntry().getOriginalEntry() ), false );
+                    ServerEntryUtils.toBasicAttributes( ((ClonedServerEntry)moveAndRenameContext.getEntry()).getOriginalEntry() ), false );
                 NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED, 
                     newBinding, oldBinding, moveAndRenameContext );
                 ( ( NamespaceChangeListener ) listener ).objectRenamed( evt );
@@ -235,7 +236,7 @@ public class EventListenerAdapter implem
                 Binding newBinding = new Binding( renameContext.getDn().getName(), 
                     ServerEntryUtils.toBasicAttributes( renameContext.getEntry() ), false );
                 Binding oldBinding = new Binding( renameContext.getDn().getName(), 
-                    ServerEntryUtils.toBasicAttributes( renameContext.getEntry().getOriginalEntry() ), false );
+                    ServerEntryUtils.toBasicAttributes( ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry() ), false );
                 NamingEvent evt = new NamingEvent( source, NamingEvent.OBJECT_RENAMED, 
                     newBinding, oldBinding, null );
                 ( ( NamespaceChangeListener ) listener ).objectRenamed( evt );

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Sun Jun 19 07:32:56 2011
@@ -26,9 +26,9 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 
 
@@ -96,11 +96,12 @@ public class NamingEnumerationAdapter im
      */
     public SearchResult next() throws NamingException
     {
-        ClonedServerEntry entry = null;
+        Entry entry = null;
         
         try
         {
             entry = cursor.get();
+            
             if ( cursor.next() )
             {
                 available = true;
@@ -119,6 +120,7 @@ public class NamingEnumerationAdapter im
         SearchResult result = new SearchResult( entry.getDn().getName(), null, 
             ServerEntryUtils.toBasicAttributes( entry ) );
         result.setRelative( false );
+        
         return result;
     }
 

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=1137310&r1=1137309&r2=1137310&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 Sun Jun 19 07:32:56 2011
@@ -54,7 +54,6 @@ import org.apache.directory.server.core.
 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.entry.ClonedServerEntry;
 import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.server.core.event.EventService;
 import org.apache.directory.server.core.exception.ExceptionInterceptor;
@@ -991,9 +990,10 @@ public class DefaultDirectoryService imp
         LookupOperationContext loc = new LookupOperationContext( getAdminSession() );
         loc.setDn( systemPartition.getSuffix() );
         loc.setAttrsId( new String[]{ "+" } );
-        ClonedServerEntry entry = systemPartition.lookup( loc );
+        Entry entry = systemPartition.lookup( loc );
 
         Attribute cntextCsnAt = entry.get( SchemaConstants.CONTEXT_CSN_AT );
+        
         if( cntextCsnAt != null )
         {
             // this is a multivalued attribute but current syncrepl provider implementation stores only ONE value at ou=system

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Sun Jun 19 07:32:56 2011
@@ -52,6 +52,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.administrative.TriggerExecutionIAP;
 import org.apache.directory.server.core.administrative.TriggerExecutionSAP;
 import org.apache.directory.server.core.authn.Authenticator;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.Interceptor;
@@ -1312,7 +1313,7 @@ public class AdministrativePointIntercep
         String uuid = modifyContext.getEntry().get( ENTRY_UUID_AT ).getString();
 
         // Create a clone of the current AdminRole AT
-        Attribute modifiedAdminRole = ( modifyContext.getEntry() ).getOriginalEntry().get( ADMINISTRATIVE_ROLE_AT );
+        Attribute modifiedAdminRole = ((ClonedServerEntry)modifyContext.getEntry() ).getOriginalEntry().get( ADMINISTRATIVE_ROLE_AT );
 
         if ( modifiedAdminRole == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sun Jun 19 07:32:56 2011
@@ -960,7 +960,7 @@ public class AciAuthorizationInterceptor
 
         if ( renameContext.getEntry() != null )
         {
-            originalEntry = renameContext.getEntry().getOriginalEntry();
+            originalEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
         }
 
         LdapPrincipal principal = renameContext.getSession().getEffectivePrincipal();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Jun 19 07:32:56 2011
@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -296,7 +297,7 @@ public class ChangeLogInterceptor extend
         
         if ( renameContext.getEntry() != null )
         {
-            serverEntry = renameContext.getEntry().getOriginalEntry();
+            serverEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
         }
         
         next.rename( renameContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Sun Jun 19 07:32:56 2011
@@ -30,6 +30,7 @@ import java.util.concurrent.ThreadPoolEx
 import java.util.concurrent.TimeUnit;
 
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -206,7 +207,7 @@ public class EventInterceptor extends Ba
 
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
     {
-        Entry oriEntry = renameContext.getEntry().getOriginalEntry();
+        Entry oriEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
         List<RegistrationEntry> selecting = getSelectingRegistrations( renameContext.getDn(), oriEntry );
 
         next.rename( renameContext );

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=1137310&r1=1137309&r2=1137310&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 Sun Jun 19 07:32:56 2011
@@ -604,7 +604,7 @@ public class DefaultPartitionNexus exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.PartitionNexus#lookup(org.apache.directory.server.core.interceptor.context.LookupOperationContext)
      */
-    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
+    public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Dn dn = lookupContext.getDn();
 
@@ -639,7 +639,7 @@ public class DefaultPartitionNexus exten
         }
 
         Partition backend = getPartition( dn );
-        ClonedServerEntry entry =  backend.lookup( lookupContext );
+        Entry entry =  backend.lookup( lookupContext );
         
         if ( entry == null )
         {
@@ -872,7 +872,7 @@ public class DefaultPartitionNexus exten
 
                 for ( Partition partition : partitions.values() )
                 {
-                    ClonedServerEntry entry = partition.lookup( new LookupOperationContext( directoryService.getAdminSession(),
+                    Entry entry = partition.lookup( new LookupOperationContext( directoryService.getAdminSession(),
                         partition.getSuffix() ) );
 
                     if ( entry != null )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sun Jun 19 07:32:56 2011
@@ -30,16 +30,15 @@ import java.util.prefs.Preferences;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
@@ -224,7 +223,7 @@ public class ServerSystemPreferences ext
             list.beforeFirst();
             while ( list.next() )
             {
-                ClonedServerEntry entry = list.get();
+                Entry entry = list.get();
                 children.add( entry.getDn().getRdn().getNormValue().getString() );
             }
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sun Jun 19 07:32:56 2011
@@ -25,6 +25,7 @@ import javax.naming.Context;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.ReferralManager;
 import org.apache.directory.server.core.ReferralManagerImpl;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -353,7 +354,7 @@ public class ReferralInterceptor extends
             referralManager.lockWrite();
 
             referralManager.addReferral( newEntry );
-            referralManager.removeReferral( renameContext.getEntry().getOriginalEntry() );
+            referralManager.removeReferral( ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry() );
 
             referralManager.unlock();
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sun Jun 19 07:32:56 2011
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.ListOperationContext;
@@ -321,7 +320,7 @@ public class PartitionSchemaLoader exten
             {
                 while ( list.next() )
                 {
-                    ClonedServerEntry entry = list.get();
+                    Entry entry = list.get();
     
                     comparatorList.add( entry );
                 }
@@ -457,7 +456,7 @@ public class PartitionSchemaLoader exten
             {
                 while ( list.next() )
                 {
-                    ClonedServerEntry entry = list.get();
+                    Entry entry = list.get();
     
                     normalizerList.add( entry );
                 }
@@ -501,7 +500,7 @@ public class PartitionSchemaLoader exten
             {
                 while ( list.next() )
                 {
-                    ClonedServerEntry entry = list.get();
+                    Entry entry = list.get();
     
                     objectClassList.add( entry );
                 }

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=1137310&r1=1137309&r2=1137310&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 Sun Jun 19 07:32:56 2011
@@ -34,6 +34,7 @@ import javax.naming.directory.SearchCont
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
 import org.apache.directory.server.core.filtering.EntryFilter;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -933,7 +934,7 @@ public class SchemaInterceptor extends B
         Dn oldDn = renameContext.getDn();
         Rdn newRdn = renameContext.getNewRdn();
         boolean deleteOldRn = renameContext.getDeleteOldRdn();
-        Entry entry = renameContext.getEntry().getClonedEntry();
+        Entry entry = ((ClonedServerEntry)renameContext.getEntry()).getClonedEntry();
 
         /*
          *  Note: This is only a consistency checks, to the ensure that all

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Sun Jun 19 07:32:56 2011
@@ -79,7 +79,7 @@ public class StoredProcExecutionManager
      * @return The entry associated with the SP Unit.
      * @throws Exception If the unit cannot be located or any other error occurs.
      */
-    public ClonedServerEntry findStoredProcUnit( CoreSession session, String fullSPName ) throws Exception
+    public Entry findStoredProcUnit( CoreSession session, String fullSPName ) throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
@@ -94,8 +94,9 @@ public class StoredProcExecutionManager
             AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS );
         if ( results.first() )
         {
-            ClonedServerEntry entry = results.get();
+            Entry entry = results.get();
             results.close();
+            
             return entry;
         }
         
@@ -111,9 +112,9 @@ public class StoredProcExecutionManager
      * @return A {@link StoredProcEngine} associated with spUnitEntry.
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException If no {@link StoredProcEngine} that can be associated with the language identifier in spUnitEntry can be found.
      */
-    public StoredProcEngine getStoredProcEngineInstance( ClonedServerEntry spUnitEntry ) throws LdapException
+    public StoredProcEngine getStoredProcEngineInstance( Entry spUnitEntry ) throws LdapException
     {
-        String spLangId = ( String ) spUnitEntry.getOriginalEntry().get( "storedProcLangId" ).getString();
+        String spLangId = ( String ) ((ClonedServerEntry)spUnitEntry).getOriginalEntry().get( "storedProcLangId" ).getString();
 
         for ( StoredProcEngineConfig engineConfig : storedProcEngineConfigs )
         {
@@ -139,7 +140,7 @@ public class StoredProcExecutionManager
                     throw ne;
                 }
                 
-                engine.setSPUnitEntry( (Entry)spUnitEntry.getOriginalEntry() );
+                engine.setSPUnitEntry( (Entry)((ClonedServerEntry)spUnitEntry).getOriginalEntry() );
                 return engine;
             }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Jun 19 07:32:56 2011
@@ -821,7 +821,7 @@ public class SubentryInterceptor extends
     public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
         Dn dn = addContext.getDn();
-        ClonedServerEntry entry = addContext.getEntry();
+        Entry entry = addContext.getEntry();
 
         // Check if the added entry is a subentry
         if ( entry.contains( OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC ) )
@@ -1355,7 +1355,7 @@ public class SubentryInterceptor extends
     {
         Dn oldDn = renameContext.getDn();
 
-        Entry entry = renameContext.getEntry().getClonedEntry();
+        Entry entry = ((ClonedServerEntry)renameContext.getEntry()).getClonedEntry();
 
         if ( entry.contains( OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC ) )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Sun Jun 19 07:32:56 2011
@@ -370,7 +370,7 @@ public class TriggerInterceptor extends 
         }
 
         // Gather supplementary data.        
-        Entry renamedEntry = renameContext.getEntry().getClonedEntry();
+        Entry renamedEntry = ((ClonedServerEntry)renameContext.getEntry()).getClonedEntry();
 
         // @TODO : To be completely reviewed !!!
         Rdn oldRdn = name.getRdn();
@@ -598,11 +598,11 @@ public class TriggerInterceptor extends 
 
     private Object executeProcedure( OperationContext opContext, String procedure, Object[] values ) throws LdapException
     {
-
         try
         {
-            ClonedServerEntry spUnit = manager.findStoredProcUnit( opContext.getSession(), procedure );
+            Entry spUnit = manager.findStoredProcUnit( opContext.getSession(), procedure );
             StoredProcEngine engine = manager.getStoredProcEngineInstance( spUnit );
+            
             return engine.invokeProcedure( opContext.getSession(), procedure, values );
         }
         catch ( Exception e )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sun Jun 19 07:32:56 2011
@@ -36,7 +36,6 @@ import org.apache.directory.server.core.
 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.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
@@ -143,7 +142,7 @@ public class TriggerSpecCache
             {
                 while ( results.next() )
                 {
-                    ClonedServerEntry resultEntry = results.get();
+                    Entry resultEntry = results.get();
                     Dn subentryDn = resultEntry.getDn();
                     Attribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR );
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sun Jun 19 07:32:56 2011
@@ -241,7 +241,7 @@ public class SearchHandler extends LdapR
                 else
                 {
                     hasRootDSE = true;
-                    ClonedServerEntry entry = cursor.get();
+                    Entry entry = cursor.get();
                     session.getIoSession().write( generateResponse( session, req, entry ) );
                 }
             }
@@ -380,7 +380,7 @@ public class SearchHandler extends LdapR
                 break;
             }
 
-            ClonedServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
             session.getIoSession().write( generateResponse( session, req, entry ) );
             LOG.debug( "Sending {}", entry.getDn() );
             count++;
@@ -420,7 +420,7 @@ public class SearchHandler extends LdapR
                 break;
             }
 
-            ClonedServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
             session.getIoSession().write( generateResponse( session, req, entry ) );
             count++;
             pageCount++;

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Sun Jun 19 07:32:56 2011
@@ -28,7 +28,6 @@ import javax.security.sasl.AuthorizeCall
 
 import org.apache.directory.server.core.CoreSession;
 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.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
@@ -36,6 +35,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
@@ -100,7 +100,7 @@ public class CramMd5CallbackHandler exte
             
             cursor.beforeFirst();
             
-            ClonedServerEntry entry = null;
+            Entry entry = null;
             
             while ( cursor.next() )
             {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Sun Jun 19 07:32:56 2011
@@ -28,7 +28,6 @@ import javax.security.sasl.AuthorizeCall
 
 import org.apache.directory.server.core.CoreSession;
 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.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
@@ -36,6 +35,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
@@ -102,7 +102,7 @@ public class DigestMd5CallbackHandler ex
             
             cursor.beforeFirst();
             
-            ClonedServerEntry entry = null;
+            Entry entry = null;
             
             while ( cursor.next() )
             {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Sun Jun 19 07:32:56 2011
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.SerializationUtils;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.sp.StoredProcEngine;
 import org.apache.directory.server.core.sp.StoredProcEngineConfig;
 import org.apache.directory.server.core.sp.StoredProcExecutionManager;
@@ -39,6 +38,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureResponse;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.sp.LdapContextParameter;
 
@@ -69,10 +69,11 @@ public class StoredProcedureExtendedOper
     public void handleExtendedOperation( LdapSession session, StoredProcedureRequest req ) throws Exception
     {
         String procedure = req.getProcedureSpecification();
-        ClonedServerEntry spUnit = manager.findStoredProcUnit( session.getCoreSession(), procedure );
+        Entry spUnit = manager.findStoredProcUnit( session.getCoreSession(), procedure );
         StoredProcEngine engine = manager.getStoredProcEngineInstance( spUnit );
 
         List<Object> valueList = new ArrayList<Object>( req.size() );
+        
         for ( int ii = 0; ii < req.size(); ii++ )
         {
             byte[] serializedValue = ( byte[] ) req.getParameterValue( ii );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Sun Jun 19 07:32:56 2011
@@ -37,7 +37,6 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.ldap.client.api.future.SearchFuture;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
@@ -48,7 +47,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -66,7 +64,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.IntermediateResponse;
 import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
@@ -956,7 +953,7 @@ public class SyncReplConsumer implements
 
         while ( cursor.next() )
         {
-            ClonedServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
             deleteRecursive( entry.getDn(), null );
         }
 
@@ -1075,7 +1072,7 @@ public class SyncReplConsumer implements
             {
                 do
                 {
-                    ClonedServerEntry entry = cursor.get();
+                    Entry entry = cursor.get();
 
                     deleteRecursive( entry.getDn(), cursorMap );
                 }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplRequestHandler.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplRequestHandler.java Sun Jun 19 07:32:56 2011
@@ -38,7 +38,6 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.event.EventType;
 import org.apache.directory.server.core.event.NotificationCriteria;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -561,7 +560,7 @@ public class SyncReplRequestHandler impl
                 break;
             }
 
-            ClonedServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
 
             sendSearchResultEntry( session, req, entry, SyncStateTypeEnum.ADD );
 

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sun Jun 19 07:32:56 2011
@@ -40,7 +40,6 @@ import org.apache.directory.server.confi
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.InstanceLayout;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.partition.Partition;
@@ -53,9 +52,10 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ntp.NtpServer;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
@@ -640,7 +640,7 @@ public class ApacheDsService
 
         while ( cursor.next() )
         {
-            ClonedServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
 
             AttributeType atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.ENTRY_UUID_AT ).getAttributeType();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Sun Jun 19 07:32:56 2011
@@ -38,6 +38,9 @@ public abstract class AbstractIndexCurso
     private ClosureMonitor monitor = new DefaultClosureMonitor();
 
 
+    /**
+     * {@inheritDoc}
+     */
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         if ( monitor == null )
@@ -49,30 +52,45 @@ public abstract class AbstractIndexCurso
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     protected final void checkNotClosed( String operation ) throws Exception
     {
         monitor.checkNotClosed();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public final boolean isClosed()
     {
         return monitor.isClosed();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void close() throws Exception
     {
         monitor.close();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void close( Exception cause ) throws Exception
     {
         monitor.close( cause );
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public Iterator<IndexEntry<K, E, ID>> iterator()
     {
         return new CursorIterator<IndexEntry<K, E, ID>>( this );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Sun Jun 19 07:32:56 2011
@@ -46,7 +46,6 @@ public class EqualityCursor<V, ID extend
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_714 );
 
     /** An equality evaluator for candidates */
-    @SuppressWarnings("unchecked")
     private final EqualityEvaluator equalityEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/TupleCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/TupleCursor.java?rev=1137310&r1=1137309&r2=1137310&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/TupleCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/TupleCursor.java Sun Jun 19 07:32:56 2011
@@ -25,7 +25,7 @@ package org.apache.directory.shared.ldap
  * inefficiencies encountered when scanning over Tuples.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @param <K> The Tupe key type
+ * @param <K> The Tuple key type
  * @param <V> The Value type stored in the Tuple
  */
 public interface TupleCursor<K, V> extends Cursor<Tuple<K, V>>



Mime
View raw message