directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [7/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/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Wed Apr 28 08:44:42 2010
@@ -31,9 +31,9 @@ import java.util.Map;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.ServerEntrySerializer;
 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.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -49,7 +49,7 @@ import org.junit.Test;
 
 
 /**
- * Test the ServerEntry serialization/deserialization class
+ * Test the Entry serialization/deserialization class
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -125,13 +125,13 @@ public class ServerEntrySerializerTest
     @Test public void testSerializeEmtpyServerEntry() throws Exception
     {
         DN dn = DN.EMPTY_DN;
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }
@@ -142,13 +142,13 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         DN newDn = new DN();
         newDn.add( dn.getRdn() );
@@ -163,14 +163,14 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
 
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         DN newDn = new DN();
         newDn.add( dn.getRdn() );
@@ -185,7 +185,7 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" );
         entry.add( "cn", "text", "test" );
         entry.add( "SN", (String)null );
@@ -195,7 +195,7 @@ public class ServerEntrySerializerTest
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         DN newDn = new DN();
         newDn.add( dn.getRdn() );
@@ -210,7 +210,7 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "inetOrgPerson", "organizationalPerson" );
         entry.add( "cn", "text", "test" );
         entry.add( "SN", (String)null );
@@ -220,7 +220,7 @@ public class ServerEntrySerializerTest
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }
@@ -231,13 +231,13 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }
@@ -248,7 +248,7 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         EntryAttribute oc = new DefaultEntryAttribute( "ObjectClass", schemaManager.lookupAttributeTypeRegistry( "objectclass" ) );
@@ -256,7 +256,7 @@ public class ServerEntrySerializerTest
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }
@@ -267,14 +267,14 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         entry.add( "ObjectClass", "top", "person" );
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }
@@ -285,14 +285,14 @@ public class ServerEntrySerializerTest
         DN dn = new DN( "" );
         dn.normalize( oids );
         
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
         entry.add( "userPassword", StringTools.getBytesUtf8( "secret" ) );
         
         byte[] data = ses.serialize( entry );
         
-        ServerEntry result = (ServerEntry)ses.deserialize( data );
+        Entry result = (Entry)ses.deserialize( data );
         
         assertEquals( entry, result );
     }

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Wed Apr 28 08:44:42 2010
@@ -34,7 +34,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.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -90,7 +90,7 @@ public class ChangePassword implements D
         
         //FIXME check if keyderivation is necessary
         
-        ServerEntry entry = StoreUtils.findPrincipalEntry( session, searchBaseDn, principal.getName() );
+        Entry entry = StoreUtils.findPrincipalEntry( session, searchBaseDn, principal.getName() );
         session.modify( entry.getDn(), mods );
 
         return entry.getDn().toString();

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Wed Apr 28 08:44:42 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier;
 import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
 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.name.DN;
 
 
@@ -91,7 +91,7 @@ public class GetPrincipal implements Dir
      * @return the entry for the principal
      * @throws NamingException if there are any access problems
      */
-    private PrincipalStoreEntry getEntry( ServerEntry entry ) throws Exception
+    private PrincipalStoreEntry getEntry( Entry entry ) throws Exception
     {
         PrincipalStoreEntryModifier modifier = new PrincipalStoreEntryModifier();
 

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Wed Apr 28 08:44:42 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 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.entry.Value;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -54,19 +54,19 @@ public class StoreUtils
     
     
     /**
-     * Creates a ServerEntry for a PrincipalStoreEntry, doing what a state 
-     * factory does but for ServerEntry instead of Attributes.
+     * Creates a Entry for a PrincipalStoreEntry, doing what a state 
+     * factory does but for Entry instead of Attributes.
      *
      * @param session the session to use to access the directory's registries
      * @param dn the distinguished name of the principal to be 
-     * @param principalEntry the principal entry to convert into a ServerEntry
+     * @param principalEntry the principal entry to convert into a Entry
      * @return the resultant server entry for the PrincipalStoreEntry argument
      * @throws Exception if there are problems accessing registries
      */
-    public static ServerEntry toServerEntry( CoreSession session, DN dn, PrincipalStoreEntry principalEntry ) 
+    public static Entry toServerEntry( CoreSession session, DN dn, PrincipalStoreEntry principalEntry ) 
         throws Exception
     {
-        ServerEntry outAttrs = session.getDirectoryService().newEntry( dn );
+        Entry outAttrs = session.getDirectoryService().newEntry( dn );
         
         // process the objectClass attribute
         outAttrs.add( SchemaConstants.OBJECT_CLASS_AT, 
@@ -111,7 +111,7 @@ public class StoreUtils
     
 
     /**
-     * Finds the ServerEntry associated with the Kerberos principal name.
+     * Finds the Entry associated with the Kerberos principal name.
      *
      * @param session the session to use for the search
      * @param searchBaseDn the base to use while searching
@@ -119,7 +119,7 @@ public class StoreUtils
      * @return the server entry for the principal or null if non-existent
      * @throws Exception if there are problems while searching the directory
      */
-    public static ServerEntry findPrincipalEntry( CoreSession session, DN searchBaseDn, String principal ) 
+    public static Entry findPrincipalEntry( CoreSession session, DN searchBaseDn, String principal ) 
         throws Exception
     {
         EntryFilteringCursor cursor = null;
@@ -133,7 +133,7 @@ public class StoreUtils
             cursor.beforeFirst();
             if ( cursor.next() )
             {
-                ServerEntry entry = cursor.get();
+                Entry entry = cursor.get();
                 LOG.debug( "Found entry {} for kerberos principal name {}", entry, principal );
                 
                 while ( cursor.next() )

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Wed Apr 28 08:44:42 2010
@@ -41,7 +41,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -112,7 +111,7 @@ public class ClientModifyRequestTest ext
 
         connection.modify( modRequest );
 
-        ServerEntry entry = session.lookup( dn );
+        Entry entry = session.lookup( dn );
 
         String actual = entry.get( SchemaConstants.SN_AT ).getString();
 
@@ -136,7 +135,7 @@ public class ClientModifyRequestTest ext
         
         connection.modify( entry, ModificationOperation.REPLACE_ATTRIBUTE );
         
-        ServerEntry lookupEntry = session.lookup( dn );
+        Entry lookupEntry = session.lookup( dn );
 
         String actualSn = lookupEntry.get( SchemaConstants.SN_AT ).getString();
         assertEquals( expectedSn, actualSn );
@@ -165,7 +164,7 @@ public class ClientModifyRequestTest ext
             
             assertNotNull( response );
 
-            ServerEntry entry = session.lookup( dn );
+            Entry entry = session.lookup( dn );
 
             String actual = entry.get( SchemaConstants.SN_AT ).getString();
 

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Wed Apr 28 08:44:42 2010
@@ -45,9 +45,8 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
-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.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.ldif.LdapLdifException;
@@ -217,7 +216,7 @@ public class LdifPartition extends BTree
                 if ( contextEntryFile.exists() )
                 {
                     LdifReader reader = new LdifReader( contextEntryFile );
-                    contextEntry = new DefaultServerEntry( schemaManager, reader.next().getEntry() );
+                    contextEntry = new DefaultClientEntry( schemaManager, reader.next().getEntry() );
                     reader.close();
                 }
                 else
@@ -278,7 +277,7 @@ public class LdifPartition extends BTree
     @Override
     public void delete( Long id ) throws Exception
     {
-        ServerEntry entry = lookup( id );
+        Entry entry = lookup( id );
 
         wrappedPartition.delete( id );
 
@@ -404,11 +403,11 @@ public class LdifPartition extends BTree
         add( modifiedEntry );
 
         // Then, if there are some children, move then to the new place
-        IndexCursor<Long, ServerEntry, Long> cursor = getSubLevelIndex().forwardCursor( entryIdOld );
+        IndexCursor<Long, Entry, Long> cursor = getSubLevelIndex().forwardCursor( entryIdOld );
 
         while ( cursor.next() )
         {
-            IndexEntry<Long, ServerEntry, Long> entry = cursor.get();
+            IndexEntry<Long, Entry, Long> entry = cursor.get();
 
             // except the parent entry add the rest of entries
             if ( entry.getId() != entryIdOld )
@@ -471,7 +470,7 @@ public class LdifPartition extends BTree
                     LdifEntry ldifEntry = ldifEntries.get( 0 );
                     LOG.debug( "Adding entry {}", ldifEntry );
 
-                    ServerEntry serverEntry = new DefaultServerEntry( schemaManager, ldifEntry.getEntry() );
+                    Entry serverEntry = new DefaultClientEntry( schemaManager, ldifEntry.getEntry() );
 
                     if ( !serverEntry.containsAttribute( SchemaConstants.ENTRY_CSN_AT ) )
                     {
@@ -765,7 +764,7 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public void addIndexOn( Index<? extends Object, ServerEntry, Long> index ) throws Exception
+    public void addIndexOn( Index<? extends Object, Entry, Long> index ) throws Exception
     {
         wrappedPartition.addIndexOn( index );
     }
@@ -786,7 +785,7 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public Index<String, ServerEntry, Long> getAliasIndex()
+    public Index<String, Entry, Long> getAliasIndex()
     {
         return wrappedPartition.getAliasIndex();
     }
@@ -828,14 +827,14 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public Index<Long, ServerEntry, Long> getOneAliasIndex()
+    public Index<Long, Entry, Long> getOneAliasIndex()
     {
         return wrappedPartition.getOneAliasIndex();
     }
 
 
     @Override
-    public Index<Long, ServerEntry, Long> getOneLevelIndex()
+    public Index<Long, Entry, Long> getOneLevelIndex()
     {
         return wrappedPartition.getOneLevelIndex();
     }
@@ -856,7 +855,7 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public Index<String, ServerEntry, Long> getPresenceIndex()
+    public Index<String, Entry, Long> getPresenceIndex()
     {
         return wrappedPartition.getPresenceIndex();
     }
@@ -870,21 +869,21 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public Index<Long, ServerEntry, Long> getSubAliasIndex()
+    public Index<Long, Entry, Long> getSubAliasIndex()
     {
         return wrappedPartition.getSubAliasIndex();
     }
 
 
     @Override
-    public Index<Long, ServerEntry, Long> getSubLevelIndex()
+    public Index<Long, Entry, Long> getSubLevelIndex()
     {
         return wrappedPartition.getSubLevelIndex();
     }
 
 
     @Override
-    public Index<?, ServerEntry, Long> getSystemIndex( String id ) throws Exception
+    public Index<?, Entry, Long> getSystemIndex( String id ) throws Exception
     {
         return wrappedPartition.getSystemIndex( id );
     }
@@ -898,7 +897,7 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public Index<? extends Object, ServerEntry, Long> getUserIndex( String id ) throws Exception
+    public Index<? extends Object, Entry, Long> getUserIndex( String id ) throws Exception
     {
         return wrappedPartition.getUserIndex( id );
     }
@@ -933,7 +932,7 @@ public class LdifPartition extends BTree
 
 
     @Override
-    public IndexCursor<Long, ServerEntry, Long> list( Long id ) throws Exception
+    public IndexCursor<Long, Entry, Long> list( Long id ) throws Exception
     {
         return wrappedPartition.list( id );
     }
@@ -1054,7 +1053,7 @@ public class LdifPartition extends BTree
             // What can we do here ???
         }
 
-        this.contextEntry = new DefaultServerEntry( schemaManager, entries.get( 0 ).getEntry() );
+        this.contextEntry = new DefaultClientEntry( schemaManager, entries.get( 0 ).getEntry() );
     }
 
 

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Wed Apr 28 08:44:42 2010
@@ -49,9 +49,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
-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.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -163,7 +162,7 @@ public class LdifPartitionTest
     
     private ClonedServerEntry createEntry( String dn ) throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
         entry.setDn( new DN( dn ).normalize( schemaManager.getNormalizerMapping() ) );
         entry.put( SchemaConstants.ENTRY_CSN_AT, defaultCSNFactory.newInstance().toString() );
         entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Wed Apr 28 08:44:42 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
 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.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -67,7 +67,7 @@ public class GetCatalog implements Direc
         
         while ( list.next() )
         {
-            ServerEntry result = list.get();
+            Entry result = list.get();
 
             String name = null;
             EntryAttribute attribute = result.get( ApacheSchemaConstants.APACHE_CATALOGUE_ENTRY_NAME_AT );

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Wed Apr 28 08:44:42 2010
@@ -31,9 +31,9 @@ import javax.naming.NamingException;
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.name.DN;
@@ -201,7 +201,7 @@ public class LdifFileLoader
                         try
                         {
                             coreSession.add( 
-                                new DefaultServerEntry( 
+                                new DefaultClientEntry( 
                                     coreSession.getDirectoryService().getSchemaManager(), entry ) ); 
                            count++;
                             log.info( "Created {}.", rdn );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java Wed Apr 28 08:44:42 2010
@@ -47,7 +47,7 @@ import org.apache.directory.server.annot
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.junit.Before;
@@ -146,7 +146,7 @@ public class ReferralSearchIT extends Ab
         {
             LdifEntry entry = reader.next();
             ldapServer.getDirectoryService().getAdminSession().add( 
-                new DefaultServerEntry( ldapServer.getDirectoryService().getSchemaManager(), entry.getEntry() ) ); 
+                new DefaultClientEntry( ldapServer.getDirectoryService().getSchemaManager(), entry.getEntry() ) ); 
         }
     }
     

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java Wed Apr 28 08:44:42 2010
@@ -46,7 +46,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.operations.bind.BogusNtlmProvider;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-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.junit.Test;
 import org.junit.runner.RunWith;
@@ -120,7 +120,7 @@ public class LdapsUpdateCertificateIT ex
         // create a new certificate
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
-        ServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
+        Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
             new DN( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Wed Apr 28 08:44:42 2010
@@ -51,7 +51,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
-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.junit.After;
 import org.junit.Before;
@@ -171,7 +171,7 @@ public class StartTlsUpdateCertificateIT
         // create a new certificate
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
-        ServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
+        Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
             new DN( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Wed Apr 28 08:44:42 2010
@@ -44,7 +44,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
 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.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -259,7 +259,7 @@ public class ApacheDS
     private void ensureLdifFileBase() throws Exception
     {
         DN dn = new DN( ServerDNConstants.LDIF_FILES_DN );
-        ServerEntry entry = null;
+        Entry entry = null;
         
         try
         {
@@ -307,7 +307,7 @@ public class ApacheDS
             ApacheSchemaConstants.UNIX_FILE_AT;
         String oc = File.separatorChar == '\\' ? ApacheSchemaConstants.WINDOWS_FILE_OC : ApacheSchemaConstants.UNIX_FILE_OC;
 
-        ServerEntry entry = directoryService.newEntry( buildProtectedFileEntryDn( ldif ) );
+        Entry entry = directoryService.newEntry( buildProtectedFileEntryDn( ldif ) );
         entry.add( rdnAttr, getCanonical( ldif ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, oc );
         directoryService.getAdminSession().add( entry );

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Wed Apr 28 08:44:42 2010
@@ -47,7 +47,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.MultiException;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -208,7 +208,7 @@ public class DumpCommand extends ToolCom
         base.disableTransactions();
         CacheRecordManager recMan = new CacheRecordManager( base, new MRU( 1000 ) );
 
-        JdbmMasterTable<ServerEntry> master = new JdbmMasterTable<ServerEntry>( recMan, schemaManager );
+        JdbmMasterTable<Entry> master = new JdbmMasterTable<Entry>( recMan, schemaManager );
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( "apacheUpdn" );
         JdbmIndex idIndex = new JdbmIndex();
         idIndex.setAttributeId( attributeType.getName() );
@@ -218,12 +218,12 @@ public class DumpCommand extends ToolCom
         idIndex.init( schemaManager, attributeType, partitionDirectory );
 
         out.println( "#---------------------" );
-        Cursor<Tuple<Long,ServerEntry>> list = master.cursor();
+        Cursor<Tuple<Long,Entry>> list = master.cursor();
         StringBuffer buf = new StringBuffer();
         
         while ( list.next() )
         {
-            Tuple<Long,ServerEntry> tuple = list.get();
+            Tuple<Long,Entry> tuple = list.get();
             Long id = tuple.getKey();
             String dn = ( String ) idIndex.reverseLookup( id );
             Attributes entry = ( Attributes ) tuple.getValue();

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Wed Apr 28 08:44:42 2010
@@ -38,9 +38,10 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.tools.IndexUtils;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 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.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -126,7 +127,7 @@ public class IndexCommand extends ToolCo
         base.disableTransactions();
         CacheRecordManager recMan = new CacheRecordManager( base, new MRU( 1000 ) );
 
-        JdbmMasterTable<ServerEntry> master = new JdbmMasterTable<ServerEntry>( recMan, schemaManager );
+        JdbmMasterTable<Entry> master = new JdbmMasterTable<Entry>( recMan, schemaManager );
         JdbmIndex index = new JdbmIndex();
         index.setAttributeId( attributeType.getName() );
         index.setCacheSize( JdbmIndex.DEFAULT_INDEX_CACHE_SIZE );
@@ -150,13 +151,13 @@ public class IndexCommand extends ToolCo
         existenceIdx.setWkDirPath( partitionDirectory );
         existenceIdx.init( schemaManager, schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ), partitionDirectory );
 
-        Cursor<Tuple<Long,ServerEntry>> list = master.cursor();
+        Cursor<Tuple<Long,Entry>> list = master.cursor();
         
         while ( list.next() )
         {
-            Tuple<Long,ServerEntry> tuple = list.get();
+            Tuple<Long,Entry> tuple = list.get();
             Long id = tuple.getKey();
-            DefaultServerEntry entry = ( DefaultServerEntry ) tuple.getValue();
+            Entry entry = ( DefaultClientEntry ) tuple.getValue();
 
             EntryAttribute attr = entry.get( attributeType );
             if ( attr == null )

Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original)
+++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Wed Apr 28 08:44:42 2010
@@ -26,9 +26,9 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
  */
 public class AttributesFactory
 {
-    public ServerEntry getAttributes( SchemaObject obj, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( SchemaObject obj, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
         if ( obj instanceof LdapSyntax )
         {
@@ -95,9 +95,9 @@ public class AttributesFactory
     }
     
     
-    public ServerEntry getAttributes( Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( Schema schema, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_SCHEMA_OC );
         entry.put( SchemaConstants.CN_AT, schema.getSchemaName() );
@@ -127,9 +127,9 @@ public class AttributesFactory
     }
     
     
-    public ServerEntry getAttributes( SyntaxChecker syntaxChecker, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( SyntaxChecker syntaxChecker, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_SYNTAX_CHECKER_OC );
         entry.put( MetaSchemaConstants.M_OID_AT, syntaxChecker.getOid() );
@@ -141,9 +141,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( LdapSyntax syntax, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( LdapSyntax syntax, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_SYNTAX_OC );
         entry.put( MetaSchemaConstants.X_HUMAN_READABLE_AT, getBoolean( syntax.isHumanReadable() ) );
@@ -155,9 +155,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( String oid, Normalizer normalizer, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( String oid, Normalizer normalizer, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_NORMALIZER_OC );
         entry.put( MetaSchemaConstants.M_OID_AT, oid );
@@ -168,9 +168,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( String oid, LdapComparator<? super Object> comparator, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( String oid, LdapComparator<? super Object> comparator, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_COMPARATOR_OC );
         entry.put( MetaSchemaConstants.M_OID_AT, oid );
@@ -187,9 +187,9 @@ public class AttributesFactory
      * @return Attributes
      * @throws LdapException
      */
-    public ServerEntry getAttributes( MatchingRule matchingRule, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( MatchingRule matchingRule, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_MATCHING_RULE_OC );
         entry.put( MetaSchemaConstants.M_SYNTAX_AT, matchingRule.getSyntaxOid() );
@@ -200,9 +200,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( MatchingRuleUse matchingRuleUse, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( MatchingRuleUse matchingRuleUse, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, "" );
         entry.put( SchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -211,9 +211,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( DITStructureRule dITStructureRule, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( DITStructureRule dITStructureRule, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, "" );
         entry.put( SchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -222,9 +222,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( DITContentRule dITContentRule, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( DITContentRule dITContentRule, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, "" );
         entry.put( SchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -233,9 +233,9 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( NameForm nameForm, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( NameForm nameForm, Schema schema, SchemaManager schemaManager )
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, "" );
         entry.put( SchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -262,9 +262,9 @@ public class AttributesFactory
      * @return Attributes
      * @throws LdapException
      */
-    public ServerEntry getAttributes( AttributeType attributeType, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( AttributeType attributeType, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC );
         entry.put( MetaSchemaConstants.M_SYNTAX_AT, attributeType.getSyntaxOid() );
@@ -322,9 +322,9 @@ public class AttributesFactory
      * @return the attributes of the metaSchema entry representing the objectClass
      * @throws LdapException if there are any problems
      */
-    public ServerEntry getAttributes( ObjectClass objectClass, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( ObjectClass objectClass, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
 
         entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, MetaSchemaConstants.META_OBJECT_CLASS_OC );
         entry.put( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT, objectClass.getType().toString() );
@@ -376,7 +376,7 @@ public class AttributesFactory
     }
     
     
-    private final void injectCommon( SchemaObject object, ServerEntry entry, SchemaManager schemaManager ) throws LdapException
+    private final void injectCommon( SchemaObject object, Entry entry, SchemaManager schemaManager ) throws LdapException
     {
         injectNames( object.getNames(), entry, schemaManager );
         entry.put( MetaSchemaConstants.M_OBSOLETE_AT, getBoolean( object.isObsolete() ) );
@@ -389,7 +389,7 @@ public class AttributesFactory
     }
     
     
-    private final void injectNames( List<String> names, ServerEntry entry, SchemaManager schemaManager ) throws LdapException
+    private final void injectNames( List<String> names, Entry entry, SchemaManager schemaManager ) throws LdapException
     {
         if ( ( names == null ) || ( names.size() == 0 ) )
         {

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Wed Apr 28 08:44:42 2010
@@ -47,7 +47,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
@@ -66,7 +66,7 @@ public abstract class BTreePartition<ID>
 {
 
     /** the search engine used to search the database */
-    protected SearchEngine<ServerEntry, ID> searchEngine;
+    protected SearchEngine<Entry, ID> searchEngine;
     protected Optimizer optimizer;
 
     protected SchemaManager schemaManager;
@@ -77,8 +77,8 @@ public abstract class BTreePartition<ID>
     private File partitionDir;
 
     /** The rootDSE context */
-    protected ServerEntry contextEntry;
-    private Set<Index<? extends Object, ServerEntry, ID>> indexedAttributes;
+    protected Entry contextEntry;
+    private Set<Index<? extends Object, Entry, ID>> indexedAttributes;
 
 
     // ------------------------------------------------------------------------
@@ -90,7 +90,7 @@ public abstract class BTreePartition<ID>
      */
     protected BTreePartition()
     {
-        indexedAttributes = new HashSet<Index<? extends Object, ServerEntry, ID>>();
+        indexedAttributes = new HashSet<Index<? extends Object, Entry, ID>>();
     }
 
 
@@ -138,22 +138,22 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public void setIndexedAttributes( Set<Index<? extends Object, ServerEntry, ID>> indexedAttributes )
+    public void setIndexedAttributes( Set<Index<? extends Object, Entry, ID>> indexedAttributes )
     {
         this.indexedAttributes = indexedAttributes;
     }
 
 
-    public void addIndexedAttributes( Index<? extends Object, ServerEntry, ID>... indexes )
+    public void addIndexedAttributes( Index<? extends Object, Entry, ID>... indexes )
     {
-        for ( Index<? extends Object, ServerEntry, ID> index : indexes )
+        for ( Index<? extends Object, Entry, ID> index : indexes )
         {
             indexedAttributes.add( index );
         }
     }
 
 
-    public Set<Index<? extends Object, ServerEntry, ID>> getIndexedAttributes()
+    public Set<Index<? extends Object, Entry, ID>> getIndexedAttributes()
     {
         return indexedAttributes;
     }
@@ -219,7 +219,7 @@ public abstract class BTreePartition<ID>
      *
      * @return the search engine
      */
-    public SearchEngine<ServerEntry, ID> getSearchEngine()
+    public SearchEngine<Entry, ID> getSearchEngine()
     {
         return searchEngine;
     }
@@ -271,7 +271,7 @@ public abstract class BTreePartition<ID>
     public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
     {
         SearchControls searchCtls = opContext.getSearchControls();
-        IndexCursor<ID, ServerEntry, ID> underlying;
+        IndexCursor<ID, Entry, ID> underlying;
 
         underlying = searchEngine.cursor( opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(),
             searchCtls );
@@ -296,7 +296,7 @@ public abstract class BTreePartition<ID>
             return entry;
         }
 
-        for ( AttributeType attributeType : ( ( ServerEntry ) entry.getOriginalEntry() ).getAttributeTypes() )
+        for ( AttributeType attributeType : ( ( Entry ) entry.getOriginalEntry() ).getAttributeTypes() )
         {
             if ( !opContext.getAttrsId().contains( attributeType.getOid() ) )
             {
@@ -333,7 +333,7 @@ public abstract class BTreePartition<ID>
     // Index Operations 
     // ------------------------------------------------------------------------
 
-    public abstract void addIndexOn( Index<? extends Object, ServerEntry, ID> index ) throws Exception;
+    public abstract void addIndexOn( Index<? extends Object, Entry, ID> index ) throws Exception;
 
 
     public abstract boolean hasUserIndexOn( String attribute ) throws Exception;
@@ -342,7 +342,7 @@ public abstract class BTreePartition<ID>
     public abstract boolean hasSystemIndexOn( String attribute ) throws Exception;
 
 
-    public abstract Index<String, ServerEntry, ID> getPresenceIndex();
+    public abstract Index<String, Entry, ID> getPresenceIndex();
 
 
     /**
@@ -351,7 +351,7 @@ public abstract class BTreePartition<ID>
      *
      * @return the one level Index
      */
-    public abstract Index<ID, ServerEntry, ID> getOneLevelIndex();
+    public abstract Index<ID, Entry, ID> getOneLevelIndex();
 
 
     /**
@@ -360,7 +360,7 @@ public abstract class BTreePartition<ID>
      *
      * @return the sub tree level Index
      */
-    public abstract Index<ID, ServerEntry, ID> getSubLevelIndex();
+    public abstract Index<ID, Entry, ID> getSubLevelIndex();
 
 
     /**
@@ -370,7 +370,7 @@ public abstract class BTreePartition<ID>
      * 
      * @return the one alias index
      */
-    public abstract Index<ID, ServerEntry, ID> getOneAliasIndex();
+    public abstract Index<ID, Entry, ID> getOneAliasIndex();
 
 
     /**
@@ -380,7 +380,7 @@ public abstract class BTreePartition<ID>
      * 
      * @return the sub alias index
      */
-    public abstract Index<ID, ServerEntry, ID> getSubAliasIndex();
+    public abstract Index<ID, Entry, ID> getSubAliasIndex();
 
 
     /**
@@ -389,7 +389,7 @@ public abstract class BTreePartition<ID>
      * 
      * @return the index on the ALIAS_ATTRIBUTE
      */
-    public abstract Index<String, ServerEntry, ID> getAliasIndex();
+    public abstract Index<String, Entry, ID> getAliasIndex();
 
 
     /**
@@ -419,10 +419,10 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public abstract Index<? extends Object, ServerEntry, ID> getUserIndex( String attribute ) throws Exception;
+    public abstract Index<? extends Object, Entry, ID> getUserIndex( String attribute ) throws Exception;
 
 
-    public abstract Index<? extends Object, ServerEntry, ID> getSystemIndex( String attribute ) throws Exception;
+    public abstract Index<? extends Object, Entry, ID> getSystemIndex( String attribute ) throws Exception;
 
 
     public abstract ID getEntryId( DN dn ) throws Exception;
@@ -463,7 +463,7 @@ public abstract class BTreePartition<ID>
     public abstract void delete( ID id ) throws Exception;
 
 
-    public abstract IndexCursor<ID, ServerEntry, ID> list( ID id ) throws Exception;
+    public abstract IndexCursor<ID, Entry, ID> list( ID id ) throws Exception;
 
 
     public abstract int getChildCount( ID id ) throws Exception;

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java Wed Apr 28 08:44:42 2010
@@ -27,22 +27,22 @@ import org.apache.directory.server.xdbm.
 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.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
- * Adapts index cursors to return just ServerEntry objects.
+ * Adapts index cursors to return just Entry objects.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ServerEntryCursorAdaptor<ID> implements Cursor<ServerEntry>
+public class ServerEntryCursorAdaptor<ID> implements Cursor<Entry>
 {
     private final BTreePartition<ID> db;
-    private final IndexCursor<ID, ServerEntry, ID> indexCursor;
+    private final IndexCursor<ID, Entry, ID> indexCursor;
 
 
-    public ServerEntryCursorAdaptor( BTreePartition<ID> db, IndexCursor<ID, ServerEntry, ID> indexCursor )
+    public ServerEntryCursorAdaptor( BTreePartition<ID> db, IndexCursor<ID, Entry, ID> indexCursor )
     {
         this.db = db;
         this.indexCursor = indexCursor;
@@ -52,7 +52,7 @@ public class ServerEntryCursorAdaptor<ID
     /* 
      * @see Cursor#after(java.lang.Object)
      */
-    public void after( ServerEntry element ) throws Exception
+    public void after( Entry element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -79,7 +79,7 @@ public class ServerEntryCursorAdaptor<ID
     /* 
      * @see Cursor#before(java.lang.Object)
      */
-    public void before( ServerEntry element ) throws Exception
+    public void before( Entry element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -130,9 +130,9 @@ public class ServerEntryCursorAdaptor<ID
     /* 
      * @see Cursor#get()
      */
-    public ServerEntry get() throws Exception
+    public Entry get() throws Exception
     {
-        IndexEntry<ID, ServerEntry, ID> indexEntry = indexCursor.get();
+        IndexEntry<ID, Entry, ID> indexEntry = indexCursor.get();
 
         if ( indexEntry.getObject() == null )
         {
@@ -191,8 +191,8 @@ public class ServerEntryCursorAdaptor<ID
     /* 
      * @see Iterable#iterator()
      */
-    public Iterator<ServerEntry> iterator()
+    public Iterator<Entry> iterator()
     {
-        return new CursorIterator<ServerEntry>( this );
+        return new CursorIterator<Entry>( this );
     }
 }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Wed Apr 28 08:44:42 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
 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.LdapAuthenticationNotSupportedException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -53,10 +53,10 @@ public abstract class AbstractXdbmPartit
     protected boolean optimizerEnabled = true;
 
     /** The store. */
-    protected Store<ServerEntry, ID> store;
+    protected Store<Entry, ID> store;
 
 
-    protected AbstractXdbmPartition( Store<ServerEntry, ID> store )
+    protected AbstractXdbmPartition( Store<Entry, ID> store )
     {
         this.store = store;
     }
@@ -121,31 +121,31 @@ public abstract class AbstractXdbmPartit
     // I N D E X   M E T H O D S
     // ------------------------------------------------------------------------
 
-    public final void addIndexOn( Index<? extends Object, ServerEntry, ID> index ) throws Exception
+    public final void addIndexOn( Index<? extends Object, Entry, ID> index ) throws Exception
     {
         store.addIndex( index );
     }
 
 
-    public final Index<ID, ServerEntry, ID> getOneLevelIndex()
+    public final Index<ID, Entry, ID> getOneLevelIndex()
     {
         return store.getOneLevelIndex();
     }
 
 
-    public final Index<String, ServerEntry, ID> getAliasIndex()
+    public final Index<String, Entry, ID> getAliasIndex()
     {
         return store.getAliasIndex();
     }
 
 
-    public final Index<ID, ServerEntry, ID> getOneAliasIndex()
+    public final Index<ID, Entry, ID> getOneAliasIndex()
     {
         return store.getOneAliasIndex();
     }
 
 
-    public final Index<ID, ServerEntry, ID> getSubAliasIndex()
+    public final Index<ID, Entry, ID> getSubAliasIndex()
     {
         return store.getSubAliasIndex();
     }
@@ -178,7 +178,7 @@ public abstract class AbstractXdbmPartit
     /**
      * @see org.apache.directory.server.core.partition.impl.btree.BTreePartition#getUserIndex(String)
      */
-    public final Index<? extends Object, ServerEntry, ID> getUserIndex( String id ) throws IndexNotFoundException
+    public final Index<? extends Object, Entry, ID> getUserIndex( String id ) throws IndexNotFoundException
     {
         return store.getUserIndex( id );
     }
@@ -187,7 +187,7 @@ public abstract class AbstractXdbmPartit
     /**
      * @see BTreePartition#getEntryId(String)
      */
-    public final Index<? extends Object, ServerEntry, ID> getSystemIndex( String id ) throws IndexNotFoundException
+    public final Index<? extends Object, Entry, ID> getSystemIndex( String id ) throws IndexNotFoundException
     {
         return store.getSystemIndex( id );
     }
@@ -237,7 +237,7 @@ public abstract class AbstractXdbmPartit
 
     public final void add( AddOperationContext addContext ) throws Exception
     {
-        store.add( ( ServerEntry ) ( ( ClonedServerEntry ) addContext.getEntry() ).getClonedEntry() );
+        store.add( ( Entry ) ( ( ClonedServerEntry ) addContext.getEntry() ).getClonedEntry() );
     }
 
 
@@ -253,7 +253,7 @@ public abstract class AbstractXdbmPartit
     }
 
 
-    public final IndexCursor<ID, ServerEntry, ID> list( ID id ) throws Exception
+    public final IndexCursor<ID, Entry, ID> list( ID id ) throws Exception
     {
         return store.list( id );
     }
@@ -374,13 +374,13 @@ public abstract class AbstractXdbmPartit
     }
 
 
-    public final Index<String, ServerEntry, ID> getPresenceIndex()
+    public final Index<String, Entry, ID> getPresenceIndex()
     {
         return store.getPresenceIndex();
     }
 
 
-    public final Index<ID, ServerEntry, ID> getSubLevelIndex()
+    public final Index<ID, Entry, ID> getSubLevelIndex()
     {
         return store.getSubLevelIndex();
     }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.const
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 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.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -417,10 +417,10 @@ public interface Store<E, ID>
      * 
      * @throws Exception If the addition failed.
      */
-    void add( ServerEntry entry ) throws Exception;
+    void add( Entry entry ) throws Exception;
 
 
-    ServerEntry lookup( ID id ) throws Exception;
+    Entry lookup( ID id ) throws Exception;
 
 
     /**
@@ -450,7 +450,7 @@ public interface Store<E, ID>
     String getProperty( String propertyName ) throws Exception;
 
 
-    void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception;
+    void modify( DN dn, ModificationOperation modOp, Entry mods ) throws Exception;
 
 
     void modify( DN dn, List<Modification> mods ) throws Exception;

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Wed Apr 28 08:44:42 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.xdbm
 
 
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-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.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.DN;
@@ -95,5 +95,5 @@ public interface SearchEngine<E, ID>
      * @return true if the filter passes the entry, false otherwise
      * @throws Exception if something goes wrong while accessing the db
      */
-    Evaluator<? extends ExprNode, ServerEntry, ID> evaluator( ExprNode filter ) throws Exception;
+    Evaluator<? extends ExprNode, Entry, ID> evaluator( ExprNode filter ) throws Exception;
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java Wed Apr 28 08:44:42 2010
@@ -25,7 +25,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -34,13 +34,13 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class AllEntriesCursor<ID> extends AbstractIndexCursor<ID, ServerEntry, ID>
+public class AllEntriesCursor<ID> extends AbstractIndexCursor<ID, Entry, ID>
 {
-    private IndexEntry<ID, ServerEntry, ID> indexEntry = new ForwardIndexEntry<ID, ServerEntry, ID>();
-    private final IndexCursor<String, ServerEntry, ID> wrapped;
+    private IndexEntry<ID, Entry, ID> indexEntry = new ForwardIndexEntry<ID, Entry, ID>();
+    private final IndexCursor<String, Entry, ID> wrapped;
 
 
-    public AllEntriesCursor( Store<ServerEntry, ID> db ) throws Exception
+    public AllEntriesCursor( Store<Entry, ID> db ) throws Exception
     {
         // Get a reverse cursor because we want to sort by ID
         wrapped = db.getNdnIndex().reverseCursor();
@@ -70,7 +70,7 @@ public class AllEntriesCursor<ID> extend
     /* 
      * @see org.apache.directory.server.core.cursor.Cursor#after(java.lang.Object)
      */
-    public void after( IndexEntry<ID, ServerEntry, ID> indexEntry ) throws Exception
+    public void after( IndexEntry<ID, Entry, ID> indexEntry ) throws Exception
     {
         checkNotClosed( "after()" );
         wrapped.afterValue( indexEntry.getId(), null );
@@ -99,7 +99,7 @@ public class AllEntriesCursor<ID> extend
     /* 
      * @see org.apache.directory.server.core.cursor.Cursor#before(java.lang.Object)
      */
-    public void before( IndexEntry<ID, ServerEntry, ID> indexEntry ) throws Exception
+    public void before( IndexEntry<ID, Entry, ID> indexEntry ) throws Exception
     {
         checkNotClosed( "before()" );
         wrapped.beforeValue( indexEntry.getId(), null );
@@ -129,10 +129,10 @@ public class AllEntriesCursor<ID> extend
     /* 
      * @see org.apache.directory.server.core.cursor.Cursor#get()
      */
-    public IndexEntry<ID, ServerEntry, ID> get() throws Exception
+    public IndexEntry<ID, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
-        IndexEntry<String, ServerEntry, ID> wrappedEntry = wrapped.get();
+        IndexEntry<String, Entry, ID> wrappedEntry = wrapped.get();
         indexEntry.setId( wrappedEntry.getId() );
         indexEntry.setValue( wrappedEntry.getId() );
         indexEntry.setObject( wrappedEntry.getObject() );

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 
 
@@ -41,16 +41,16 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AndCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class AndCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_707 );
-    private final IndexCursor<V, ServerEntry, ID> wrapped;
-    private final List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators;
+    private final IndexCursor<V, Entry, ID> wrapped;
+    private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
     private boolean available = false;
 
 
-    public AndCursor( IndexCursor<V, ServerEntry, ID> wrapped,
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators )
+    public AndCursor( IndexCursor<V, Entry, ID> wrapped,
+        List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
     {
         this.wrapped = wrapped;
         this.evaluators = optimize( evaluators );
@@ -75,13 +75,13 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
@@ -123,7 +123,7 @@ public class AndCursor<V, ID> extends Ab
         {
             checkNotClosed( "previous()" );
 
-            IndexEntry<?, ServerEntry, ID> candidate = wrapped.get();
+            IndexEntry<?, Entry, ID> candidate = wrapped.get();
             if ( matches( candidate ) )
             {
                 return available = true;
@@ -139,7 +139,7 @@ public class AndCursor<V, ID> extends Ab
         while ( wrapped.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = wrapped.get();
+            IndexEntry<?, Entry, ID> candidate = wrapped.get();
             if ( matches( candidate ) )
             {
                 return available = true;
@@ -150,7 +150,7 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( available )
@@ -189,16 +189,16 @@ public class AndCursor<V, ID> extends Ab
      * @param unoptimized the unoptimized list of Evaluators
      * @return optimized Evaluator list with increasing scan count ordering
      */
-    private List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimize(
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> unoptimized )
+    private List<Evaluator<? extends ExprNode, Entry, ID>> optimize(
+        List<Evaluator<? extends ExprNode, Entry, ID>> unoptimized )
     {
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             unoptimized.size() );
         optimized.addAll( unoptimized );
 
-        Collections.sort( optimized, new Comparator<Evaluator<?, ServerEntry, ID>>()
+        Collections.sort( optimized, new Comparator<Evaluator<?, Entry, ID>>()
         {
-            public int compare( Evaluator<?, ServerEntry, ID> e1, Evaluator<?, ServerEntry, ID> e2 )
+            public int compare( Evaluator<?, Entry, ID> e1, Evaluator<?, Entry, ID> e2 )
             {
                 long scanCount1 = ( Long ) e1.getExpression().get( "count" );
                 long scanCount2 = ( Long ) e2.getExpression().get( "count" );
@@ -227,9 +227,9 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    private boolean matches( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    private boolean matches( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( !evaluator.evaluate( indexEntry ) )
             {

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java Wed Apr 28 08:44:42 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -38,14 +38,14 @@ import java.util.Comparator;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class AndEvaluator<ID> implements Evaluator<AndNode, ServerEntry, ID>
+public class AndEvaluator<ID> implements Evaluator<AndNode, Entry, ID>
 {
-    private final List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators;
+    private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
 
     private final AndNode node;
 
 
-    public AndEvaluator( AndNode node, List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators )
+    public AndEvaluator( AndNode node, List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
     {
         this.node = node;
         this.evaluators = optimize( evaluators );
@@ -63,15 +63,15 @@ public class AndEvaluator<ID> implements
      * @param unoptimized the unoptimized list of Evaluators
      * @return optimized Evaluator list with increasing scan count ordering
      */
-    private List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimize(
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> unoptimized )
+    private List<Evaluator<? extends ExprNode, Entry, ID>> optimize(
+        List<Evaluator<? extends ExprNode, Entry, ID>> unoptimized )
     {
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             unoptimized.size() );
         optimized.addAll( unoptimized );
-        Collections.sort( optimized, new Comparator<Evaluator<?, ServerEntry, ID>>()
+        Collections.sort( optimized, new Comparator<Evaluator<?, Entry, ID>>()
         {
-            public int compare( Evaluator<?, ServerEntry, ID> e1, Evaluator<?, ServerEntry, ID> e2 )
+            public int compare( Evaluator<?, Entry, ID> e1, Evaluator<?, Entry, ID> e2 )
             {
                 long scanCount1 = ( Long ) e1.getExpression().get( "count" );
                 long scanCount2 = ( Long ) e2.getExpression().get( "count" );
@@ -102,7 +102,7 @@ public class AndEvaluator<ID> implements
 
     public boolean evaluateId( ID id ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( !evaluator.evaluateId( id ) )
             {
@@ -114,9 +114,9 @@ public class AndEvaluator<ID> implements
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( !evaluator.evaluateEntry( entry ) )
             {
@@ -128,9 +128,9 @@ public class AndEvaluator<ID> implements
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( !evaluator.evaluate( indexEntry ) )
             {

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Value;
 
 
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class ApproximateCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class ApproximateCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = "ApproximateCursors only support positioning by element when a user index exists on the asserted attribute.";
 
@@ -51,17 +51,17 @@ public class ApproximateCursor<V, ID> ex
     private final ApproximateEvaluator<V, ID> approximateEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final IndexCursor<V, ServerEntry, ID> userIdxCursor;
+    private final IndexCursor<V, Entry, ID> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final IndexCursor<String, ServerEntry, ID> ndnIdxCursor;
+    private final IndexCursor<String, Entry, ID> ndnIdxCursor;
 
     /** used only when ndnIdxCursor is used (no index on attribute) */
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public ApproximateCursor( Store<ServerEntry, ID> db, ApproximateEvaluator<V, ID> approximateEvaluator ) throws Exception
+    public ApproximateCursor( Store<Entry, ID> db, ApproximateEvaluator<V, ID> approximateEvaluator ) throws Exception
     {
         this.approximateEvaluator = approximateEvaluator;
 
@@ -69,7 +69,7 @@ public class ApproximateCursor<V, ID> ex
         Value<V> value = approximateEvaluator.getExpression().getValue();
         if ( db.hasIndexOn( attribute ) )
         {
-            Index<V, ServerEntry, ID> index = ( Index<V, ServerEntry, ID> ) db.getIndex( attribute );
+            Index<V, Entry, ID> index = ( Index<V, Entry, ID> ) db.getIndex( attribute );
             userIdxCursor = index.forwardCursor( value.get() );
             ndnIdxCursor = null;
         }
@@ -120,7 +120,7 @@ public class ApproximateCursor<V, ID> ex
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         if ( userIdxCursor != null )
@@ -134,7 +134,7 @@ public class ApproximateCursor<V, ID> ex
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         if ( userIdxCursor != null )
@@ -202,7 +202,7 @@ public class ApproximateCursor<V, ID> ex
         while ( ndnIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnIdxCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnIdxCursor.get();
             if ( approximateEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -223,7 +223,7 @@ public class ApproximateCursor<V, ID> ex
         while ( ndnIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnIdxCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnIdxCursor.get();
             if ( approximateEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -235,7 +235,7 @@ public class ApproximateCursor<V, ID> ex
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( userIdxCursor != null )
@@ -245,7 +245,7 @@ public class ApproximateCursor<V, ID> ex
 
         if ( available )
         {
-            return ( IndexEntry<V, ServerEntry, ID> ) ndnIdxCursor.get();
+            return ( IndexEntry<V, Entry, ID> ) ndnIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );



Mime
View raw message