directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [5/10] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-annota...
Date Wed, 28 Apr 2010 08:44:47 GMT
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Wed Apr 28 08:44:42 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -61,7 +61,7 @@ public class CollectiveAttributesSchemaC
         this.schemaManager = schemaManager;
     }
     
-    /* package scope*/ void checkAdd( DN normName, ServerEntry entry ) throws Exception
+    /* package scope*/ void checkAdd( DN normName, Entry entry ) throws Exception
     {
         if ( entry.hasObjectClass( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC ) )
         {
@@ -80,8 +80,8 @@ public class CollectiveAttributesSchemaC
     
     public void checkModify( OperationContext opContext, DN normName, List<Modification> mods ) throws Exception
     {
-        ServerEntry originalEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
-        ServerEntry targetEntry = (ServerEntry)SchemaUtils.getTargetEntry( mods, originalEntry );
+        Entry originalEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
+        Entry targetEntry = (Entry)SchemaUtils.getTargetEntry( mods, originalEntry );
         
         EntryAttribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT );
         
@@ -134,7 +134,7 @@ public class CollectiveAttributesSchemaC
     }
     
     
-    private boolean containsAnyCollectiveAttributes( ServerEntry entry ) throws NamingException
+    private boolean containsAnyCollectiveAttributes( Entry entry ) throws NamingException
     {
         Set<AttributeType> attributeTypes = entry.getAttributeTypes();
         

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -42,7 +42,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
 import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
@@ -290,7 +290,7 @@ public class EventInterceptor extends Ba
     }
     
     
-    List<RegistrationEntry> getSelectingRegistrations( DN name, ServerEntry entry ) throws Exception
+    List<RegistrationEntry> getSelectingRegistrations( DN name, Entry entry ) throws Exception
     {
         if ( registrations.isEmpty() )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -94,9 +94,9 @@ public class ExpressionEvaluator impleme
     // ------------------------------------------------------------------------
 
     /**
-     * @see Evaluator#evaluate(ExprNode, String, ServerEntry)
+     * @see Evaluator#evaluate(ExprNode, String, Entry)
      */
-    public boolean evaluate( ExprNode node, DN dn, ServerEntry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
     {
         if ( node.isLeaf() )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
@@ -106,9 +106,9 @@ public class LeafEvaluator implements Ev
 
 
     /**
-     * @see Evaluator#evaluate(ExprNode, String, ServerEntry)
+     * @see Evaluator#evaluate(ExprNode, String, Entry)
      */
-    public boolean evaluate( ExprNode node, DN dn, ServerEntry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
     {
         if ( node instanceof ScopeNode )
         {
@@ -159,7 +159,7 @@ public class LeafEvaluator implements Ev
      * @throws LdapException if there is a database access failure
      */
     @SuppressWarnings("unchecked")
-    private boolean evalGreaterOrLesser( SimpleNode<?> node, ServerEntry entry, boolean isGreaterOrLesser )
+    private boolean evalGreaterOrLesser( SimpleNode<?> node, Entry entry, boolean isGreaterOrLesser )
         throws LdapException
     {
         String attrId = node.getAttribute();
@@ -226,7 +226,7 @@ public class LeafEvaluator implements Ev
      * @param entry the perspective candidate
      * @return the ava evaluation on the perspective candidate
      */
-    private boolean evalPresence( String attrId, ServerEntry entry ) throws LdapException
+    private boolean evalPresence( String attrId, Entry entry ) throws LdapException
     {
         if ( entry == null )
         {
@@ -247,7 +247,7 @@ public class LeafEvaluator implements Ev
      * @throws LdapException if there is a database access failure
      */
     @SuppressWarnings("unchecked")
-    private boolean evalEquality( EqualityNode<?> node, ServerEntry entry ) throws LdapException
+    private boolean evalEquality( EqualityNode<?> node, Entry entry ) throws LdapException
     {
         Normalizer normalizer = getNormalizer( node.getAttribute() );
         Comparator comparator = getComparator( node.getAttribute() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -43,9 +43,9 @@ public class ScopeEvaluator implements E
 
 
     /**
-     * @see Evaluator#evaluate(ExprNode , String, ServerEntry)
+     * @see Evaluator#evaluate(ExprNode , String, Entry)
      */
-    public boolean evaluate( ExprNode node, DN dn, ServerEntry record ) throws LdapException
+    public boolean evaluate( ExprNode node, DN dn, Entry record ) throws LdapException
     {
         ScopeNode snode = ( ScopeNode ) node;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Wed Apr 28 08:44:42 2010
@@ -25,7 +25,7 @@ import java.util.regex.PatternSyntaxExce
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException;
@@ -63,9 +63,9 @@ public class SubstringEvaluator implemen
 
 
     /**
-     * @see Evaluator#evaluate( ExprNode, String, ServerEntry )
+     * @see Evaluator#evaluate( ExprNode, String, Entry )
      */
-    public boolean evaluate( ExprNode node, DN dn, ServerEntry entry ) throws LdapException
+    public boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException
     {
         Pattern regex = null;
         SubstringNode snode = (SubstringNode)node;

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAliasException;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
@@ -266,7 +266,7 @@ public class ExceptionInterceptor extend
         if ( opContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
         {
             // there is nothing under the schema subentry
-            return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+            return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
         }
         
         // check if entry to search exists
@@ -314,7 +314,7 @@ public class ExceptionInterceptor extend
         
         assertHasEntry( nextInterceptor, opContext, msg, opContext.getDn() );
 
-        ServerEntry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
         List<Modification> items = opContext.getModItems();
 
         for ( Modification item : items )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -107,7 +107,7 @@ public class JournalInterceptor extends 
             opRevision = revision.incrementAndGet();
             
             // Store the added entry
-            ServerEntry addEntry = opContext.getEntry();
+            Entry addEntry = opContext.getEntry();
 
             LdifEntry ldif = new LdifEntry();
             ldif.setChangeType( ChangeType.Add );

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -45,7 +45,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.name.AVA;
@@ -197,7 +197,7 @@ public class NormalizationInterceptor ex
         if ( result == null )
         {
             LOG.warn( "undefined filter based on undefined attributeType not evaluted at all.  Returning empty enumeration." );
-            return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+            return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
         }
         else
         {
@@ -347,7 +347,7 @@ public class NormalizationInterceptor ex
      * @param dn the DN
      * @param entry the entry
      */
-    private void addRdnAttributesToEntry( DN dn, ServerEntry entry ) throws Exception
+    private void addRdnAttributesToEntry( DN dn, Entry entry ) throws Exception
     {
         if ( dn == null || entry == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Wed Apr 28 08:44:42 2010
@@ -48,12 +48,12 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.AVA;
@@ -167,7 +167,7 @@ public class OperationalAttributeInterce
     {
         String principal = getPrincipal().getName();
         
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
 
         /*
          * @TODO : This code was probably created while working on Mitosis. Most probably dead code. Commented. 
@@ -339,7 +339,7 @@ public class OperationalAttributeInterce
         DN newDn = opContext.getNewDn();
         
         // add operational attributes after call in case the operation fails
-        ServerEntry serverEntry = new DefaultServerEntry( schemaManager, newDn );
+        Entry serverEntry = new DefaultClientEntry( schemaManager, newDn );
         serverEntry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal().getName() );
         serverEntry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
 
@@ -357,7 +357,7 @@ public class OperationalAttributeInterce
         nextInterceptor.move( opContext );
 
         // add operational attributes after call in case the operation fails
-        ServerEntry serverEntry = new DefaultServerEntry( schemaManager, opContext.getDn() );
+        Entry serverEntry = new DefaultClientEntry( schemaManager, opContext.getDn() );
         serverEntry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal().getName() );
         serverEntry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
 
@@ -377,7 +377,7 @@ public class OperationalAttributeInterce
         nextInterceptor.moveAndRename( opContext );
 
         // add operational attributes after call in case the operation fails
-        ServerEntry serverEntry = new DefaultServerEntry( schemaManager, opContext.getDn() );
+        Entry serverEntry = new DefaultClientEntry( schemaManager, opContext.getDn() );
         serverEntry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal().getName() );
         serverEntry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
 
@@ -449,7 +449,7 @@ public class OperationalAttributeInterce
      * @return true always
      * @throws Exception if there are failures in evaluation
      */
-    private boolean filterOperationalAttributes( ServerEntry attributes ) throws Exception
+    private boolean filterOperationalAttributes( Entry attributes ) throws Exception
     {
         Set<AttributeType> removedAttributes = new HashSet<AttributeType>();
 
@@ -472,7 +472,7 @@ public class OperationalAttributeInterce
     }
 
 
-    private void filter( LookupOperationContext lookupContext, ServerEntry entry ) throws Exception
+    private void filter( LookupOperationContext lookupContext, Entry entry ) throws Exception
     {
         DN dn = lookupContext.getDn();
         List<String> ids = lookupContext.getAttrsId();
@@ -505,7 +505,7 @@ public class OperationalAttributeInterce
     }
 
     
-    public void denormalizeEntryOpAttrs( ServerEntry entry ) throws Exception
+    public void denormalizeEntryOpAttrs( Entry entry ) throws Exception
     {
         if ( service.isDenormalizeOpAttrsEnabled() )
         {
@@ -592,7 +592,7 @@ public class OperationalAttributeInterce
     }
 
 
-    private boolean filterDenormalized( ServerEntry entry ) throws Exception
+    private boolean filterDenormalized( Entry entry ) throws Exception
     {
         denormalizeEntryOpAttrs( entry );
         return true;

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -82,10 +82,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
@@ -127,7 +127,7 @@ public class DefaultPartitionNexus  exte
     private static final String ASF = "Apache Software Foundation";
 
     /** the read only rootDSE attributes */
-    private final ServerEntry rootDSE;
+    private final Entry rootDSE;
 
     /** The DirectoryService instance */
     private DirectoryService directoryService;
@@ -158,7 +158,7 @@ public class DefaultPartitionNexus  exte
      * @param rootDSE the root entry for the DSA
      * @throws javax.naming.Exception on failure to initialize
      */
-    public DefaultPartitionNexus( ServerEntry rootDSE ) throws Exception
+    public DefaultPartitionNexus( Entry rootDSE ) throws Exception
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
@@ -305,7 +305,7 @@ public class DefaultPartitionNexus  exte
         // Add root context entry for system partition
         DN systemSuffixDn = new DN( ServerDNConstants.SYSTEM_DN );
         systemSuffixDn.normalize( schemaManager.getNormalizerMapping() );
-        ServerEntry systemEntry = new DefaultServerEntry( schemaManager, systemSuffixDn );
+        Entry systemEntry = new DefaultClientEntry( schemaManager, systemSuffixDn );
 
         // Add the ObjectClasses
         systemEntry.put( SchemaConstants.OBJECT_CLASS_AT,
@@ -725,8 +725,8 @@ public class DefaultPartitionNexus  exte
         // -----------------------------------------------------------
         if ( ( ids == null ) || ( ids.length == 0 ) )
         {
-            ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
-            return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( rootDSE ), searchOperationContext );
+            Entry rootDSE = (Entry)getRootDSE( null ).clone();
+            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchOperationContext );
         }
         
         // -----------------------------------------------------------
@@ -756,20 +756,20 @@ public class DefaultPartitionNexus  exte
         // return nothing
         if ( noAttribute )
         {
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
-            return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( serverEntry ), searchOperationContext );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, DN.EMPTY_DN );
+            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchOperationContext );
         }
         
         // return everything
         if ( allUserAttributes && allOperationalAttributes )
         {
-            ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
-            return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( rootDSE ), searchOperationContext );
+            Entry rootDSE = (Entry)getRootDSE( null ).clone();
+            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchOperationContext );
         }
         
-        ServerEntry serverEntry = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
+        Entry serverEntry = new DefaultClientEntry( schemaManager, DN.EMPTY_DN );
         
-        ServerEntry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchOperationContext.getSession() ) );
+        Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchOperationContext.getSession() ) );
         
         for ( EntryAttribute attribute:rootDSE )
         {
@@ -789,7 +789,7 @@ public class DefaultPartitionNexus  exte
             }
         }
 
-        return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( serverEntry ), searchOperationContext );
+        return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchOperationContext );
     }
     
 
@@ -835,7 +835,7 @@ public class DefaultPartitionNexus  exte
             }
             else if ( isObjectScope && ( ! isSearchAll ) )
             {
-                return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+                return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
             }
             else if( isOnelevelScope )
             {

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -119,7 +119,7 @@ public class ServerSystemPreferences ext
             
             if ( ! directoryService.getAdminSession().exists( dn ) )
             {
-                ServerEntry entry = directoryService.newEntry( dn );
+                Entry entry = directoryService.newEntry( dn );
                 entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, 
                     ApacheSchemaConstants.PREF_NODE_OC, SchemaConstants.EXTENSIBLE_OBJECT_OC );
                 entry.add( "prefNodeName", name );
@@ -243,7 +243,7 @@ public class ServerSystemPreferences ext
 
         try
         {
-            ServerEntry entry = directoryService.getAdminSession().lookup( dn );
+            Entry entry = directoryService.getAdminSession().lookup( dn );
 
             for ( EntryAttribute attr : entry )
             {

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.DN;
@@ -141,7 +141,7 @@ public class ReferralInterceptor extends
     }
 
     
-    static private boolean isReferral( ServerEntry entry ) throws NamingException
+    static private boolean isReferral( Entry entry ) throws NamingException
     {
         // Check that the entry is not null, otherwise return FALSE.
         // This is typically to cover the case where the entry has not 
@@ -232,7 +232,7 @@ public class ReferralInterceptor extends
      */
     public void add( NextInterceptor next, AddOperationContext opContext ) throws Exception
     {
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         
         // Check if the entry is a referral itself
         boolean isReferral = isReferral( entry );
@@ -269,7 +269,7 @@ public class ReferralInterceptor extends
      */
     public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
     {
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
 
         // First delete the entry into the server
         next.delete( opContext );
@@ -309,7 +309,7 @@ public class ReferralInterceptor extends
             // Update the referralManager
             LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), newName );
             
-            ServerEntry newEntry = nexus.lookup( lookupContext );
+            Entry newEntry = nexus.lookup( lookupContext );
             
             referralManager.lockWrite();
             
@@ -339,7 +339,7 @@ public class ReferralInterceptor extends
             // Update the referralManager
             LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), newName );
             
-            ServerEntry newEntry = nexus.lookup( lookupContext );
+            Entry newEntry = nexus.lookup( lookupContext );
             
             referralManager.lockWrite();
             
@@ -363,7 +363,7 @@ public class ReferralInterceptor extends
             // Update the referralManager
             LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), opContext.getNewDn() );
             
-            ServerEntry newEntry = nexus.lookup( lookupContext );
+            Entry newEntry = nexus.lookup( lookupContext );
             
             referralManager.lockWrite();
             
@@ -399,7 +399,7 @@ public class ReferralInterceptor extends
         // But we will have to store the modified entry into the opContext
         LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(), name );
         
-        ServerEntry newEntry = nexus.lookup( lookupContext );
+        Entry newEntry = nexus.lookup( lookupContext );
 
         // Check that we have the entry, just in case
         // TODO : entries should be locked until the operation is done on it.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Wed Apr 28 08:44:42 2010
@@ -27,9 +27,9 @@ import org.apache.directory.server.const
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -59,7 +59,7 @@ public class DefaultSchemaService implem
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
     /** cached version of the schema subentry with all attributes in it */
-    private ServerEntry schemaSubentry;
+    private Entry schemaSubentry;
     private final Object lock = new Object();
 
     /** a handle on the schema partition */
@@ -281,9 +281,9 @@ public class DefaultSchemaService implem
     /**
      * Creates the SSSE by extracting all the SchemaObjects from the registries.
      */
-    private void generateSchemaSubentry( ServerEntry mods ) throws LdapException
+    private void generateSchemaSubentry( Entry mods ) throws LdapException
     {
-        ServerEntry attrs = new DefaultServerEntry( getSchemaManager(), mods.getDn() );
+        Entry attrs = new DefaultClientEntry( getSchemaManager(), mods.getDn() );
 
         // add the objectClass attribute : 'top', 'subschema', 'subentry' and 'apacheSubschema' 
         attrs.put( SchemaConstants.OBJECT_CLASS_AT, 
@@ -338,7 +338,7 @@ public class DefaultSchemaService implem
     }
 
 
-    private void addAttribute( ServerEntry attrs, String id ) throws LdapException
+    private void addAttribute( Entry attrs, String id ) throws LdapException
     {
         EntryAttribute attr = schemaSubentry.get( id );
 
@@ -352,7 +352,7 @@ public class DefaultSchemaService implem
     /**
      * {@inheritDoc}
      */
-    public ServerEntry getSubschemaEntryImmutable() throws Exception
+    public Entry getSubschemaEntryImmutable() throws Exception
     {
         synchronized ( schemaSubentrLock )
         {
@@ -362,7 +362,7 @@ public class DefaultSchemaService implem
                         new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
             }
     
-            return ( ServerEntry ) schemaSubentry.clone();
+            return ( Entry ) schemaSubentry.clone();
         }
     }
     
@@ -390,7 +390,7 @@ public class DefaultSchemaService implem
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaService#getSubschemaEntryCloned()
      */
-    public ServerEntry getSubschemaEntryCloned() throws Exception
+    public Entry getSubschemaEntryCloned() throws Exception
     {
         if ( schemaSubentry == null )
         {
@@ -398,14 +398,14 @@ public class DefaultSchemaService implem
                     new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
         }
 
-        return ( ServerEntry ) schemaSubentry.clone();
+        return ( Entry ) schemaSubentry.clone();
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public ServerEntry getSubschemaEntry( String[] ids ) throws Exception
+    public Entry getSubschemaEntry( String[] ids ) throws Exception
     {
         if ( ids == null )
         {
@@ -413,7 +413,7 @@ public class DefaultSchemaService implem
         }
 
         Set<String> setOids = new HashSet<String>();
-        ServerEntry attrs = new DefaultServerEntry( getSchemaManager(), DN.EMPTY_DN );
+        Entry attrs = new DefaultClientEntry( getSchemaManager(), DN.EMPTY_DN );
         boolean returnAllOperationalAttributes = false;
 
         synchronized( lock )
@@ -422,7 +422,7 @@ public class DefaultSchemaService implem
             // Check if we need an update by looking at timestamps on disk
             // ---------------------------------------------------------------
 
-            ServerEntry mods = 
+            Entry mods = 
                 schemaPartition.lookup( 
                     new LookupOperationContext( null, schemaModificationAttributesDN ) );
             

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Wed Apr 28 08:44:42 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -134,7 +134,7 @@ public class SchemaChecker
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyReplace( 
-        ObjectClassRegistry registry, DN name, ModificationOperation mod, ServerEntry entry ) throws LdapException
+        ObjectClassRegistry registry, DN name, ModificationOperation mod, Entry entry ) throws LdapException
     {
         if ( mod != ModificationOperation.REPLACE_ATTRIBUTE )
         {
@@ -454,7 +454,7 @@ public class SchemaChecker
      * @throws LdapException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyReplace( 
-        DN name, ModificationOperation mod, ServerEntry entry, 
+        DN name, ModificationOperation mod, Entry entry, 
         SchemaManager schemaManager )
         throws LdapException
     {
@@ -604,7 +604,7 @@ public class SchemaChecker
      * @throws LdapException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyRemove( DN name, ModificationOperation mod, 
-        ServerEntry entry, SchemaManager schemaManager )
+        Entry entry, SchemaManager schemaManager )
         throws LdapException
     {
         if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -733,7 +733,7 @@ public class SchemaInterceptor extends B
                 }
                 else
                 {
-                    return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+                    return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
                 }
 
                 String nodeOid = schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() );
@@ -744,13 +744,13 @@ public class SchemaInterceptor extends B
                         .equals( SchemaConstants.SUBSCHEMA_OC_OID ) ) && ( node instanceof EqualityNode ) )
                 {
                     // call.setBypass( true );
-                    ServerEntry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
+                    Entry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
                     serverEntry.setDn( base );
-                    return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( serverEntry ), opContext );
+                    return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), opContext );
                 }
                 else
                 {
-                    return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+                    return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
                 }
             }
             else if ( filter instanceof PresenceNode )
@@ -761,9 +761,9 @@ public class SchemaInterceptor extends B
                 if ( node.getAttribute().equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
                 {
                     // call.setBypass( true );
-                    ServerEntry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
+                    Entry serverEntry = schemaService.getSubschemaEntry( searchCtls.getReturningAttributes() );
                     serverEntry.setDn( base );
-                    EntryFilteringCursor cursor = new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>(
+                    EntryFilteringCursor cursor = new BaseEntryFilteringCursor( new SingletonCursor<Entry>(
                         serverEntry ), opContext );
                     return cursor;
                 }
@@ -771,7 +771,7 @@ public class SchemaInterceptor extends B
         }
 
         // In any case not handled previously, just return an empty result
-        return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), opContext );
+        return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), opContext );
     }
 
 
@@ -864,7 +864,7 @@ public class SchemaInterceptor extends B
      * @return
      * @throws Exception
      */
-    private boolean isCompleteRemoval( EntryAttribute change, ServerEntry entry ) throws Exception
+    private boolean isCompleteRemoval( EntryAttribute change, Entry entry ) throws Exception
     {
         // if change size is 0 then all values are deleted then we're in trouble
         if ( change.size() == 0 )
@@ -1106,7 +1106,7 @@ public class SchemaInterceptor extends B
         DN oldDn = opContext.getDn();
         RDN newRdn = opContext.getNewRdn();
         boolean deleteOldRn = opContext.getDelOldDn();
-        ServerEntry entry =  (ServerEntry)opContext.getEntry().getClonedEntry();
+        Entry entry =  (Entry)opContext.getEntry().getClonedEntry();
 
         /*
          *  Note: This is only a consistency checks, to the ensure that all
@@ -1116,7 +1116,7 @@ public class SchemaInterceptor extends B
          */
         if ( deleteOldRn )
         {
-            ServerEntry tmpEntry = ( ServerEntry ) entry.clone();
+            Entry tmpEntry = ( Entry ) entry.clone();
             RDN oldRDN = oldDn.getRdn();
 
             // Delete the old RDN means we remove some attributes and values.
@@ -1181,14 +1181,14 @@ public class SchemaInterceptor extends B
     /**
      * Modify an entry, applying the given modifications, and check if it's OK
      */
-    private void checkModifyEntry( DN dn, ServerEntry currentEntry, List<Modification> mods ) throws Exception
+    private void checkModifyEntry( DN dn, Entry currentEntry, List<Modification> mods ) throws Exception
     {
         // The first step is to check that the modifications are valid :
         // - the ATs are present in the schema
         // - The value is syntaxically correct
         //
         // While doing that, we will apply the modification to a copy of the current entry
-        ServerEntry tempEntry = (ServerEntry)currentEntry.clone();
+        Entry tempEntry = (Entry)currentEntry.clone();
         
         // Now, apply each mod one by one
         for ( Modification mod:mods )
@@ -1406,7 +1406,7 @@ public class SchemaInterceptor extends B
             return;
         }
 
-        ServerEntry entry = opContext.getEntry();
+        Entry entry = opContext.getEntry();
         List<Modification> modifications = opContext.getModItems();
         checkModifyEntry( dn, entry, modifications );
         
@@ -1458,7 +1458,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private void filterObjectClass( ServerEntry entry ) throws Exception
+    private void filterObjectClass( Entry entry ) throws Exception
     {
         List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
         EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
@@ -1482,7 +1482,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private void filterBinaryAttributes( ServerEntry entry ) throws Exception
+    private void filterBinaryAttributes( Entry entry ) throws Exception
     {
         /*
          * start converting values of attributes to byte[]s which are not
@@ -1547,7 +1547,7 @@ public class SchemaInterceptor extends B
      * 
      * We also check the syntaxes
      */
-    private void check( DN dn, ServerEntry entry ) throws Exception
+    private void check( DN dn, Entry entry ) throws Exception
     {
         // ---------------------------------------------------------------
         // First, make sure all attributes are valid schema defined attributes
@@ -1611,7 +1611,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private void checkOcSuperior( ServerEntry entry ) throws Exception
+    private void checkOcSuperior( Entry entry ) throws Exception
     {
         // handle the m-supObjectClass meta attribute
         EntryAttribute supOC = entry.get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
@@ -1680,7 +1680,7 @@ public class SchemaInterceptor extends B
     public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
     {
         DN name = addContext.getDn();
-        ServerEntry entry = addContext.getEntry();
+        Entry entry = addContext.getEntry();
 
         check( name, entry );
 
@@ -1755,7 +1755,7 @@ public class SchemaInterceptor extends B
      * @return true if the objectClass values require the attribute, false otherwise
      * @throws Exception if the attribute is not recognized
      */
-    private void assertAllAttributesAllowed( DN dn, ServerEntry entry, Set<String> allowed ) throws Exception
+    private void assertAllAttributesAllowed( DN dn, Entry entry, Set<String> allowed ) throws Exception
     {
         // Never check the attributes if the extensibleObject objectClass is
         // declared for this entry
@@ -1944,7 +1944,7 @@ public class SchemaInterceptor extends B
     }
     
     
-    private void assertRdn( DN dn, ServerEntry entry ) throws Exception
+    private void assertRdn( DN dn, Entry entry ) throws Exception
     {
         for ( AVA atav : dn.getRdn() )
         {
@@ -2054,11 +2054,11 @@ public class SchemaInterceptor extends B
      * to valid String if they are stored as byte[], and that non Human Readable attributes
      * stored as String can be transformed to byte[]
      */
-    private void assertHumanReadable( ServerEntry entry ) throws Exception
+    private void assertHumanReadable( Entry entry ) throws Exception
     {
         boolean isModified = false;
 
-        ServerEntry clonedEntry = null;
+        Entry clonedEntry = null;
 
         // Loops on all attributes
         for ( EntryAttribute attribute : entry )
@@ -2081,7 +2081,7 @@ public class SchemaInterceptor extends B
             {
                 if ( clonedEntry == null )
                 {
-                    clonedEntry = ( ServerEntry ) entry.clone();
+                    clonedEntry = ( Entry ) entry.clone();
                 }
 
                 // Switch the attributes

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
@@ -153,7 +153,7 @@ public class SchemaSubentryManager
 
     
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, boolean)
      */
     public void modifySchemaSubentry( ModifyOperationContext opContext, boolean doCascadeModify ) throws Exception 
     {
@@ -185,10 +185,10 @@ public class SchemaSubentryManager
     
     
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.DN, int, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
+     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.DN, int, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, boolean)
      */
-    public void modifySchemaSubentry( ModifyOperationContext opContext, DN name, int modOp, ServerEntry mods, 
-        ServerEntry subentry, ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception
+    public void modifySchemaSubentry( ModifyOperationContext opContext, DN name, int modOp, Entry mods, 
+        Entry subentry, Entry targetSubentry, boolean doCascadeModify ) throws Exception
     {
         Set<AttributeType> attributeTypes = mods.getAttributeTypes();
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Wed Apr 28 08:44:42 2010
@@ -33,9 +33,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.utils.AttributesFactory;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -150,7 +149,7 @@ public class SchemaSubentryModifier
         
         Entry entry = getEntry( dn, comparatorDescription );
 
-        opContext.add( (ServerEntry)entry, BYPASS );
+        opContext.add( (Entry)entry, BYPASS );
     }
     
     
@@ -165,7 +164,7 @@ public class SchemaSubentryModifier
         
         Entry entry = getEntry( dn, normalizerDescription );
 
-        opContext.add( (ServerEntry)entry, BYPASS );
+        opContext.add( (Entry)entry, BYPASS );
     }
     
     
@@ -179,7 +178,7 @@ public class SchemaSubentryModifier
             SchemaConstants.OU_SCHEMA );
         
         Entry entry = getEntry( dn, syntaxCheckerDescription );
-        opContext.add( (ServerEntry)entry, BYPASS );
+        opContext.add( (Entry)entry, BYPASS );
     }
     
     
@@ -187,7 +186,7 @@ public class SchemaSubentryModifier
     {
         Schema schema = schemaManager.getLoadedSchema( obj.getSchemaName() );
         DN dn = getDn( obj );
-        ServerEntry entry = factory.getAttributes( obj, schema, schemaManager );
+        Entry entry = factory.getAttributes( obj, schema, schemaManager );
         entry.setDn( dn );
 
         opContext.add( entry, BYPASS );
@@ -241,7 +240,7 @@ public class SchemaSubentryModifier
 
     private Entry getEntry( DN dn, LdapComparatorDescription comparatorDescription )
     {
-        Entry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         
         entry.put( SchemaConstants.OBJECT_CLASS_AT, 
                     SchemaConstants.TOP_OC, 
@@ -268,7 +267,7 @@ public class SchemaSubentryModifier
 
     private Entry getEntry( DN dn, NormalizerDescription normalizerDescription )
     {
-        Entry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, 
             SchemaConstants.TOP_OC, 
@@ -306,7 +305,7 @@ public class SchemaSubentryModifier
     
     private Entry getEntry( DN dn, SyntaxCheckerDescription syntaxCheckerDescription )
     {
-        Entry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         
         entry.put( SchemaConstants.OBJECT_CLASS_AT, 
             SchemaConstants.TOP_OC, 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Wed Apr 28 08:44:42 2010
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.SingletonEnumeration;
 import org.slf4j.Logger;
@@ -77,7 +77,7 @@ public class CoreKeyStoreSpi extends Key
     }
 
 
-    private ServerEntry getTlsEntry() throws Exception
+    private Entry getTlsEntry() throws Exception
     {
         DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
         adminDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
@@ -137,7 +137,7 @@ public class CoreKeyStoreSpi extends Key
         {
             try
             {
-                ServerEntry entry = getTlsEntry();
+                Entry entry = getTlsEntry();
                 return TlsKeyGenerator.getCertificate( entry );
             }
             catch ( Exception e )
@@ -170,7 +170,7 @@ public class CoreKeyStoreSpi extends Key
         
         try
         {
-            ServerEntry entry = getTlsEntry();
+            Entry entry = getTlsEntry();
             if ( ArrayUtils.isEquals( cert.getEncoded(), entry.get( TlsKeyGenerator.USER_CERTIFICATE_AT ).getBytes() ) )
             {
                 return APACHEDS_ALIAS;
@@ -194,7 +194,7 @@ public class CoreKeyStoreSpi extends Key
         LOG.debug( "engineGetCertificateChain({}) called.", alias );
         try
         {
-            ServerEntry entry = getTlsEntry();
+            Entry entry = getTlsEntry();
             LOG.debug( "Entry:\n{}", entry );
             return new Certificate[] { TlsKeyGenerator.getCertificate( entry ) };
         }
@@ -228,7 +228,7 @@ public class CoreKeyStoreSpi extends Key
         
         try
         {
-            ServerEntry entry = getTlsEntry();
+            Entry entry = getTlsEntry();
             KeyPair keyPair = TlsKeyGenerator.getKeyPair( entry );
             return keyPair.getPrivate();
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java Wed Apr 28 08:44:42 2010
@@ -44,7 +44,7 @@ import javax.security.auth.x500.X500Prin
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.x509.X509V1CertificateGenerator;
@@ -106,7 +106,7 @@ public class TlsKeyGenerator
      * @return the X509 certificate associated with that entry
      * @throws LdapException if there are problems accessing or decoding
      */
-    public static X509Certificate getCertificate( ServerEntry entry ) throws LdapException
+    public static X509Certificate getCertificate( Entry entry ) throws LdapException
     {
         X509Certificate cert = null;
         CertificateFactory certFactory = null;
@@ -147,7 +147,7 @@ public class TlsKeyGenerator
      * @return the private and public key pair
      * @throws LdapException if there are format or access issues
      */
-    public static KeyPair getKeyPair( ServerEntry entry ) throws LdapException
+    public static KeyPair getKeyPair( Entry entry ) throws LdapException
     {
         PublicKey publicKey = null;
         PrivateKey privateKey = null;
@@ -206,7 +206,7 @@ public class TlsKeyGenerator
      * @param entry the entry to add security attributes to
      * @throws LdapException on problems generating the content in the entry
      */
-    public static void addKeyPair( ServerEntry entry ) throws LdapException
+    public static void addKeyPair( Entry entry ) throws LdapException
     {
         EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
         
@@ -280,12 +280,12 @@ public class TlsKeyGenerator
     
 
     /**
-     * @see #addKeyPair(ServerEntry)
+     * @see #addKeyPair(Entry)
      * 
      * TODO the code is duplicate atm, will eliminate this redundancy after finding
      * a better thought (an instant one is to call this method from the aboveaddKeyPair(entry) and remove the impl there)
      */
-    public static void addKeyPair( ServerEntry entry, String issuerDN, String subjectDN, String keyAlgo ) throws LdapException
+    public static void addKeyPair( Entry entry, String issuerDN, String subjectDN, String keyAlgo ) throws LdapException
     {
         EntryAttribute objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Wed Apr 28 08:44:42 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -101,11 +101,11 @@ public class LdapClassLoader extends Cla
                     if ( cursor.next() ) // there should be only one!
                     {
                         log.debug( "Class {} found under {} search context.", name, base );
-                        ServerEntry classEntry = cursor.get();
+                        Entry classEntry = cursor.get();
 
                         if ( cursor.next() )
                         {
-                            ServerEntry other = cursor.get();
+                            Entry other = cursor.get();
                             log.warn( "More than one class found on classpath at locations: {} \n\tand {}", 
                                 classEntry, other );
                         }
@@ -142,7 +142,7 @@ public class LdapClassLoader extends Cla
             // copy - there's absolutely no reason why we should be performing this
             // lookup every time!!!
             
-            ServerEntry configEntry = null;
+            Entry configEntry = null;
             
             try
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -46,7 +46,7 @@ public interface StoredProcEngine
      * <p>
      * This method should be called before an attempt to invoke a stored procedure via this Engine.
      */
-    public void setSPUnitEntry( final ServerEntry spUnit );
+    public void setSPUnitEntry( final Entry spUnit );
     
     
     /**

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -140,7 +140,7 @@ public class StoredProcExecutionManager
                     throw ne;
                 }
                 
-                engine.setSPUnitEntry( (ServerEntry)spUnitEntry.getOriginalEntry() );
+                engine.setSPUnitEntry( (Entry)spUnitEntry.getOriginalEntry() );
                 return engine;
             }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java Wed Apr 28 08:44:42 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.sp.StoredProcEngine;
 import org.apache.directory.server.core.sp.StoredProcUtils;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.util.DirectoryClassUtils;
 
 
@@ -48,7 +48,7 @@ public class JavaStoredProcEngine implem
 
     public static final String STORED_PROC_LANG_ID = "Java";
 
-    private ServerEntry spUnit;
+    private Entry spUnit;
 
 
     /* (non-Javadoc)
@@ -124,7 +124,7 @@ public class JavaStoredProcEngine implem
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.sp.StoredProcEngine#setSPUnitEntry(javax.naming.directory.Attributes)
      */
-    public void setSPUnitEntry( ServerEntry spUnit )
+    public void setSPUnitEntry( Entry spUnit )
     {
         this.spUnit = spUnit;
     }

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -58,12 +58,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -179,7 +179,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry subentry = subentries.get();
+                Entry subentry = subentries.get();
                 DN dnName = subentry.getDn();
 
                 String subtree = subentry.get( SchemaConstants.SUBTREE_SPECIFICATION_AT ).getString();
@@ -202,7 +202,7 @@ public class SubentryInterceptor extends
     }
 
 
-    private int getSubentryTypes( ServerEntry subentry ) throws Exception
+    private int getSubentryTypes( Entry subentry ) throws Exception
     {
         int types = 0;
 
@@ -322,9 +322,9 @@ public class SubentryInterceptor extends
      * @return the set of subentry op attrs for an entry
      * @throws Exception if there are problems accessing entry information
      */
-    public ServerEntry getSubentryAttributes( DN dn, ServerEntry entryAttrs ) throws Exception
+    public Entry getSubentryAttributes( DN dn, Entry entryAttrs ) throws Exception
     {
-        ServerEntry subentryAttrs = new DefaultServerEntry( schemaManager, dn );
+        Entry subentryAttrs = new DefaultClientEntry( schemaManager, dn );
         Iterator<String> list = subentryCache.nameIterator();
 
         while ( list.hasNext() )
@@ -411,7 +411,7 @@ public class SubentryInterceptor extends
             // get the name of the administrative point and its administrativeRole attributes
             DN apName = ( DN ) name.clone();
             apName.remove( name.size() - 1 );
-            ServerEntry ap = addContext.lookup( apName, ByPassConstants.LOOKUP_BYPASS );
+            Entry ap = addContext.lookup( apName, ByPassConstants.LOOKUP_BYPASS );
             EntryAttribute administrativeRole = ap.get( "administrativeRole" );
 
             // check that administrativeRole has something valid in it for us
@@ -430,7 +430,7 @@ public class SubentryInterceptor extends
              */
             Subentry subentry = new Subentry();
             subentry.setTypes( getSubentryTypes( entry ) );
-            ServerEntry operational = getSubentryOperatationalAttributes( name, subentry );
+            Entry operational = getSubentryOperatationalAttributes( name, subentry );
 
             /* ----------------------------------------------------------------
              * Parse the subtreeSpecification of the subentry and add it to the
@@ -482,7 +482,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -588,7 +588,7 @@ public class SubentryInterceptor extends
     public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
     {
         DN name = opContext.getDn();
-        ServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
         EntryAttribute objectClasses = entry.get( objectClassType );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
@@ -623,7 +623,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = new DN( candidate.getDn() );
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -676,7 +676,7 @@ public class SubentryInterceptor extends
     }
 
 
-    private List<Modification> getModsOnEntryRdnChange( DN oldName, DN newName, ServerEntry entry )
+    private List<Modification> getModsOnEntryRdnChange( DN oldName, DN newName, Entry entry )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
@@ -754,7 +754,7 @@ public class SubentryInterceptor extends
     {
         DN name = opContext.getDn();
 
-        ServerEntry entry = (ServerEntry)opContext.getEntry().getClonedEntry();
+        Entry entry = (Entry)opContext.getEntry().getClonedEntry();
 
         EntryAttribute objectClasses = entry.get( objectClassType );
 
@@ -791,7 +791,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -833,7 +833,7 @@ public class SubentryInterceptor extends
         DN oriChildName = opContext.getDn();
         DN parent = opContext.getParent();
 
-        ServerEntry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
 
         EntryAttribute objectClasses = entry.get( objectClassType );
 
@@ -870,7 +870,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -912,7 +912,7 @@ public class SubentryInterceptor extends
         DN oriChildName = opContext.getDn();
         DN newParentName = opContext.getParent();
 
-        ServerEntry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
 
         EntryAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
@@ -948,7 +948,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -988,7 +988,7 @@ public class SubentryInterceptor extends
     // Methods dealing subentry modification
     // -----------------------------------------------------------------------
 
-    private int getSubentryTypes( ServerEntry entry, List<Modification> mods ) throws Exception
+    private int getSubentryTypes( Entry entry, List<Modification> mods ) throws Exception
     {
         EntryAttribute ocFinalState = entry.get( SchemaConstants.OBJECT_CLASS_AT ).clone();
 
@@ -1021,7 +1021,7 @@ public class SubentryInterceptor extends
             }
         }
 
-        ServerEntry attrs = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
+        Entry attrs = new DefaultClientEntry( schemaManager, DN.EMPTY_DN );
         attrs.put( ocFinalState );
         return getSubentryTypes( attrs );
     }
@@ -1032,9 +1032,9 @@ public class SubentryInterceptor extends
         DN name = opContext.getDn();
         List<Modification> mods = opContext.getModItems();
 
-        ServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
 
-        ServerEntry oldEntry = ( ServerEntry ) entry.clone();
+        Entry oldEntry = ( Entry ) entry.clone();
         EntryAttribute objectClasses = entry.get( objectClassType );
         boolean isSubtreeSpecificationModification = false;
         Modification subtreeMod = null;
@@ -1086,7 +1086,7 @@ public class SubentryInterceptor extends
 
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -1099,7 +1099,7 @@ public class SubentryInterceptor extends
 
             // search for all selected entries by the new SS and add references to subentry
             Subentry subentry = subentryCache.getSubentry( name.getNormName() );
-            ServerEntry operational = getSubentryOperatationalAttributes( name, subentry );
+            Entry operational = getSubentryOperatationalAttributes( name, subentry );
             DN newBaseDn = ( DN ) apName.clone();
             newBaseDn.addAll( ssNew.getBase() );
             
@@ -1111,7 +1111,7 @@ public class SubentryInterceptor extends
             
             while ( subentries.next() )
             {
-                ServerEntry candidate = subentries.get();
+                Entry candidate = subentries.get();
                 DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -1128,7 +1128,7 @@ public class SubentryInterceptor extends
 
             if ( !objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
             {
-                ServerEntry newEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+                Entry newEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
 
                 List<Modification> subentriesOpAttrMods = getModsOnEntryModification( name, oldEntry, newEntry );
 
@@ -1146,7 +1146,7 @@ public class SubentryInterceptor extends
     // -----------------------------------------------------------------------
 
     private List<Modification> getOperationalModsForReplace( DN oldName, DN newName, Subentry subentry,
-        ServerEntry entry ) throws Exception
+        Entry entry ) throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
 
@@ -1240,9 +1240,9 @@ public class SubentryInterceptor extends
      * @param subentry the subentry to get attributes from
      * @return the set of attributes to be added or removed from entries
      */
-    private ServerEntry getSubentryOperatationalAttributes( DN name, Subentry subentry ) throws Exception
+    private Entry getSubentryOperatationalAttributes( DN name, Subentry subentry ) throws Exception
     {
-        ServerEntry operational = new DefaultServerEntry( schemaManager, name );
+        Entry operational = new DefaultClientEntry( schemaManager, name );
 
         if ( subentry.isAccessControlSubentry() )
         {
@@ -1306,7 +1306,7 @@ public class SubentryInterceptor extends
      * @return the set of modifications required to remove an entry's reference to
      * a subentry
      */
-    private List<Modification> getOperationalModsForRemove( DN subentryDn, ServerEntry candidate )
+    private List<Modification> getOperationalModsForRemove( DN subentryDn, Entry candidate )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
@@ -1343,7 +1343,7 @@ public class SubentryInterceptor extends
      * @return the set of modifications needed to update the entry
      * @throws Exception if there are probelms accessing modification items
      */
-    public List<Modification> getOperationalModsForAdd( ServerEntry entry, ServerEntry operational )
+    public List<Modification> getOperationalModsForAdd( Entry entry, Entry operational )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
@@ -1441,7 +1441,7 @@ public class SubentryInterceptor extends
     }
 
 
-    private List<Modification> getModsOnEntryModification( DN name, ServerEntry oldEntry, ServerEntry newEntry )
+    private List<Modification> getModsOnEntryModification( DN name, Entry oldEntry, Entry newEntry )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Wed Apr 28 08:44:42 2010
@@ -24,7 +24,7 @@ import java.util.Iterator;
 
 import org.apache.directory.server.core.event.Evaluator;
 import org.apache.directory.server.core.event.ExpressionEvaluator;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -68,7 +68,7 @@ public class SubtreeEvaluator
      * @return true if the entry is selected by the specification, false if it is not
      * @throws LdapException if errors are encountered while evaluating selection
      */
-    public boolean evaluate( SubtreeSpecification subtree, DN apDn, DN entryDn, ServerEntry entry )
+    public boolean evaluate( SubtreeSpecification subtree, DN apDn, DN entryDn, Entry entry )
         throws LdapException
     {
         // TODO: Try to make this cast unnecessary.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Wed Apr 28 08:44:42 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
 import java.util.Map;
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -33,11 +33,11 @@ import org.apache.directory.shared.ldap.
 public class AddStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
     private DN addedEntryName;
-    private ServerEntry addedEntry;
+    private Entry addedEntry;
     
     
     public AddStoredProcedureParameterInjector( OperationContext opContext, DN addedEntryName, 
-        ServerEntry addedEntry )
+        Entry addedEntry )
     {
         super( opContext );
         this.addedEntryName = addedEntryName;



Mime
View raw message