directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [4/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-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Wed Apr 28 08:44:42 2010
@@ -76,10 +76,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 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.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -260,7 +260,7 @@ public abstract class ServerContext impl
      * @param entry
      * @param target
      */
-    protected void doAddOperation( DN target, ServerEntry entry ) throws Exception
+    protected void doAddOperation( DN target, Entry entry ) throws Exception
     {
         // setup the op context and populate with request controls
         AddOperationContext opCtx = new AddOperationContext( session, entry );
@@ -353,12 +353,12 @@ public abstract class ServerContext impl
             
             if ( result )
             {
-                ServerEntry emptyEntry = new DefaultServerEntry( service.getSchemaManager(), DN.EMPTY_DN ); 
-                return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( emptyEntry ), (SearchOperationContext)opContext );
+                Entry emptyEntry = new DefaultClientEntry( service.getSchemaManager(), DN.EMPTY_DN ); 
+                return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( emptyEntry ), (SearchOperationContext)opContext );
             }
             else
             {
-                return new BaseEntryFilteringCursor( new EmptyCursor<ServerEntry>(), (SearchOperationContext)opContext );
+                return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), (SearchOperationContext)opContext );
             }
         }
         else
@@ -407,7 +407,7 @@ public abstract class ServerContext impl
     }
 
 
-    protected ServerEntry doGetRootDSEOperation( DN target ) throws Exception
+    protected Entry doGetRootDSEOperation( DN target ) throws Exception
     {
         GetRootDSEOperationContext opCtx = new GetRootDSEOperationContext( session, target );
         opCtx.addRequestControls( JndiUtils.fromJndiControls( requestControls ) );
@@ -422,7 +422,7 @@ public abstract class ServerContext impl
     /**
      * Used to encapsulate [de]marshalling of controls before and after lookup operations.
      */
-    protected ServerEntry doLookupOperation( DN target ) throws Exception
+    protected Entry doLookupOperation( DN target ) throws Exception
     {
         // setup the op context and populate with request controls
         LookupOperationContext opCtx;
@@ -431,7 +431,7 @@ public abstract class ServerContext impl
         opCtx = new LookupOperationContext( session, target );
         opCtx.addRequestControls( JndiUtils.fromJndiControls( requestControls ) );
         OperationManager operationManager = service.getOperationManager();
-        ServerEntry serverEntry = operationManager.lookup( opCtx );
+        Entry serverEntry = operationManager.lookup( opCtx );
 
         // clear the request controls and set the response controls 
         requestControls = EMPTY_CONTROLS;
@@ -443,7 +443,7 @@ public abstract class ServerContext impl
     /**
      * Used to encapsulate [de]marshalling of controls before and after lookup operations.
      */
-    protected ServerEntry doLookupOperation( DN target, String[] attrIds ) throws Exception
+    protected Entry doLookupOperation( DN target, String[] attrIds ) throws Exception
     {
         // setup the op context and populate with request controls
         LookupOperationContext opCtx;
@@ -716,7 +716,7 @@ public abstract class ServerContext impl
     public Context createSubcontext( Name name ) throws NamingException
     {
         DN target = buildTarget( DN.fromName( name ) );
-        ServerEntry serverEntry = service.newEntry( target );
+        Entry serverEntry = service.newEntry( target );
         
         try
         {
@@ -820,7 +820,7 @@ public abstract class ServerContext impl
     }
 
 
-    private void injectRdnAttributeValues( DN target, ServerEntry serverEntry ) throws NamingException
+    private void injectRdnAttributeValues( DN target, Entry serverEntry ) throws NamingException
     {
         // Add all the RDN attributes and their values to this entry
         RDN rdn = target.getRdn( target.size() - 1 );
@@ -850,7 +850,7 @@ public abstract class ServerContext impl
         DN target = buildTarget( DN.fromName( name ) );
 
         // let's be sure that the Attributes is case insensitive
-        ServerEntry outServerEntry = null;
+        Entry outServerEntry = null;
         
         try
         {
@@ -875,11 +875,11 @@ public abstract class ServerContext impl
             return;
         }
 
-        if ( obj instanceof ServerEntry )
+        if ( obj instanceof Entry )
         {
             try
             {
-                doAddOperation( target, ( ServerEntry ) obj );
+                doAddOperation( target, ( Entry ) obj );
             }
             catch ( Exception e )
             {
@@ -900,7 +900,7 @@ public abstract class ServerContext impl
         else if ( obj instanceof Serializable )
         {
             // Serialize and add outAttrs
-            ServerEntry serverEntry = service.newEntry( target );
+            Entry serverEntry = service.newEntry( target );
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
@@ -942,7 +942,7 @@ public abstract class ServerContext impl
         else if ( obj instanceof DirContext )
         {
             // Grab attributes and merge with outAttrs
-            ServerEntry serverEntry = null;
+            Entry serverEntry = null;
             
             try
             { 
@@ -1176,7 +1176,7 @@ public abstract class ServerContext impl
         Object obj;
         DN target = buildTarget( DN.fromName( name ) );
 
-        ServerEntry serverEntry = null;
+        Entry serverEntry = null;
 
         try
         {

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.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.StringValue;
 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.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
@@ -347,7 +347,7 @@ public abstract class ServerDirContext e
 
         DN target = buildTarget( DN.fromName( name ) );
 
-        ServerEntry serverEntry = null;
+        Entry serverEntry = null;
         
         try
         {
@@ -362,7 +362,7 @@ public abstract class ServerDirContext e
         // No object binding so we just add the attributes
         if ( null == obj )
         {
-            ServerEntry clone = ( ServerEntry ) serverEntry.clone();
+            Entry clone = ( Entry ) serverEntry.clone();
             try
             {
                 doAddOperation( target, clone );
@@ -376,7 +376,7 @@ public abstract class ServerDirContext e
 
         // First, use state factories to do a transformation
         DirStateFactory.Result res = DirectoryManager.getStateToBind( obj, name, this, getEnvironment(), attrs );
-        ServerEntry outServerEntry = null;
+        Entry outServerEntry = null;
         
         try
         {
@@ -390,7 +390,7 @@ public abstract class ServerDirContext e
 
         if ( outServerEntry != serverEntry )
         {
-            ServerEntry clone = ( ServerEntry ) serverEntry.clone();
+            Entry clone = ( Entry ) serverEntry.clone();
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
@@ -436,7 +436,7 @@ public abstract class ServerDirContext e
         else if ( obj instanceof Serializable )
         {
             // Serialize and add outAttrs
-            ServerEntry clone = ( ServerEntry ) serverEntry.clone();
+            Entry clone = ( Entry ) serverEntry.clone();
 
             if ( outServerEntry != null && outServerEntry.size() > 0 )
             {
@@ -469,7 +469,7 @@ public abstract class ServerDirContext e
         else if ( obj instanceof DirContext )
         {
             // Grab attributes and merge with outAttrs
-            ServerEntry entry = null;
+            Entry entry = null;
             
             try
             {
@@ -615,7 +615,7 @@ public abstract class ServerDirContext e
         // Add the new context to the server which as a side effect adds
         try
         {
-            ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attributes, 
+            Entry serverEntry = ServerEntryUtils.toServerEntry( attributes, 
                 target, getDirectoryService().getSchemaManager() );
             doAddOperation( target, serverEntry );
         }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Wed Apr 28 08:44:42 2010
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.StringValue;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -116,7 +116,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         add( entry, LogChange.TRUE );
     }
@@ -125,7 +125,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, boolean ignoreReferral ) throws Exception
+    public void add( Entry entry, boolean ignoreReferral ) throws Exception
     {
         add( entry, ignoreReferral, LogChange.TRUE );
     }
@@ -134,7 +134,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, LogChange log ) throws Exception
+    public void add( Entry entry, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, entry );
 
@@ -148,7 +148,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, boolean ignoreReferral, LogChange log ) throws Exception
+    public void add( Entry entry, boolean ignoreReferral, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, entry );
 

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java Wed Apr 28 08:44:42 2010
@@ -28,11 +28,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.CursorIterator;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-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.schema.SchemaManager;
 
-public class MockCursor implements Cursor<ServerEntry>
+public class MockCursor implements Cursor<Entry>
 {
     final int count;
     int ii;
@@ -76,7 +76,7 @@ public class MockCursor implements Curso
     }
 
 
-    public void after( ServerEntry element ) throws Exception
+    public void after( Entry element ) throws Exception
     {
     }
 
@@ -86,7 +86,7 @@ public class MockCursor implements Curso
     }
 
 
-    public void before( ServerEntry element ) throws Exception
+    public void before( Entry element ) throws Exception
     {
         throw new NotImplementedException();
     }
@@ -105,9 +105,9 @@ public class MockCursor implements Curso
     }
 
 
-    public ServerEntry get() throws Exception
+    public Entry get() throws Exception
     {
-        return new DefaultServerEntry( schemaManager );
+        return new DefaultClientEntry( schemaManager );
     }
 
 
@@ -155,9 +155,9 @@ public class MockCursor implements Curso
     }
 
 
-    public Iterator<ServerEntry> iterator()
+    public Iterator<Entry> iterator()
     {
-        return new CursorIterator<ServerEntry>( this );
+        return new CursorIterator<Entry>( this );
     }
 
 

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java Wed Apr 28 08:44:42 2010
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.replication.ReplicationConfiguration;
 import org.apache.directory.server.core.schema.SchemaService;
 import org.apache.directory.shared.ldap.csn.Csn;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -339,12 +339,12 @@ public class MockDirectoryService implem
     }
 
 
-    public ServerEntry newEntry( DN dn ) throws NamingException
+    public Entry newEntry( DN dn ) throws NamingException
     {
         return null;
     }
     
-    public ServerEntry newEntry( String ldif, String dn )
+    public Entry newEntry( String ldif, String dn )
     {
         return null;
     }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.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.SearchOperationContext;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -237,7 +237,7 @@ public class MockOperation implements Op
     }
 
 
-    public void add( ServerEntry entry, Collection<String> bypass ) throws Exception
+    public void add( Entry entry, Collection<String> bypass ) throws Exception
     {
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Wed Apr 28 08:44:42 2010
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.StringValue;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -116,7 +116,7 @@ public class DefaultCoreSession implemen
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry ) throws Exception
+    public void add( Entry entry ) throws Exception
     {
         add( entry, LogChange.TRUE );
     }
@@ -125,7 +125,7 @@ public class DefaultCoreSession implemen
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, boolean ignoreReferral ) throws Exception
+    public void add( Entry entry, boolean ignoreReferral ) throws Exception
     {
         add( entry, ignoreReferral, LogChange.TRUE );
     }
@@ -134,7 +134,7 @@ public class DefaultCoreSession implemen
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, LogChange log ) throws Exception
+    public void add( Entry entry, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, entry );
 
@@ -148,7 +148,7 @@ public class DefaultCoreSession implemen
     /**
      * {@inheritDoc} 
      */
-    public void add( ServerEntry entry, boolean ignoreReferral, LogChange log ) throws Exception
+    public void add( Entry entry, boolean ignoreReferral, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, entry );
 

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -79,12 +79,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.csn.Csn;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 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.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
@@ -820,7 +818,7 @@ public class DefaultDirectoryService imp
                     {
                         case ChangeType.ADD_ORDINAL :
                             adminSession.add( 
-                                new DefaultServerEntry( schemaManager, reverse.getEntry() ), true ); 
+                                new DefaultClientEntry( schemaManager, reverse.getEntry() ), true ); 
                             break;
                             
                         case ChangeType.DELETE_ORDINAL :
@@ -1067,9 +1065,9 @@ public class DefaultDirectoryService imp
     }
 
 
-    public ServerEntry newEntry( DN dn ) 
+    public Entry newEntry( DN dn ) 
     {
-        return new DefaultServerEntry( schemaManager, dn );
+        return new DefaultClientEntry( schemaManager, dn );
     }
     
 
@@ -1096,7 +1094,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, adminDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, adminDn );
             
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
                                 SchemaConstants.TOP_OC,
@@ -1131,7 +1129,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, userDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, userDn );
             
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
                                 SchemaConstants.TOP_OC,
@@ -1157,7 +1155,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, groupDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, groupDn );
             
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
                                 SchemaConstants.TOP_OC,
@@ -1183,7 +1181,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, name );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, name );
             
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
                                 SchemaConstants.TOP_OC,
@@ -1233,7 +1231,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, configurationDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, configurationDn );
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
 
             serverEntry.put( SchemaConstants.OU_AT, "configuration" );
@@ -1256,7 +1254,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, partitionsDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, partitionsDn );
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
             serverEntry.put( SchemaConstants.OU_AT, "partitions" );
             serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
@@ -1278,7 +1276,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, servicesDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, servicesDn );
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
 
             serverEntry.put( SchemaConstants.OU_AT, "services" );
@@ -1301,7 +1299,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, interceptorsDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, interceptorsDn );
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
 
             serverEntry.put( SchemaConstants.OU_AT, "interceptors" );
@@ -1324,7 +1322,7 @@ public class DefaultDirectoryService imp
         {
             firstStart = true;
 
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, sysPrefRootDn );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, sysPrefRootDn );
             serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
                 SchemaConstants.TOP_OC, 
                 SchemaConstants.ORGANIZATIONAL_UNIT_OC,
@@ -1355,7 +1353,7 @@ public class DefaultDirectoryService imp
         DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
         adminDn.normalize( schemaManager.getNormalizerMapping() );
         
-        ServerEntry adminEntry = partitionNexus.lookup( new LookupOperationContext( adminSession, adminDn ) );
+        Entry adminEntry = partitionNexus.lookup( new LookupOperationContext( adminSession, adminDn ) );
         Object userPassword = adminEntry.get( SchemaConstants.USER_PASSWORD_AT ).get();
         
         if ( userPassword instanceof byte[] )
@@ -1394,7 +1392,7 @@ public class DefaultDirectoryService imp
 
                 try
                 {
-                    getAdminSession().add( new DefaultServerEntry( schemaManager, entry ) ); 
+                    getAdminSession().add( new DefaultClientEntry( schemaManager, entry ) ); 
                 }
                 catch ( Exception e )
                 {
@@ -1432,7 +1430,7 @@ public class DefaultDirectoryService imp
         adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), this );
         
         // @TODO - NOTE: Need to find a way to instantiate without dependency on DPN
-        partitionNexus = new DefaultPartitionNexus( new DefaultServerEntry( schemaManager, DN.EMPTY_DN ) );
+        partitionNexus = new DefaultPartitionNexus( new DefaultClientEntry( schemaManager, DN.EMPTY_DN ) );
         partitionNexus.setDirectoryService( this );
         partitionNexus.initialize( );
         //partitionNexus.addContextPartition( new AddContextPartitionOperationContext( adminSession, schemaService.getSchemaPartition() ) );
@@ -1544,12 +1542,12 @@ public class DefaultDirectoryService imp
 
     
     /**
-     * Create a new ServerEntry
+     * Create a new Entry
      * 
      * @param ldif The String representing the attributes, as a LDIF file
      * @param dn The DN for this new entry
      */
-    public ServerEntry newEntry( String ldif, String dn )
+    public Entry newEntry( String ldif, String dn )
     {
         try
         {
@@ -1559,7 +1557,7 @@ public class DefaultDirectoryService imp
             entry.setDn( newDn );
             
             // TODO Let's get rid of this Attributes crap
-            ServerEntry serverEntry = new DefaultServerEntry( schemaManager, entry );
+            Entry serverEntry = new DefaultClientEntry( schemaManager, entry );
             return serverEntry;
         }
         catch ( Exception e )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Wed Apr 28 08:44:42 2010
@@ -50,7 +50,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAffectMultipleDsaException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -89,7 +89,7 @@ public class DefaultOperationManager imp
     }
     
     
-    private LdapReferralException buildReferralException( ServerEntry parentEntry, DN childDn ) 
+    private LdapReferralException buildReferralException( Entry parentEntry, DN childDn ) 
         throws LdapInvalidDnException, LdapURLEncodingException
     {
         // Get the Ref attributeType
@@ -125,7 +125,7 @@ public class DefaultOperationManager imp
     
     
     private LdapReferralException buildReferralExceptionForSearch( 
-        ServerEntry parentEntry, DN childDn, SearchScope scope ) 
+        Entry parentEntry, DN childDn, SearchScope scope ) 
         throws LdapInvalidDnException, LdapURLEncodingException
     {
         // Get the Ref attributeType
@@ -228,7 +228,7 @@ public class DefaultOperationManager imp
 
             if ( directoryService.getReferralManager().hasParentReferral( dn ) )
             {
-                ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+                Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
                 DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
 
                 // Depending on the Context.REFERRAL property value, we will throw
@@ -312,7 +312,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -391,7 +391,7 @@ public class DefaultOperationManager imp
             // We have to deal with the referral first
             directoryService.getReferralManager().lockRead();
 
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -638,7 +638,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -721,7 +721,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -823,7 +823,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -937,7 +937,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {
@@ -1019,7 +1019,7 @@ public class DefaultOperationManager imp
             directoryService.getReferralManager().lockRead();
 
             // Check if we have an ancestor for this DN
-            ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
+            Entry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
             
             if ( parentEntry != null )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Wed Apr 28 08:44:42 2010
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.PartitionNexus;
 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;
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 public class ReferralManagerImpl implements ReferralManager
 {
     /** The referrals tree */
-    private DnBranchNode<ServerEntry> referrals;
+    private DnBranchNode<Entry> referrals;
 
     /** A lock to guarantee the manager consistency */
     private ReentrantReadWriteLock mutex = new ReentrantReadWriteLock();
@@ -68,7 +68,7 @@ public class ReferralManagerImpl impleme
     {
         lockWrite();
         
-        referrals = new DnBranchNode<ServerEntry>();
+        referrals = new DnBranchNode<Entry>();
         PartitionNexus nexus = directoryService.getPartitionNexus();
 
         Set<String> suffixes = nexus.listSuffixes( null );
@@ -122,11 +122,11 @@ public class ReferralManagerImpl impleme
     /**
      * {@inheritDoc}
      */
-    public void addReferral( ServerEntry entry )
+    public void addReferral( Entry entry )
     {
         try
         {
-            ((DnBranchNode<ServerEntry>)referrals).add( entry.getDn(), entry );
+            ((DnBranchNode<Entry>)referrals).add( entry.getDn(), entry );
         }
         catch ( LdapException ne )
         {
@@ -166,7 +166,7 @@ public class ReferralManagerImpl impleme
             
             while ( cursor.next() ) 
             {
-                ServerEntry entry = cursor.get();
+                Entry entry = cursor.get();
 
                 // Lock the referralManager
                 lockWrite();
@@ -208,7 +208,7 @@ public class ReferralManagerImpl impleme
         
         while ( cursor.next() ) 
         {
-            ServerEntry entry = cursor.get();
+            Entry entry = cursor.get();
             
             // Add it at the right place
             removeReferral( entry );
@@ -228,7 +228,7 @@ public class ReferralManagerImpl impleme
     /**
      * {@inheritDoc}
      */
-    public ServerEntry getParentReferral( DN dn )
+    public Entry getParentReferral( DN dn )
     {
         if ( !hasParentReferral( dn ) )
         {
@@ -244,7 +244,7 @@ public class ReferralManagerImpl impleme
      */
     public boolean isReferral( DN dn )
     {
-        ServerEntry parent = referrals.getParentElement( dn );
+        Entry parent = referrals.getParentElement( dn );
         
         if ( parent != null )
         {
@@ -260,7 +260,7 @@ public class ReferralManagerImpl impleme
     /**
      * {@inheritDoc}
      */
-    public void removeReferral( ServerEntry entry )
+    public void removeReferral( Entry entry )
     {
         referrals.remove( entry );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Wed Apr 28 08:44:42 2010
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -591,7 +591,7 @@ public class SimpleAuthenticator extends
     private byte[] lookupUserPassword( BindOperationContext opContext ) throws Exception
     {
         // ---- lookup the principal entry's userPassword attribute
-        ServerEntry userEntry;
+        Entry userEntry;
 
         try
         {

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -68,7 +68,7 @@ import org.apache.directory.shared.ldap.
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
@@ -261,7 +261,7 @@ public class AciAuthorizationInterceptor
      * @param proxy the partition nexus proxy object
      */
     private void addPerscriptiveAciTuples( OperationContext opContext, Collection<ACITuple> tuples, DN dn,
-        ServerEntry entry ) throws Exception
+        Entry entry ) throws Exception
     {
         EntryAttribute oc = null;
         
@@ -313,7 +313,7 @@ public class AciAuthorizationInterceptor
      * @param entry the target entry that access to is being regulated
      * @throws Exception if there are problems accessing attribute values
      */
-    private void addEntryAciTuples( Collection<ACITuple> tuples, ServerEntry entry ) throws Exception
+    private void addEntryAciTuples( Collection<ACITuple> tuples, Entry entry ) throws Exception
     {
         EntryAttribute entryAci = entry.get( entryAciType );
         
@@ -353,7 +353,7 @@ public class AciAuthorizationInterceptor
      * @throws Exception if there are problems accessing attribute values
      * @param proxy the partition nexus proxy object
      */
-    private void addSubentryAciTuples( OperationContext opContext, Collection<ACITuple> tuples, DN dn, ServerEntry entry )
+    private void addSubentryAciTuples( OperationContext opContext, Collection<ACITuple> tuples, DN dn, Entry entry )
         throws Exception
     {
         // only perform this for subentries
@@ -366,7 +366,7 @@ public class AciAuthorizationInterceptor
         // will contain the subentryACI attributes that effect subentries
         DN parentDn = ( DN ) dn.clone();
         parentDn.remove( dn.size() - 1 );
-        ServerEntry administrativeEntry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ).getOriginalEntry();
+        Entry administrativeEntry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ).getOriginalEntry();
         
         EntryAttribute subentryAci = administrativeEntry.get( subentryAciType );
 
@@ -423,7 +423,7 @@ public class AciAuthorizationInterceptor
         LdapPrincipal principal = addContext.getSession().getEffectivePrincipal();
         DN principalDn = principal.getClonedName();
         
-        ServerEntry serverEntry = addContext.getEntry(); 
+        Entry serverEntry = addContext.getEntry(); 
         //Attributes entry = ServerEntryUtils.toAttributesImpl( serverEntry );
 
         DN name = addContext.getDn();
@@ -446,7 +446,7 @@ public class AciAuthorizationInterceptor
 
         // perform checks below here for all non-admin users
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
-        ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( name, serverEntry );
+        Entry subentryAttrs = subentryInterceptor.getSubentryAttributes( name, serverEntry );
         
         for ( EntryAttribute attribute:serverEntry )
         {
@@ -561,7 +561,7 @@ public class AciAuthorizationInterceptor
             /**
              * @TODO: A virtual entry can be created here for not hitting the backend again.
              */
-            ServerEntry modifiedEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+            Entry modifiedEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
             tupleCache.subentryModified( name, mods, modifiedEntry );
             groupCache.groupModified( name, mods, entry, schemaManager );
             return;
@@ -578,7 +578,7 @@ public class AciAuthorizationInterceptor
             Collections.singleton( MicroOperation.MODIFY ), tuples, entry, null );
 
         Collection<MicroOperation> perms = null;
-        ServerEntry entryView = ( ServerEntry ) entry.clone();
+        Entry entryView = ( Entry ) entry.clone();
         
         for ( Modification mod : mods )
         {
@@ -651,7 +651,7 @@ public class AciAuthorizationInterceptor
         /**
          * @TODO: A virtual entry can be created here for not hitting the backend again.
          */
-        ServerEntry modifiedEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+        Entry modifiedEntry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
         tupleCache.subentryModified( name, mods, modifiedEntry );
         groupCache.groupModified( name, mods, entry, schemaManager );
     }
@@ -715,7 +715,7 @@ public class AciAuthorizationInterceptor
      * @param entry the raw entry pulled from the nexus
      * @throws Exception if undlying access to the DIT fails
      */
-    private void checkLookupAccess( LookupOperationContext lookupContext, ServerEntry entry ) throws Exception
+    private void checkLookupAccess( LookupOperationContext lookupContext, Entry entry ) throws Exception
     {
         // no permissions checks on the RootDSE
         if ( lookupContext.getDn().getNormName().trim().equals( "" ) )
@@ -779,7 +779,7 @@ public class AciAuthorizationInterceptor
         }
 
         lookupContext.setByPassed( ByPassConstants.LOOKUP_BYPASS );
-        ServerEntry entry = directoryService.getOperationManager().lookup( lookupContext );
+        Entry entry = directoryService.getOperationManager().lookup( lookupContext );
 
         checkLookupAccess( lookupContext, entry );
         
@@ -790,7 +790,7 @@ public class AciAuthorizationInterceptor
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws Exception
     {
         DN oldName = renameContext.getDn();
-        ServerEntry originalEntry = null;
+        Entry originalEntry = null;
         
         if ( renameContext.getEntry() != null )
         {
@@ -894,7 +894,7 @@ public class AciAuthorizationInterceptor
         // at least with minimal requirements which are object class
         // and access control subentry operational attributes.
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
-        ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
+        Entry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
         
         for ( EntryAttribute attribute:importedEntry )
         {
@@ -963,7 +963,7 @@ public class AciAuthorizationInterceptor
         // will not be valid at the new location.
         // This will certainly be fixed by the SubentryInterceptor,
         // but after this service.
-        ServerEntry importedEntry = moveContext.lookup( oriChildName, 
+        Entry importedEntry = moveContext.lookup( oriChildName, 
             ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
             
         // As the target entry does not exist yet and so
@@ -973,7 +973,7 @@ public class AciAuthorizationInterceptor
         // and access control subentry operational attributes.
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) 
             chain.get( SubentryInterceptor.class.getName() );
-        ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
+        Entry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
         
         for ( EntryAttribute attribute:importedEntry )
         {
@@ -1112,7 +1112,7 @@ public class AciAuthorizationInterceptor
     }
 
 
-    public void cacheNewGroup( DN name, ServerEntry entry ) throws Exception
+    public void cacheNewGroup( DN name, Entry entry ) throws Exception
     {
         groupCache.groupAdded( name, entry );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Wed Apr 28 08:44:42 2010
@@ -52,7 +52,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -139,7 +139,7 @@ public class DefaultAuthorizationInterce
         CoreSession adminSession = new DefaultCoreSession( 
             new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
 
-        ServerEntry adminGroup = nexus.lookup( new LookupOperationContext( adminSession, ADMIN_GROUP_DN ) );
+        Entry adminGroup = nexus.lookup( new LookupOperationContext( adminSession, ADMIN_GROUP_DN ) );
         
         if ( adminGroup == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -146,7 +146,7 @@ public class GroupCache
 
             while ( results.next() )
             {
-                ServerEntry result = results.get();
+                Entry result = results.get();
                 DN groupDn = result.getDn().normalize( normalizerMap );
                 EntryAttribute members = getMemberAttribute( result );
 
@@ -179,7 +179,7 @@ public class GroupCache
      * @param entry the entry inspected for member attributes
      * @return the member attribute
      */
-    private EntryAttribute getMemberAttribute( ServerEntry entry ) throws LdapException
+    private EntryAttribute getMemberAttribute( Entry entry ) throws LdapException
     {
         EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
@@ -282,7 +282,7 @@ public class GroupCache
      * @param entry the group entry's attributes
      * @throws LdapException if there are problems accessing the attr values
      */
-    public void groupAdded( DN name, ServerEntry entry ) throws LdapException
+    public void groupAdded( DN name, Entry entry ) throws LdapException
     {
         EntryAttribute members = getMemberAttribute( entry );
 
@@ -309,7 +309,7 @@ public class GroupCache
      * @param name the normalized DN of the group entry
      * @param entry the attributes of entry being deleted
      */
-    public void groupDeleted( DN name, ServerEntry entry ) throws LdapException
+    public void groupDeleted( DN name, Entry entry ) throws LdapException
     {
         EntryAttribute members = getMemberAttribute( entry );
 
@@ -374,7 +374,7 @@ public class GroupCache
      * @param entry the group entry being modified
      * @throws LdapException if there are problems accessing attribute  values
      */
-    public void groupModified( DN name, List<Modification> mods, ServerEntry entry, SchemaManager schemaManager )
+    public void groupModified( DN name, List<Modification> mods, Entry entry, SchemaManager schemaManager )
         throws LdapException
     {
         EntryAttribute members = null;
@@ -429,7 +429,7 @@ public class GroupCache
      * @param mods the modifications being performed
      * @throws LdapException if there are problems accessing attribute  values
      */
-    public void groupModified( DN name, ModificationOperation modOp, ServerEntry mods ) throws LdapException
+    public void groupModified( DN name, ModificationOperation modOp, Entry mods ) throws LdapException
     {
         EntryAttribute members = getMemberAttribute( mods );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Wed Apr 28 08:44:42 2010
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.StringValue;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -134,7 +134,7 @@ public class TupleCache
 
             while ( results.next() )
             {
-                ServerEntry result = results.get();
+                Entry result = results.get();
                 DN subentryDn = result.getDn().normalize( session.getDirectoryService().getSchemaManager().
                         getNormalizerMapping() );
                 EntryAttribute aci = result.get( prescriptiveAciAT );
@@ -154,7 +154,7 @@ public class TupleCache
     }
 
 
-    private boolean hasPrescriptiveACI( ServerEntry entry ) throws LdapException
+    private boolean hasPrescriptiveACI( Entry entry ) throws LdapException
     {
         // only do something if the entry contains prescriptiveACI
         EntryAttribute aci = entry.get( prescriptiveAciAT );
@@ -179,7 +179,7 @@ public class TupleCache
     }
 
 
-    public void subentryAdded( DN normName, ServerEntry entry ) throws LdapException
+    public void subentryAdded( DN normName, Entry entry ) throws LdapException
     {
         // only do something if the entry contains prescriptiveACI
         EntryAttribute aciAttr = entry.get( prescriptiveAciAT );
@@ -215,7 +215,7 @@ public class TupleCache
     }
 
 
-    public void subentryDeleted( DN normName, ServerEntry entry ) throws LdapException
+    public void subentryDeleted( DN normName, Entry entry ) throws LdapException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {
@@ -226,7 +226,7 @@ public class TupleCache
     }
 
 
-    public void subentryModified( DN normName, List<Modification> mods, ServerEntry entry ) throws LdapException
+    public void subentryModified( DN normName, List<Modification> mods, Entry entry ) throws LdapException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {
@@ -244,7 +244,7 @@ public class TupleCache
     }
 
 
-    public void subentryModified( DN normName, ServerEntry mods, ServerEntry entry ) throws LdapException
+    public void subentryModified( DN normName, Entry mods, Entry entry ) throws LdapException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Wed Apr 28 08:44:42 2010
@@ -45,7 +45,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -137,8 +137,8 @@ public class ACDFEngine
         Value<?> attrValue, 
         Collection<MicroOperation> microOperations, 
         Collection<ACITuple> aciTuples, 
-        ServerEntry entry, 
-        ServerEntry entryView ) throws Exception
+        Entry entry, 
+        Entry entryView ) throws Exception
     {
         if ( !hasPermission( schemaManager, opContext, userGroupNames, username, authenticationLevel, entryName, 
             attrId, attrValue, microOperations, aciTuples, entry, entryView ) )
@@ -195,15 +195,15 @@ public class ACDFEngine
         Value<?> attrValue, 
         Collection<MicroOperation> microOperations, 
         Collection<ACITuple> aciTuples, 
-        ServerEntry entry, 
-        ServerEntry entryView ) throws Exception
+        Entry entry, 
+        Entry entryView ) throws Exception
     {
         if ( entryName == null )
         {
             throw new NullPointerException( "entryName" );
         }
 
-        ServerEntry userEntry = opContext.lookup( userName, USER_LOOKUP_BYPASS );
+        Entry userEntry = opContext.lookup( userName, USER_LOOKUP_BYPASS );
 
         // Determine the scope of the requested operation.
         OperationScope scope;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 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.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -53,12 +53,12 @@ public interface ACITupleFilter
      * @param proxy the proxy interceptor for this filter to access the DIT
      * @param userGroupNames the collection of group ({@link DN})s which the current user belongs to
      * @param userName the {@link DN} of the current user
-     * @param userEntry the {@link ServerEntry} of the current user entry in the DIT
+     * @param userEntry the {@link Entry} of the current user entry in the DIT
      * @param authenticationLevel the level of authentication of the current user
      * @param entryName the {@link DN} of the entry the current user accesses
      * @param attrId the attribute ID the current user accesses
      * @param attrValue the value of the attribute the current user accesses
-     * @param entry the {@link ServerEntry} of the entry the current user accesses
+     * @param entry the {@link Entry} of the entry the current user accesses
      * @param microOperations the set of {@link MicroOperation}s the current user will perform
      * @param entryView in case of a Modify operation, view of the entry being modified as if the modification permitted and completed
      * @return the collection of filtered tuples
@@ -71,13 +71,13 @@ public interface ACITupleFilter
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry,
+            Entry userEntry,
             AuthenticationLevel authenticationLevel, 
             DN entryName, 
             String attrId,
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws Exception;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java Wed Apr 28 08:44:42 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 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.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -51,14 +51,14 @@ public class HighestPrecedenceFilter imp
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( tuples.size() <= 1 )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Wed Apr 28 08:44:42 2010
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.filter.PresenceNode;
@@ -81,14 +81,14 @@ public class MaxImmSubFilter implements 
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws Exception
     {
         if ( entryName.size() == 0 )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -54,14 +54,14 @@ public class MaxValueCountFilter impleme
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE )
@@ -104,7 +104,7 @@ public class MaxValueCountFilter impleme
     }
 
 
-    private boolean isRemovable( ProtectedItem.MaxValueCount mvc, String attrId, ServerEntry entryView ) throws NamingException
+    private boolean isRemovable( ProtectedItem.MaxValueCount mvc, String attrId, Entry entryView ) throws NamingException
     {
         for ( Iterator<ProtectedItem.MaxValueCountItem> k = mvc.iterator(); k.hasNext(); )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java Wed Apr 28 08:44:42 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 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.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -52,14 +52,14 @@ public class MicroOperationFilter implem
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( tuples.size() == 0 )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java Wed Apr 28 08:44:42 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 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.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -60,14 +60,14 @@ public class MostSpecificProtectedItemFi
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( tuples.size() <= 1 )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java Wed Apr 28 08:44:42 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.UserClass;
 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.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -58,14 +58,14 @@ public class MostSpecificUserClassFilter
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( tuples.size() <= 1 )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Wed Apr 28 08:44:42 2010
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -78,14 +78,14 @@ public class RelatedProtectedItemFilter 
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry,
+            Entry userEntry,
             AuthenticationLevel authenticationLevel, 
             DN entryName, 
             String attrId,
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws LdapException, NamingException
     {
         if ( tuples.size() == 0 )
@@ -108,7 +108,7 @@ public class RelatedProtectedItemFilter 
 
 
     private boolean isRelated( ACITuple tuple, OperationScope scope, DN userName, DN entryName, String attrId,
-                               Value<?> attrValue, ServerEntry entry ) throws LdapException, NamingException, InternalError
+                               Value<?> attrValue, Entry entry ) throws LdapException, NamingException, InternalError
     {
         String oid = null;
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.UserClass;
 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.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -66,14 +66,14 @@ public class RelatedUserClassFilter impl
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws LdapException
     {
         if ( tuples.size() == 0 )
@@ -116,7 +116,7 @@ public class RelatedUserClassFilter impl
     }
 
 
-    private boolean isRelated( Collection<DN> userGroupNames, DN userName, ServerEntry userEntry, 
+    private boolean isRelated( Collection<DN> userGroupNames, DN userName, Entry userEntry, 
         DN entryName, Collection<UserClass> userClasses ) throws LdapException
     {
         for ( UserClass userClass : userClasses )
@@ -185,7 +185,7 @@ public class RelatedUserClassFilter impl
     }
 
 
-    private boolean matchUserClassSubtree( DN userName, ServerEntry userEntry, UserClass.Subtree subtree )
+    private boolean matchUserClassSubtree( DN userName, Entry userEntry, UserClass.Subtree subtree )
         throws LdapException
     {
         for ( SubtreeSpecification subtreeSpec : subtree.getSubtreeSpecifications() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -54,14 +54,14 @@ public class RestrictedByFilter implemen
             OperationContext opContext,
             Collection<DN> userGroupNames, 
             DN userName, 
-            ServerEntry userEntry, 
+            Entry userEntry, 
             AuthenticationLevel authenticationLevel,
             DN entryName, 
             String attrId, 
             Value<?> attrValue, 
-            ServerEntry entry, 
+            Entry entry, 
             Collection<MicroOperation> microOperations,
-            ServerEntry entryView )
+            Entry entryView )
         throws NamingException
     {
         if ( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE )
@@ -93,7 +93,7 @@ public class RestrictedByFilter implemen
     }
 
 
-    public boolean isRemovable( ACITuple tuple, String attrId, Value<?> attrValue, ServerEntry entry ) throws NamingException
+    public boolean isRemovable( ACITuple tuple, String attrId, Value<?> attrValue, Entry entry ) throws NamingException
     {
         for ( ProtectedItem item : tuple.getProtectedItems() )
         {

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=938820&r1=938819&r2=938820&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 Wed Apr 28 08:44:42 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.entry.Entry;
 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.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -111,7 +111,7 @@ public class ChangeLogInterceptor extend
             return;
         }
 
-        ServerEntry addEntry = opContext.getEntry();
+        Entry addEntry = opContext.getEntry();
 
         // we don't want to record addition of a tag as a change
         if( addEntry.get( REV_AT_OID ) != null )
@@ -143,7 +143,7 @@ public class ChangeLogInterceptor extend
     {
         // @todo make sure we're not putting in operational attributes that cannot be user modified
         // must save the entry if change log is enabled
-        ServerEntry serverEntry = null;
+        Entry serverEntry = null;
 
         if ( changeLog.isEnabled() && opContext.isFirstOperation() )
         {
@@ -191,7 +191,7 @@ public class ChangeLogInterceptor extend
      * @return the entry's attributes (may be immutable if the schema subentry)
      * @throws Exception on error accessing the entry's attributes
      */
-    private ServerEntry getAttributes( OperationContext opContext ) throws Exception
+    private Entry getAttributes( OperationContext opContext ) throws Exception
     {
         DN dn = opContext.getDn();
         ClonedServerEntry serverEntry;
@@ -215,7 +215,7 @@ public class ChangeLogInterceptor extend
      */
     public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
     {
-        ServerEntry serverEntry = null;
+        Entry serverEntry = null;
         Modification modification = ServerEntryUtils.getModificationItem( opContext.getModItems(), entryDeleted );
         boolean isDelete = ( modification != null );
 
@@ -294,7 +294,7 @@ public class ChangeLogInterceptor extend
 
     public void rename ( NextInterceptor next, RenameOperationContext renameContext ) throws Exception
     {
-        ServerEntry serverEntry = null;
+        Entry serverEntry = null;
         
         if ( renameContext.getEntry() != null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Wed Apr 28 08:44:42 2010
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -206,7 +206,7 @@ public class CollectiveAttributeIntercep
              * time looking up this sub-entry. 
              */
             
-            ServerEntry subentry = opContext.lookup( subentryDn, ByPassConstants.LOOKUP_COLLECTIVE_BYPASS );
+            Entry subentry = opContext.lookup( subentryDn, ByPassConstants.LOOKUP_COLLECTIVE_BYPASS );
             
             for ( AttributeType attributeType:subentry.getAttributeTypes() )
             {



Mime
View raw message