directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938842 [1/4] - in /directory: apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/ma...
Date Wed, 28 Apr 2010 09:56:39 GMT
Author: elecharny
Date: Wed Apr 28 09:56:36 2010
New Revision: 938842

URL: http://svn.apache.org/viewvc?rev=938842&view=rev
Log:
Moved and renamed DefaultClientEntry to DefaultEntry

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java
      - copied, changed from r938820, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
Modified:
    directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
    directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
    directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
    directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
    directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
    directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java

Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Wed Apr 28 09:56:36 2010
@@ -45,13 +45,13 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 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.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.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -421,7 +421,7 @@ public class AvlStoreTest
         // add an alias and delete to test dropAliasIndices method
         DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "ou", "Apache" );
         entry.add( "commonName", "Jack Daniels" );
@@ -470,7 +470,7 @@ public class AvlStoreTest
         // dn id 12
         DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co." );
         martinDn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, martinDn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, martinDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Sales" );
         entry.add( "cn", "Martin King" );
@@ -495,7 +495,7 @@ public class AvlStoreTest
         // dn id 13
         DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co." );
         marketingDn.normalize( schemaManager.getNormalizerMapping() );
-        entry = new DefaultClientEntry( schemaManager, marketingDn );
+        entry = new DefaultEntry( schemaManager, marketingDn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Marketing" );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
@@ -505,7 +505,7 @@ public class AvlStoreTest
         // dn id 14
         DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
         jimmyDn.normalize( schemaManager.getNormalizerMapping() );
-        entry = new DefaultClientEntry( schemaManager, jimmyDn );
+        entry = new DefaultEntry( schemaManager, jimmyDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Marketing" );
         entry.add( "cn", "Jimmy Wales" );
@@ -562,7 +562,7 @@ public class AvlStoreTest
     {
         DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Not Present" );
         entry.add( "cn", "Martin King" );
@@ -575,7 +575,7 @@ public class AvlStoreTest
     {
         DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "ou", "Sales" );
         entry.add( "cn", "Martin King" );
         store.add( entry );
@@ -606,7 +606,7 @@ public class AvlStoreTest
     {
         DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
         entry.add( "cn", "Private Ryan" );
@@ -626,7 +626,7 @@ public class AvlStoreTest
     {
         DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
         entry.add( "cn", "Private Ryan" );
@@ -653,7 +653,7 @@ public class AvlStoreTest
     {
         DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         childDn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry childEntry = new DefaultClientEntry( schemaManager, childDn );
+        DefaultEntry childEntry = new DefaultEntry( schemaManager, childDn );
         childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
         childEntry.add( "ou", "Engineering" );
         childEntry.add( "cn", "Private Ryan" );
@@ -706,7 +706,7 @@ public class AvlStoreTest
         assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
 
         // testing the store.modify( dn, mod, entry ) API
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
         attribVal = "+1974045779";
         entry.add( "telephoneNumber", attribVal );
 
@@ -740,7 +740,7 @@ public class AvlStoreTest
         assertEquals( attribVal, lookedup.get( "sn" ).get().getString() );
 
         // testing the store.modify( dn, mod, entry ) API
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
         attribVal = "JWalker";
         entry.add( "sn", attribVal );
 
@@ -770,7 +770,7 @@ public class AvlStoreTest
         assertNull( lookedup.get( "sn" ) );
 
         // testing the store.modify( dn, mod, entry ) API
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
 
         // add an entry for the sake of testing the remove operation
         entry.add( "sn", "JWalker" );
@@ -787,7 +787,7 @@ public class AvlStoreTest
     {
         DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "cn", "Tim B" );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Wed Apr 28 09:56:36 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.GenericIndex;
 import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.junit.runner.Description;
@@ -243,7 +243,7 @@ public class DSAnnotationProcessor
     {
         if ( entry.isChangeAdd() )
         {
-            service.getAdminSession().add( new DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) );
+            service.getAdminSession().add( new DefaultEntry( service.getSchemaManager(), entry.getEntry() ) );
         }
         else if ( entry.isChangeModify() )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Wed Apr 28 09:56:36 2010
@@ -52,13 +52,13 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 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.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -188,7 +188,7 @@ public class LdapCoreSessionConnection i
 
         try
         {
-            Entry se = new DefaultClientEntry( sm, entry );
+            Entry se = new DefaultEntry( sm, entry );
 
             session.add( se );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Wed Apr 28 09:56:36 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
 import org.apache.directory.shared.ldap.name.DN;
@@ -93,7 +93,7 @@ public class AddOperationContext extends
     {
         super( session );
         entry = new ClonedServerEntry( 
-            new DefaultClientEntry( session.getDirectoryService().getSchemaManager(), addRequest.getEntry() ) );
+            new DefaultEntry( session.getDirectoryService().getSchemaManager(), addRequest.getEntry() ) );
         dn = addRequest.getEntry().getDn();
         requestControls = addRequest.getControls();
         

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Wed Apr 28 09:56:36 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -214,7 +214,7 @@ public class ServerEntryUtils
         {
             try 
             {
-                Entry entry = new DefaultClientEntry( schemaManager, dn );
+                Entry entry = new DefaultEntry( schemaManager, dn );
     
                 for ( NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMoreElements(); )
                 {

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=938842&r1=938841&r2=938842&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 09:56:36 2010
@@ -42,9 +42,9 @@ import javax.naming.directory.BasicAttri
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
-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.Value;
@@ -65,7 +65,7 @@ import org.junit.Test;
 
 
 /**
- * Test the DefaultClientEntry class.
+ * Test the DefaultEntry class.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -139,12 +139,12 @@ public class DefaultServerEntryTest
     // Test the Constructors
     //-------------------------------------------------------------------------
     /**
-     * Test for method DefaultClientEntry()
+     * Test for method DefaultEntry()
      */
     @Test
     public void testDefaultClientEntry() throws Exception
     {
-        Entry entry = new DefaultClientEntry();
+        Entry entry = new DefaultEntry();
         assertNotNull( entry );
         assertEquals( DN.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -152,12 +152,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultClientEntry( registries )
+     * Test for method DefaultEntry( registries )
      */
     @Test
     public void testDefaultClientEntryRegistries() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager );
+        Entry entry = new DefaultEntry( schemaManager );
         assertNotNull( entry );
         assertEquals( DN.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -165,12 +165,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultClientEntry( registries, DN )
+     * Test for method DefaultEntry( registries, DN )
      */
     @Test
     public void testDefaultClientEntryRegistriesDN() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
@@ -178,12 +178,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultClientEntry( registries, DN, AttributeType... )
+     * Test for method DefaultEntry( registries, DN, AttributeType... )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNAttributeTypeArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, atOC, atPwd, atCN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN, atOC, atPwd, atCN );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 3, entry.size() );
@@ -194,12 +194,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultClientEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultEntry( registries, DN, AttributeType, upId )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNAttributeTypeUpId() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, atOC, "  OBJECTCLASS  " );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN, atOC, "  OBJECTCLASS  " );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 1, entry.size() );
@@ -210,12 +210,12 @@ public class DefaultServerEntryTest
     
     
     /**
-     * Test for method DefaultClientEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultEntry( registries, DN, AttributeType, upId )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNUpIdArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN, "  OBJECTCLASS  ", " Cn " );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN, "  OBJECTCLASS  ", " Cn " );
         assertNotNull( entry );
         assertEquals( EXAMPLE_DN, entry.getDn() );
         assertEquals( 2, entry.size() );
@@ -237,7 +237,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
         EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -276,7 +276,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "userPassword", (byte[])null );
         assertEquals( 1, entry.size() );
@@ -320,7 +320,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "cn", (String)null );
         assertEquals( 1, entry.size() );
@@ -364,7 +364,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         Value<String> value = new StringValue( atCN, (String)null );
         
         entry.add( "cn", value );
@@ -417,7 +417,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( atPwd, BYTES1, BYTES2 );
         assertEquals( 1, entry.size() );
@@ -440,7 +440,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( atC, "us", "fr" );
         assertEquals( 1, entry.size() );
@@ -468,7 +468,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddAttributeTypeValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -514,7 +514,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "UserPassword", atPwd, BYTES1, BYTES2 );
         assertEquals( 1, entry.size() );
@@ -551,7 +551,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         entry.add( "DomainComponent", atDC, "test1", "test2" );
         assertEquals( 1, entry.size() );
@@ -586,7 +586,7 @@ public class DefaultServerEntryTest
     @Test
     public void testAddStringAttributeTypeValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -644,7 +644,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( atDC, "test1" );
@@ -693,7 +693,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -750,7 +750,7 @@ public class DefaultServerEntryTest
     @Test public void testAddAtServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -855,7 +855,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( "DC", "test1" );
@@ -907,7 +907,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -964,7 +964,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1075,7 +1075,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtStringElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test a simple addition
         entry.add( "dc", atDC, "test1" );
@@ -1124,7 +1124,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1181,7 +1181,7 @@ public class DefaultServerEntryTest
     @Test public void testAddUpIdAtServerValueElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -1292,7 +1292,7 @@ public class DefaultServerEntryTest
     @Test
     public void testClear() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
          
         assertEquals( 0, entry.size() );
         assertNull( entry.get( "ObjectClass" ) );
@@ -1316,7 +1316,7 @@ public class DefaultServerEntryTest
     @Test
     public void testClone() throws Exception
     {
-        Entry entry1 = new DefaultClientEntry( schemaManager );
+        Entry entry1 = new DefaultEntry( schemaManager );
         
         Entry entry2 = entry1.clone();
         
@@ -1353,7 +1353,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (AttributeType )null, BYTES1 ) );
         assertFalse( entry.contains( atPwd, BYTES1 ) );
@@ -1376,7 +1376,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (AttributeType )null, "test" ) );
         assertFalse( entry.contains( atCN, "test" ) );
@@ -1399,7 +1399,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeTypeValuesArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -1434,7 +1434,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsEntryAttributeArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1464,7 +1464,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, BYTES3 ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1488,7 +1488,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, "test" ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1512,7 +1512,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsStringValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.contains( (String)null, "test" ) );
         assertFalse( entry.containsAttribute( "objectClass" ) );
@@ -1547,7 +1547,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeAttributeType() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( atOC ) );
         
@@ -1578,7 +1578,7 @@ public class DefaultServerEntryTest
     @Test
     public void testContainsAttributeString() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
@@ -1607,8 +1607,8 @@ public class DefaultServerEntryTest
     @Test
     public void testEqualsObject() throws Exception
     {
-        Entry entry1 = new DefaultClientEntry( schemaManager );
-        Entry entry2 = new DefaultClientEntry( schemaManager );
+        Entry entry1 = new DefaultEntry( schemaManager );
+        Entry entry2 = new DefaultEntry( schemaManager );
         
         assertEquals( entry1, entry2 );
         
@@ -1655,7 +1655,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetAttributeTypes() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( 0, entry.getAttributeTypes().size() );
 
@@ -1683,7 +1683,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetAttributeType() throws Exception 
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         assertNull( entry.get( atCN ) );
         assertNull( entry.get( (AttributeType)null ) );
@@ -1710,7 +1710,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetString() throws Exception 
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         assertNull( entry.get( "cn" ) );
         assertNull( entry.get( "badId" ) );
@@ -1739,7 +1739,7 @@ public class DefaultServerEntryTest
     @Test
     public void testGetDn() throws LdapInvalidDnException 
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
          
         assertEquals( EXAMPLE_DN, entry.getDn() );
          
@@ -1756,8 +1756,8 @@ public class DefaultServerEntryTest
     @Test
     public void testHashCode() throws InvalidNameException, Exception
     {
-        Entry entry1 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
-        Entry entry2 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry1 = new DefaultEntry( schemaManager, EXAMPLE_DN );
+        Entry entry2 = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
@@ -1778,7 +1778,7 @@ public class DefaultServerEntryTest
 
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
-        Entry entry3 = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry3 = new DefaultEntry( schemaManager, EXAMPLE_DN );
         entry3.add( attrOC, attrSN, attrCN, attrPWD );
 
         assertEquals( entry1.hashCode(), entry3.hashCode() );
@@ -1791,7 +1791,7 @@ public class DefaultServerEntryTest
     @Test
     public void testHasObjectClassEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         
@@ -1820,7 +1820,7 @@ public class DefaultServerEntryTest
     @Test
     public void testHasObjectClassString() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         assertFalse( entry.hasObjectClass( "top" ) );
@@ -1874,7 +1874,7 @@ public class DefaultServerEntryTest
     @Test
     public void testIterator() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1915,7 +1915,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -1957,7 +1957,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -1998,7 +1998,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutAttributeTypeValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2046,7 +2046,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
         EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -2096,7 +2096,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2171,7 +2171,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2245,7 +2245,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringAttributeTypeValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2326,7 +2326,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringByteArrayArray()
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2394,7 +2394,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringStringArray()
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         try
         {
@@ -2463,7 +2463,7 @@ public class DefaultServerEntryTest
     @Test
     public void testPutStringValueArray()
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atCN, "test1" );
         Value<String> strValue2 = new StringValue( atCN, "test2" );
@@ -2544,7 +2544,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutServerAttributeElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // first test a null SA addition. It should be allowed.
         try
@@ -2624,7 +2624,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test an empty AT
         entry.put( atDC, (String)null );
@@ -2680,7 +2680,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtByteElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test an empty AT
         entry.put( atPwd, (byte[])null );
@@ -2742,7 +2742,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutAtSVs() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Adding a null value to an attribute
         entry.put( atCN, (Value<?>)null );
@@ -2804,7 +2804,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIdStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Adding a null value should be possible
         entry.put( "dc", (String)null );
@@ -2865,7 +2865,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIdBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -2928,7 +2928,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtStringElipsis() throws Exception
     {
         DN dn = new DN( "dc=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -2991,7 +2991,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtBytesElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -3065,7 +3065,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDAtSVElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -3135,7 +3135,7 @@ public class DefaultServerEntryTest
     @Test public void tesPutUpIDSVElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         // Test that we get an error when the ID or AT are null
         try
@@ -3181,7 +3181,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
 
@@ -3210,7 +3210,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
 
@@ -3239,7 +3239,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributeTypeValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atDC, "test1" );
         Value<String> strValue2 = new StringValue( atDC, "test2" );
@@ -3275,7 +3275,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveEntryAttribute() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3307,7 +3307,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributesAttributeTypeArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3335,7 +3335,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveAttributesStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -3366,7 +3366,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringByteArrayArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
 
@@ -3399,7 +3399,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
 
@@ -3432,7 +3432,7 @@ public class DefaultServerEntryTest
     @Test
     public void testRemoveStringValueArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         Value<String> strValue1 = new StringValue( atDC, "test1" );
         Value<String> strValue2 = new StringValue( atDC, "test2" );
@@ -3468,7 +3468,7 @@ public class DefaultServerEntryTest
     @Test public void testRemoveUpIdElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
         
@@ -3527,7 +3527,7 @@ public class DefaultServerEntryTest
     @Test public void testSetATElipsis() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        Entry entry = new DefaultClientEntry( schemaManager, dn );
+        Entry entry = new DefaultEntry( schemaManager, dn );
         
         List<EntryAttribute> result = null;
         
@@ -3606,7 +3606,7 @@ public class DefaultServerEntryTest
     @Test public void testSetUpID() throws Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         List<EntryAttribute> result = null;
         
         // First check that this method fails if we pass a null or empty ID
@@ -3693,7 +3693,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetAttributeTypeArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1", "test2" );
@@ -3723,7 +3723,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetStringArray() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1", "test2" );
@@ -3753,7 +3753,7 @@ public class DefaultServerEntryTest
     @Test
     public void testSetDn()
     {
-        Entry entry = new DefaultClientEntry( schemaManager );
+        Entry entry = new DefaultEntry( schemaManager );
          
         assertEquals( DN.EMPTY_DN, entry.getDn() );
          
@@ -3768,7 +3768,7 @@ public class DefaultServerEntryTest
      @Test
      public void testSize() throws Exception
      {
-         Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+         Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
           
          assertEquals( 0, entry.size() );
          entry.add( "ObjectClass", schemaManager.lookupAttributeTypeRegistry( "ObjectClass" ), "top", "person" );
@@ -3788,7 +3788,7 @@ public class DefaultServerEntryTest
     @Test public void testToBasicAttributes() throws InvalidNameException, Exception
     {
         DN dn = new DN( "cn=test" );
-        DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
+        DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         
         AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
         
@@ -3824,7 +3824,7 @@ public class DefaultServerEntryTest
     @Test
     public void testToString() throws Exception
     {
-        Entry entry = new DefaultClientEntry( schemaManager, EXAMPLE_DN );
+        Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
         
         assertEquals( "Entry\n    dn: dc=example,dc=com\n", entry.toString() );
         
@@ -3860,11 +3860,11 @@ public class DefaultServerEntryTest
     @Test 
     public void testCopyConstructorServerEntry() throws LdapException
     {
-        Entry serverEntry = new DefaultClientEntry( schemaManager );
+        Entry serverEntry = new DefaultEntry( schemaManager );
         serverEntry.add( "cn", "test1", "test2" );
         serverEntry.add( "objectClass", "top", "person" );
         
-        Entry copyEntry = new DefaultClientEntry( schemaManager, serverEntry );
+        Entry copyEntry = new DefaultEntry( schemaManager, serverEntry );
         
         assertEquals( copyEntry, serverEntry );
         assertTrue( copyEntry.contains( "objectClass", "top", "person" ) );
@@ -3884,12 +3884,12 @@ public class DefaultServerEntryTest
     @Test 
     public void testCopyConstructorClientEntry() throws LdapException
     {
-        Entry clientEntry = new DefaultClientEntry();
+        Entry clientEntry = new DefaultEntry();
         clientEntry.setDn( new DN( "ou=system" ) );
         clientEntry.add( "cn", "test1", "test2" );
         clientEntry.add( "objectClass", "top", "person" );
         
-        Entry copyEntry = new DefaultClientEntry( schemaManager, clientEntry );
+        Entry copyEntry = new DefaultEntry( schemaManager, clientEntry );
         
         assertTrue( copyEntry instanceof Entry );
         assertTrue( copyEntry.contains( "objectClass", "top", "person" ) );

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=938842&r1=938841&r2=938842&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 09:56:36 2010
@@ -44,9 +44,9 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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 DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) );
+                    new DefaultEntry( service.getSchemaManager(), entry.getEntry() ) );
             }
             else if ( entry.isChangeModify() )
             {
@@ -213,7 +213,7 @@ public class IntegrationUtils
         {
             case( ChangeType.ADD_ORDINAL ):
                 session.add( 
-                    new DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) ); 
+                    new DefaultEntry( service.getSchemaManager(), entry.getEntry() ) ); 
                 break;
                 
             case( ChangeType.DELETE_ORDINAL ):

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -34,8 +34,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -90,7 +90,7 @@ public class AddAuthorizationIT extends 
             DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
             LdapConnection connection = getConnectionAs( userName, password );
 
-            Entry entry = new DefaultClientEntry( new DN( "ou=testou,ou=system" ) );
+            Entry entry = new DefaultEntry( new DN( "ou=testou,ou=system" ) );
             entry.add( SchemaConstants.OU_AT, "testou" );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
             

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=938842&r1=938841&r2=938842&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 09:56:36 2010
@@ -34,13 +34,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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 DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
@@ -100,7 +100,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
 
         service.getAdminSession().add( 
-            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
@@ -128,7 +128,7 @@ public class AuthorizationServiceAsNonAd
         LdifEntry akarasulu = getUserAddLdif();
         
         service.getAdminSession().add( 
-            new DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultEntry( 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 DefaultClientEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Wed Apr 28 09:56:36 2010
@@ -38,9 +38,9 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -136,7 +136,7 @@ public class AutzIntegUtils
     public static DN createGroup( String cn, String firstMemberDn ) throws Exception
     {
         DN groupDN = new DN( "cn=" + cn + ",ou=groups,ou=system" );
-        Entry entry = new DefaultClientEntry( groupDN );
+        Entry entry = new DefaultEntry( groupDN );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "groupOfUniqueNames" );
         entry.add( SchemaConstants.UNIQUE_MEMBER_AT, firstMemberDn );
         entry.add( SchemaConstants.CN_AT, cn );
@@ -173,7 +173,7 @@ public class AutzIntegUtils
     {
         LdapConnection connection = getAdminConnection();
 
-        Entry entry = new DefaultClientEntry( new DN( "uid=" + uid + ",ou=users,ou=system" ) );
+        Entry entry = new DefaultEntry( new DN( "uid=" + uid + ",ou=users,ou=system" ) );
         entry.add( SchemaConstants.UID_AT, uid );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "person", "organizationalPerson", "inetOrgPerson" );
         entry.add( SchemaConstants.SN_AT, uid );
@@ -199,7 +199,7 @@ public class AutzIntegUtils
     {
         DN groupDN = new DN( "cn=" + groupName + ",ou=groups,ou=system" );
 
-        Entry entry = new DefaultClientEntry( groupDN );
+        Entry entry = new DefaultEntry( groupDN );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "groupOfUniqueNames" );
         // TODO might be ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
         entry.add( SchemaConstants.UNIQUE_MEMBER_AT, "uid=admin, ou=system" );
@@ -331,7 +331,7 @@ public class AutzIntegUtils
         }
 
         // now add the A/C subentry below ou=system
-        Entry subEntry = new DefaultClientEntry( new DN( "cn=" + cn + "," + ServerDNConstants.SYSTEM_DN ) );
+        Entry subEntry = new DefaultEntry( new DN( "cn=" + cn + "," + ServerDNConstants.SYSTEM_DN ) );
         subEntry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC,
             SchemaConstants.ACCESS_CONTROL_SUBENTRY_OC );
         subEntry.add( SchemaConstants.SUBTREE_SPECIFICATION_AT, subtree );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -35,8 +35,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -96,7 +96,7 @@ public class CompareAuthorizationIT exte
         boolean result = true;
         
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -276,7 +276,7 @@ public class CompareAuthorizationIT exte
         LdapConnection adminCtx = getAdminConnection();
 
         DN userDN = new DN( "uid=bob,ou=users,ou=system" );
-        Entry user = new DefaultClientEntry( userDN );
+        Entry user = new DefaultEntry( userDN );
         user.add( SchemaConstants.UID_AT, "bob" );
         user.add( SchemaConstants.USER_PASSWORD_AT, "bobspassword" );
         user.add( SchemaConstants.OBJECT_CLASS_AT, "person", "organizationalPerson", "inetOrgPerson" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -33,8 +33,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -91,7 +91,7 @@ public class DeleteAuthorizationIT exten
         DN entryDN = new DN( entryRdn + ",ou=system" );
         
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -38,13 +38,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -102,7 +102,7 @@ public class ModifyAuthorizationIT exten
         boolean result;
         
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -163,7 +163,7 @@ public class ModifyAuthorizationIT exten
         boolean result;
 
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -36,8 +36,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -75,7 +75,7 @@ public class MoveRenameAuthorizationIT e
         DN entryDN = new DN( entryRdn + ",ou=system" );
         boolean result;
         
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         
@@ -126,7 +126,7 @@ public class MoveRenameAuthorizationIT e
         DN entryDN = new DN( entryRdn + ",ou=system" );
         boolean result;
         
-        Entry testEntry = new DefaultClientEntry( entryDN );
+        Entry testEntry = new DefaultEntry( entryDN );
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=938842&r1=938841&r2=938842&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Wed Apr 28 09:56:36 2010
@@ -46,8 +46,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
@@ -101,12 +101,12 @@ public class SearchAuthorizationIT exten
      */
     private Entry[] getTestNodes( final int count )
     {
-        Entry[] attributes = new DefaultClientEntry[count];
+        Entry[] attributes = new DefaultEntry[count];
         for ( int ii = 0; ii < count; ii++ )
         {
             try
             {
-                attributes[ii] = new DefaultClientEntry();
+                attributes[ii] = new DefaultEntry();
                 attributes[ii].add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
                 attributes[ii].add( SchemaConstants.OU_AT, String.valueOf( ii ) );
                 attributes[ii].add( SchemaConstants.OU_AT, "testEntry" );
@@ -845,7 +845,7 @@ public class SearchAuthorizationIT exten
         createUser( "billyd", "billyd" );
 
         // create an entry subordinate to the user
-        Entry phoneBook = new DefaultClientEntry( new DN( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) );
+        Entry phoneBook = new DefaultEntry( new DN( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) );
         phoneBook.add( SchemaConstants.OU_AT, "phoneBook" );
         phoneBook.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
 



Mime
View raw message