directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [3/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-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Wed Apr 28 08:44:42 2010
@@ -44,12 +44,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.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.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-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.exception.LdapNoSuchAttributeException;
@@ -63,12 +61,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 
 /**
- * Test the DefaultServerEntry class.
+ * Test the DefaultClientEntry class.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -142,12 +139,12 @@ public class DefaultServerEntryTest
     // Test the Constructors
     //-------------------------------------------------------------------------
     /**
-     * Test for method DefaultServerEntry()
+     * Test for method DefaultClientEntry()
      */
     @Test
-    public void testDefaultServerEntry() throws Exception
+    public void testDefaultClientEntry() throws Exception
     {
-        Entry entry = new DefaultServerEntry();
+        Entry entry = new DefaultClientEntry();
         assertNotNull( entry );
         assertEquals( DN.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -155,12 +152,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultServerEntry( registries )
+     * Test for method DefaultClientEntry( registries )
      */
     @Test
-    public void testDefaultServerEntryRegistries() throws Exception
+    public void testDefaultClientEntryRegistries() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
         assertNotNull( entry );
         assertEquals( DN.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -168,12 +165,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultServerEntry( registries, DN )
+     * Test for method DefaultClientEntry( registries, DN )
      */
     @Test
-    public void testDefaultServerEntryRegistriesDN() throws Exception
+    public void testDefaultClientEntryRegistriesDN() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -181,12 +178,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultServerEntry( registries, DN, AttributeType... )
+     * Test for method DefaultClientEntry( registries, DN, AttributeType... )
      */
     @Test
-    public void testDefaultServerEntryRegistriesDNAttributeTypeArray() throws Exception
+    public void testDefaultClientEntryRegistriesDNAttributeTypeArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN, atOC, atPwd, atCN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, atOC, atPwd, atCN );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 3, entry.size() );
@@ -197,12 +194,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultServerEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultClientEntry( registries, DN, AttributeType, upId )
      */
     @Test
-    public void testDefaultServerEntryRegistriesDNAttributeTypeUpId() throws Exception
+    public void testDefaultClientEntryRegistriesDNAttributeTypeUpId() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN, atOC, "  OBJECTCLASS  " );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, atOC, "  OBJECTCLASS  " );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 1, entry.size() );
@@ -213,12 +210,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultServerEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultClientEntry( registries, DN, AttributeType, upId )
      */
     @Test
-    public void testDefaultServerEntryRegistriesDNUpIdArray() throws Exception
+    public void testDefaultClientEntryRegistriesDNUpIdArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN, "  OBJECTCLASS  ", " Cn " );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, "  OBJECTCLASS  ", " Cn " );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 2, entry.size() );
@@ -240,7 +237,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
         EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -279,7 +276,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "userPassword", (byte[])null );
         assertEquals( 1, entry.size() );
@@ -323,7 +320,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringStringArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "cn", (String)null );
         assertEquals( 1, entry.size() );
@@ -367,7 +364,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringValueArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         Value<String> value = new StringValue( atCN, (String)null );
         
         entry.add( "cn", value );
@@ -420,7 +417,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( atPwd, BYTES1, BYTES2 );
         assertEquals( 1, entry.size() );
@@ -443,7 +440,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( atC, "us", "fr" );
         assertEquals( 1, entry.size() );
@@ -471,7 +468,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -517,7 +514,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "UserPassword", atPwd, BYTES1, BYTES2 );
         assertEquals( 1, entry.size() );
@@ -554,7 +551,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "DomainComponent", atDC, "test1", "test2" );
         assertEquals( 1, entry.size() );
@@ -589,7 +586,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -647,7 +644,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( atDC, "test1" );
@@ -696,7 +693,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -753,7 +750,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -858,7 +855,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( "DC", "test1" );
@@ -910,7 +907,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -967,7 +964,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1078,7 +1075,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( "dc", atDC, "test1" );
@@ -1127,7 +1124,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1184,7 +1181,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1295,7 +1292,7 @@ public class DefaultServerEntryTest
     @Test
     public void testClear() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
          
         assertEquals( 0, entry.size() );
         assertNull( entry.get( "ObjectClass" ) );
@@ -1319,7 +1316,7 @@ public class DefaultServerEntryTest
     @Test
     public void testClone() throws Exception
     {
-        Entry entry1 = new DefaultServerEntry( schemaManager );
+        Entry entry1 = new DefaultClientEntry( schemaManager );
         
         Entry entry2 = entry1.clone();
         
@@ -1356,7 +1353,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (AttributeType )null, BYTES1 ) );
         assertFalse( entry.contains( atPwd, BYTES1 ) );
@@ -1379,7 +1376,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (AttributeType )null, "test" ) );
         assertFalse( entry.contains( atCN, "test" ) );
@@ -1402,7 +1399,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeValuesArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -1437,7 +1434,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsEntryAttributeArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1467,7 +1464,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, BYTES3 ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1491,7 +1488,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringStringArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, "test" ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1515,7 +1512,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringValueArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, "test" ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1550,7 +1547,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeAttributeType() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( atOC ) );
         
@@ -1581,7 +1578,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeString() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -1610,8 +1607,8 @@ public class DefaultServerEntryTest
     @Test
     public void testEqualsObject() throws Exception
     {
-        Entry entry1 = new DefaultServerEntry( schemaManager );
-        Entry entry2 = new DefaultServerEntry( schemaManager );
+        Entry entry1 = new DefaultClientEntry( schemaManager );
+        Entry entry2 = new DefaultClientEntry( schemaManager );
         
         assertEquals( entry1, entry2 );
         
@@ -1658,7 +1655,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetAttributeTypes() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( 0, entry.getAttributeTypes().size() );
 
@@ -1686,7 +1683,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetAttributeType() throws Exception 
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         assertNull( entry.get( atCN ) );
         assertNull( entry.get( (AttributeType)null ) );
@@ -1713,7 +1710,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetString() throws Exception 
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         assertNull( entry.get( "cn" ) );
         assertNull( entry.get( "badId" ) );
@@ -1742,7 +1739,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetDn() throws LdapInvalidDnException 
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
          
         assertEquals( EXAMPLE_DN, entry.getDn() );
          
@@ -1759,8 +1756,8 @@ public class DefaultServerEntryTest
     @Test
     public void testHashCode() throws InvalidNameException, Exception
     {
-        Entry entry1 = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
-        Entry entry2 = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry1 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry2 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
@@ -1781,7 +1778,7 @@ public class DefaultServerEntryTest
 
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
-        Entry entry3 = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry3 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         entry3.add( attrOC, attrSN, attrCN, attrPWD );
 
         assertEquals( entry1.hashCode(), entry3.hashCode() );
@@ -1794,7 +1791,7 @@ public class DefaultServerEntryTest
     @Test
     public void testHasObjectClassEntryAttribute() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         
@@ -1823,7 +1820,7 @@ public class DefaultServerEntryTest
     @Test
     public void testHasObjectClassString() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         assertFalse( entry.hasObjectClass( "top" ) );
@@ -1877,7 +1874,7 @@ public class DefaultServerEntryTest
     @Test
     public void testIterator() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1918,7 +1915,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -1960,7 +1957,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2001,7 +1998,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2049,7 +2046,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
         EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -2099,7 +2096,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2174,7 +2171,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2248,7 +2245,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2329,7 +2326,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringByteArrayArray()
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2397,7 +2394,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringStringArray()
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2466,7 +2463,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringValueArray()
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2547,7 +2544,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutServerAttributeElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
 
         // first test a null SA addition. It should be allowed.
         try
@@ -2627,7 +2624,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test an empty AT
         entry.put( atDC, (String)null );
@@ -2683,7 +2680,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtByteElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test an empty AT
         entry.put( atPwd, (byte[])null );
@@ -2745,7 +2742,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtSVs() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Adding a null value to an attribute
         entry.put( atCN, (Value<?>)null );
@@ -2807,7 +2804,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIdStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Adding a null value should be possible
         entry.put( "dc", (String)null );
@@ -2868,7 +2865,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIdBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -2931,7 +2928,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -2994,7 +2991,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -3068,7 +3065,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtSVElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -3138,7 +3135,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDSVElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -3184,7 +3181,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
 
@@ -3213,7 +3210,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
 
@@ -3242,7 +3239,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atDC, "test1" );
         Value<String> strValue2 = new StringValue( atDC, "test2" );
@@ -3278,7 +3275,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveEntryAttribute() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3310,7 +3307,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributesAttributeTypeArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3338,7 +3335,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributesStringArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3369,7 +3366,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringByteArrayArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
 
@@ -3402,7 +3399,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringStringArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
 
@@ -3435,7 +3432,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringValueArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atDC, "test1" );
         Value<String> strValue2 = new StringValue( atDC, "test2" );
@@ -3471,7 +3468,7 @@ public class DefaultServerEntryTest
     @Test public void testRemoveUpIdElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -3530,7 +3527,7 @@ public class DefaultServerEntryTest
     @Test public void testSetATElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        Entry entry = new DefaultClientEntry( schemaManager, dn );
         
         List<EntryAttribute> result = null;
         
@@ -3609,7 +3606,7 @@ public class DefaultServerEntryTest
     @Test public void testSetUpID() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         List<EntryAttribute> result = null;
         
         // First check that this method fails if we pass a null or empty ID
@@ -3696,7 +3693,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetAttributeTypeArray() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1", "test2" );
@@ -3726,7 +3723,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetStringArray() throws Exception
     {
-        Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
 
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1", "test2" );
@@ -3756,7 +3753,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetDn()
     {
-        Entry entry = new DefaultServerEntry( schemaManager );
+        Entry entry = new DefaultClientEntry( schemaManager );
          
         assertEquals( DN.EMPTY_DN, entry.getDn() );
          
@@ -3771,7 +3768,7 @@ public class DefaultServerEntryTest
      @Test
      public void testSize() throws Exception
      {
-         ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+         Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
           
          assertEquals( 0, entry.size() );
          entry.add( "ObjectClass", schemaManager.lookupAttributeTypeRegistry( "ObjectClass" ), "top", "person" );
@@ -3786,12 +3783,12 @@ public class DefaultServerEntryTest
       
     
     /**
-     * Test a conversion from a ServerEntry to an BasicAttributes
+     * Test a conversion from a Entry to an BasicAttributes
      */
     @Test public void testToBasicAttributes() throws InvalidNameException, Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
         
         AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
         
@@ -3827,7 +3824,7 @@ public class DefaultServerEntryTest
     @Test
     public void testToString() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( "Entry\n    dn: dc=example,dc=com\n", entry.toString() );
         
@@ -3858,16 +3855,16 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test the copy constructor of a ServerEntry
+     * Test the copy constructor of a Entry
      */
     @Test 
     public void testCopyConstructorServerEntry() throws LdapException
     {
-        Entry serverEntry = new DefaultServerEntry( schemaManager );
+        Entry serverEntry = new DefaultClientEntry( schemaManager );
         serverEntry.add( "cn", "test1", "test2" );
         serverEntry.add( "objectClass", "top", "person" );
         
-        Entry copyEntry = new DefaultServerEntry( schemaManager, serverEntry );
+        Entry copyEntry = new DefaultClientEntry( schemaManager, serverEntry );
         
         assertEquals( copyEntry, serverEntry );
         assertTrue( copyEntry.contains( "objectClass", "top", "person" ) );
@@ -3892,9 +3889,9 @@ public class DefaultServerEntryTest
         clientEntry.add( "cn", "test1", "test2" );
         clientEntry.add( "objectClass", "top", "person" );
         
-        Entry copyEntry = new DefaultServerEntry( schemaManager, clientEntry );
+        Entry copyEntry = new DefaultClientEntry( schemaManager, clientEntry );
         
-        assertTrue( copyEntry instanceof ServerEntry );
+        assertTrue( copyEntry instanceof Entry );
         assertTrue( copyEntry.contains( "objectClass", "top", "person" ) );
         assertTrue( copyEntry.contains( "cn", "test1", "test2" ) );
         

Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Wed Apr 28 08:44:42 2010
@@ -45,8 +45,8 @@ 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.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -115,7 +115,7 @@ public class IntegrationUtils
             if ( entry.isChangeAdd() )
             {
                 service.getAdminSession().add( 
-                    new DefaultServerEntry( service.getSchemaManager(), entry.getEntry() ) );
+                    new DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) );
             }
             else if ( entry.isChangeModify() )
             {
@@ -213,7 +213,7 @@ public class IntegrationUtils
         {
             case( ChangeType.ADD_ORDINAL ):
                 session.add( 
-                    new DefaultServerEntry( service.getSchemaManager(), entry.getEntry() ) ); 
+                    new DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) ); 
                 break;
                 
             case( ChangeType.DELETE_ORDINAL ):

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Wed Apr 28 08:44:42 2010
@@ -36,11 +36,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 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.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -75,7 +75,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
 
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
@@ -100,7 +100,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
 
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
@@ -128,7 +128,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
         
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
         
         // Read the entry we just created using the akarasuluSession
         Entry readEntry = service.getAdminSession().lookup( akarasulu.getDn(), new String[]{ "userPassword"} );
@@ -170,7 +170,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
         
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Wed Apr 28 08:44:42 2010
@@ -38,8 +38,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.jndi.CoreContextFactory;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
-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.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,7 +67,7 @@ public class PartitionConfigurationIT ex
 
         DN suffixDn = new DN( "ou=removable" );
         suffixDn.normalize( service.getSchemaManager().getNormalizerMapping() );
-        ServerEntry ctxEntry = new DefaultServerEntry( service.getSchemaManager(), suffixDn );
+        Entry ctxEntry = new DefaultClientEntry( service.getSchemaManager(), suffixDn );
         ctxEntry.put( "objectClass", "top" );
         ctxEntry.get( "objectClass" ).add( "organizationalUnit" );
         ctxEntry.put( "ou", "removable" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Wed Apr 28 08:44:42 2010
@@ -34,7 +34,7 @@ import javax.naming.ldap.LdapContext;
 
 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.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,7 +57,7 @@ public class ListIT extends AbstractLdap
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
         HashSet<String> set = new HashSet<String>();
@@ -80,7 +80,7 @@ public class ListIT extends AbstractLdap
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
         HashSet<String> set = new HashSet<String>();
@@ -123,7 +123,7 @@ public class ListIT extends AbstractLdap
         HashSet<String> set = new HashSet<String>();
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
                 
 
         NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Wed Apr 28 08:44:42 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
 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.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,7 +67,7 @@ public class ModifyContextIT extends Abs
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Wed Apr 28 08:44:42 2010
@@ -42,7 +42,7 @@ import javax.naming.spi.DirStateFactory;
 
 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.util.ArrayUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -65,7 +65,7 @@ public class ObjStateFactoryIT extends A
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
 
         LdapContext sysRoot = getSystemContext( service );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Wed Apr 28 08:44:42 2010
@@ -53,8 +53,8 @@ import javax.naming.ldap.LdapContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.exception.LdapPartialResultException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.name.DN;
@@ -103,7 +103,7 @@ public class ReferralIT extends Abstract
 
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ), true ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ), true ); 
 
         // -------------------------------------------------------------------
         // Adds a referral entry regardless of referral handling settings
@@ -328,7 +328,7 @@ public class ReferralIT extends Abstract
         // encounter referral errors with referral setting set to throw.
         // -------------------------------------------------------------------
         DN userDN = new DN( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
-        ServerEntry userEntry = new DefaultServerEntry( service.getSchemaManager(), userDN );
+        Entry userEntry = new DefaultClientEntry( service.getSchemaManager(), userDN );
         
         userEntry.add(  "ObjectClass", "top", "person" );
         userEntry.add( "sn", "karasulu" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Wed Apr 28 08:44:42 2010
@@ -43,8 +43,8 @@ import org.apache.directory.server.core.
 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.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.LdapPartialResultException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -110,7 +110,7 @@ public class AddReferralIT extends Abstr
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -125,7 +125,7 @@ public class AddReferralIT extends Abstr
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Wed Apr 28 08:44:42 2010
@@ -45,8 +45,8 @@ import org.apache.directory.server.core.
 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.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.LdapPartialResultException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -112,7 +112,7 @@ public class CompareReferralIT extends A
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     /** The search controls used globally */
     SearchControls ctls;
@@ -130,7 +130,7 @@ public class CompareReferralIT extends A
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Wed Apr 28 08:44:42 2010
@@ -39,8 +39,8 @@ import org.apache.directory.server.core.
 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.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.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -106,7 +106,7 @@ public class DeleteReferralIT extends Ab
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -121,7 +121,7 @@ public class DeleteReferralIT extends Ab
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Wed Apr 28 08:44:42 2010
@@ -48,11 +48,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -118,7 +118,7 @@ public class ModifyReferralIT extends Ab
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -133,7 +133,7 @@ public class ModifyReferralIT extends Ab
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Wed Apr 28 08:44:42 2010
@@ -43,8 +43,8 @@ import org.apache.directory.server.core.
 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.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.LdapPartialResultException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -133,7 +133,7 @@ public class MoveAndRenameReferralIT ext
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -150,7 +150,7 @@ public class MoveAndRenameReferralIT ext
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Wed Apr 28 08:44:42 2010
@@ -42,8 +42,8 @@ import org.apache.directory.server.core.
 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.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.LdapPartialResultException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -124,7 +124,7 @@ public class MoveReferralIT extends Abst
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -141,7 +141,7 @@ public class MoveReferralIT extends Abst
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Wed Apr 28 08:44:42 2010
@@ -42,8 +42,8 @@ import org.apache.directory.server.core.
 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.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.LdapEntryAlreadyExistsException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
@@ -127,7 +127,7 @@ public class RenameReferralIT extends Ab
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -142,7 +142,7 @@ public class RenameReferralIT extends Ab
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -446,7 +446,7 @@ public class RenameReferralIT extends Ab
         RDN newRdn = new RDN( "ou=Groups" );
 
         // First check that the object exists
-        ServerEntry renamed = session.lookup( dnRoles );
+        Entry renamed = session.lookup( dnRoles );
         assertNotNull( renamed );
 
         // Also check that the new entry does not exist

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Wed Apr 28 08:44:42 2010
@@ -45,9 +45,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 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.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.LdapPartialResultException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -126,7 +125,7 @@ public class SearchReferralIT extends Ab
     
     /** The entries we are using to do the tests */
     Attributes userEntry;
-    ServerEntry serverEntry;
+    Entry serverEntry;
     
     @Before
     public void setUp() throws Exception
@@ -141,7 +140,7 @@ public class SearchReferralIT extends Ab
         
         // Core API entry
         DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultClientEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Wed Apr 28 08:44:42 2010
@@ -46,7 +46,7 @@ import javax.naming.ldap.LdapContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-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.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -265,7 +265,7 @@ public class OperationalAttributeService
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Wed Apr 28 08:44:42 2010
@@ -47,7 +47,7 @@ import javax.naming.ldap.LdapContext;
 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.exception.LdapOtherException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -176,13 +176,13 @@ public class SchemaServiceIT extends Abs
         
         // should be fine with unique OID
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getSchemaManager(), numberOfGunsAttrEntry.getEntry() ) ); 
+            new DefaultClientEntry( service.getSchemaManager(), numberOfGunsAttrEntry.getEntry() ) ); 
 
         // should blow chuncks using same OID
         try
         {
             service.getAdminSession().add( 
-                new DefaultServerEntry( service.getSchemaManager(), shipOCEntry.getEntry() ) ); 
+                new DefaultClientEntry( service.getSchemaManager(), shipOCEntry.getEntry() ) ); 
             
             fail( "Should not be possible to create two schema entities with the same OID." );
         }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Wed Apr 28 08:44:42 2010
@@ -61,7 +61,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-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.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
@@ -267,7 +267,7 @@ public class SubschemaSubentryIT extends
             assertNotNull( attrs );
             SchemaEntityFactory factory = new SchemaEntityFactory();
             
-            ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
+            Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
 
             SyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, serverEntry, service.getSchemaManager().getRegistries(), schemaName );
             assertEquals( oid, syntaxChecker.getOid() );
@@ -1412,7 +1412,7 @@ public class SubschemaSubentryIT extends
         assertNotNull( attrs );
         SchemaEntityFactory factory = new SchemaEntityFactory();
         
-        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
+        Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
         
         AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service.getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
@@ -1475,7 +1475,7 @@ public class SubschemaSubentryIT extends
         assertNotNull( attrs );
         SchemaEntityFactory factory = new SchemaEntityFactory();
         
-        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
+        Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
 
         AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service.getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java Wed Apr 28 08:44:42 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
-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.slf4j.Logger;
@@ -53,7 +53,7 @@ public class BackupUtilitiesSP
         LOG.info( "User \"" + session.getEffectivePrincipal() + "\" has deleted entry \"" + deletedEntry + "\"" );
         DN backupDn = new DN ( "ou=backupContext,ou=system" );
         String deletedEntryRdn = deletedEntry.getDn().get( deletedEntry.getDn().size() - 1 );
-        ServerEntry entry = ( ServerEntry ) deletedEntry.getOriginalEntry().clone();
+        Entry entry = ( Entry ) deletedEntry.getOriginalEntry().clone();
         backupDn.add( deletedEntryRdn );
         entry.setDn( backupDn );
         session.add( deletedEntry );

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.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.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -82,7 +82,7 @@ class JavaLdapSupport
      * @return the deserialized object
      * @throws NamingException if the object cannot be serialized
      */
-    static Object deserialize( ServerEntry serverEntry ) throws NamingException
+    static Object deserialize( Entry serverEntry ) throws NamingException
     {
         ObjectInputStream in = null;
         String className = null;
@@ -177,7 +177,7 @@ class JavaLdapSupport
      * @param obj the object to serialize
      * @throws NamingException if the object cannot be serialized
      */
-    static void serialize( ServerEntry entry, Object obj, SchemaManager schemaManager ) throws LdapException
+    static void serialize( Entry entry, Object obj, SchemaManager schemaManager ) throws LdapException
     {
         /* Let's add the object classes first:
          * objectClass: top



Mime
View raw message