directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r937653 [1/2] - in /directory: apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apac...
Date Sat, 24 Apr 2010 17:18:09 GMT
Author: elecharny
Date: Sat Apr 24 17:18:08 2010
New Revision: 937653

URL: http://svn.apache.org/viewvc?rev=937653&view=rev
Log:
Moved and renamed the ClientModification to DefaultModification

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultModification.java
      - copied, changed from r937645, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientModification.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientModification.java
Modified:
    directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.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/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.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/ServerModificationTest.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/ModifyAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.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/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
    directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
    directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientModificationTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 2010
@@ -47,13 +47,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.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.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -608,7 +608,7 @@ public class AvlStoreTest
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
         attrib.add( "Engineering" );
 
-        Modification add = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
 
         mods.add( add );
 
@@ -712,7 +712,7 @@ public class AvlStoreTest
         String attribVal = "Walker";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -744,7 +744,7 @@ public class AvlStoreTest
         String attribVal = "Johnny";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -774,7 +774,7 @@ public class AvlStoreTest
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
-        Modification add = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -817,7 +817,7 @@ public class AvlStoreTest
         String attribVal = "Marketing";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );

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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 2010
@@ -52,6 +52,7 @@ 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.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -59,7 +60,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -555,7 +555,7 @@ public class LdapCoreSessionConnection i
             Iterator<EntryAttribute> itr = entry.iterator();
             while ( itr.hasNext() )
             {
-                mods.add( new ClientModification( modOp, itr.next() ) );
+                mods.add( new DefaultModification( modOp, itr.next() ) );
             }
             session.modify( entry.getDn(), mods );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Sat Apr 24 17:18:08 2010
@@ -30,11 +30,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.entry.ServerEntryUtils;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+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.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -84,7 +84,7 @@ public class ModifyOperationContext exte
         super( session, modifyRequest.getName() );
         
         modItems = ServerEntryUtils.toServerModification( 
-            modifyRequest.getModificationItems().toArray( new ClientModification[0] ), 
+            modifyRequest.getModificationItems().toArray( new DefaultModification[0] ), 
             session.getDirectoryService().getSchemaManager() );
         
         requestControls = modifyRequest.getControls();
@@ -125,7 +125,7 @@ public class ModifyOperationContext exte
         
         for ( EntryAttribute attribute:serverEntry )
         {
-            items.add( new ClientModification( modOp, attribute ) );
+            items.add( new DefaultModification( modOp, attribute ) );
         }
 
         return items;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sat Apr 24 17:18:08 2010
@@ -50,11 +50,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.CascadeControl;
 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.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -466,11 +466,11 @@ public final class SchemaPartition exten
 
         List<Modification> mods = new ArrayList<Modification>( 2 );
 
-        mods.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
             ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT, schemaManager
                 .lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT ), modifyTimestamp ) ) );
 
-        mods.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
             ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, schemaManager
                 .lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT ), modifiersName ) ) );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Sat Apr 24 17:18:08 2010
@@ -39,13 +39,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.StringValue;
 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.client.ClientModification;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -590,14 +590,14 @@ public class SchemaPartitionDaoImpl impl
             return;
         }
 
-        mods.add( new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute(
+        mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute(
             MetaSchemaConstants.M_DISABLED_AT, schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_DISABLED_AT ) ) ) );
 
-        mods.add( new ClientModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+        mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
             SchemaConstants.MODIFIERS_NAME_AT, schemaManager.lookupAttributeTypeRegistry( SchemaConstants.MODIFIERS_NAME_AT ),
             ServerDNConstants.ADMIN_SYSTEM_DN ) ) );
 
-        mods.add( new ClientModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+        mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
             SchemaConstants.MODIFY_TIMESTAMP_AT, schemaManager.lookupAttributeTypeRegistry( SchemaConstants.MODIFY_TIMESTAMP_AT ), DateUtils
                 .getGeneralizedTime() ) ) );
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Sat Apr 24 17:18:08 2010
@@ -34,13 +34,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 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.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.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
@@ -528,21 +528,21 @@ public class SchemaSynchronizer implemen
         
         // The m-disabled AT
         EntryAttribute disabledAttr = new DefaultEntryAttribute( disabledAT, "FALSE" );
-        Modification disabledMod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, disabledAttr );
+        Modification disabledMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, disabledAttr );
         
         modifications.add( disabledMod );
         
         // The modifiersName AT
         EntryAttribute modifiersNameAttr = 
             new DefaultEntryAttribute( modifiersNameAT, session.getEffectivePrincipal().getName() );
-        Modification modifiersNameMod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, modifiersNameAttr );
+        Modification modifiersNameMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, modifiersNameAttr );
         
         modifications.add( modifiersNameMod );
         
         // The modifyTimestamp AT
         EntryAttribute modifyTimestampAttr = 
             new DefaultEntryAttribute( modifyTimestampAT, DateUtils.getGeneralizedTime() );
-        Modification modifyTimestampMod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, modifyTimestampAttr );
+        Modification modifyTimestampMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, modifyTimestampAttr );
         
         modifications.add( modifyTimestampMod );
         
@@ -634,7 +634,7 @@ public class SchemaSynchronizer implemen
                 
                 EntryAttribute disable = new DefaultEntryAttribute( disabledAT, "TRUE"  );
                 Modification modification = 
-                    new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, disable );
+                    new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, disable );
                 
                 //session.modify( dn, mods, ignoreReferral, log )
             }

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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 2010
@@ -37,6 +37,7 @@ import javax.naming.directory.SearchResu
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -44,7 +45,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -391,7 +391,7 @@ public class ServerEntryUtils
                 
         }
         
-        Modification modification = new ClientModification( 
+        Modification modification = new DefaultModification( 
             operation,
             ServerEntryUtils.toServerAttribute( modificationImpl.getAttribute(), attributeType ) ); 
         
@@ -440,7 +440,7 @@ public class ServerEntryUtils
      */
     private static Modification toServerModification( Modification modification, AttributeType attributeType ) 
     {
-        Modification serverModification = new ClientModification( 
+        Modification serverModification = new DefaultModification( 
             modification.getOperation(),
             new DefaultEntryAttribute( attributeType, modification.getAttribute() ) ); 
         

Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java Sat Apr 24 17:18:08 2010
@@ -34,11 +34,11 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -52,7 +52,7 @@ import org.junit.Test;
 
 
 /**
- * Test the ClientModification class
+ * Test the DefaultModification class
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -68,9 +68,9 @@ public class ServerModificationTest
     
     
     /**
-     * Serialize a ClientModification
+     * Serialize a DefaultModification
      */
-    private ByteArrayOutputStream serializeValue( ClientModification value ) throws IOException
+    private ByteArrayOutputStream serializeValue( DefaultModification value ) throws IOException
     {
         ObjectOutputStream oOut = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -106,9 +106,9 @@ public class ServerModificationTest
     
     
     /**
-     * Deserialize a ClientModification
+     * Deserialize a DefaultModification
      */
-    private ClientModification deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException, LdapException
+    private DefaultModification deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException, LdapException
     {
         ObjectInputStream oIn = null;
         ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
@@ -117,7 +117,7 @@ public class ServerModificationTest
         {
             oIn = new ObjectInputStream( in );
 
-            ClientModification value = new ClientModification();
+            DefaultModification value = new DefaultModification();
             value.deserialize( oIn, schemaManager );
 
             return value;
@@ -183,7 +183,7 @@ public class ServerModificationTest
         EntryAttribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
         
-        Modification mod = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
+        Modification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
         Modification clone = mod.clone();
         
         attribute.remove( "test2" );
@@ -200,7 +200,7 @@ public class ServerModificationTest
     
     
     /**
-     * Test the copy constructor with a ClientModification
+     * Test the copy constructor with a DefaultModification
      *
      */
     @Test
@@ -208,11 +208,11 @@ public class ServerModificationTest
     {
         EntryAttribute attribute = new DefaultEntryAttribute( atC );
         attribute.add( "test1", "test2" );
-        Modification serverModification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
+        Modification serverModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
         
-        Modification copy = new ClientModification( schemaManager, serverModification );
+        Modification copy = new DefaultModification( schemaManager, serverModification );
         
-        assertTrue( copy instanceof ClientModification );
+        assertTrue( copy instanceof DefaultModification );
         assertEquals( copy, serverModification );
         
         serverModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
@@ -225,7 +225,7 @@ public class ServerModificationTest
     
     
     /**
-     * Test the copy constructor with a ClientModification
+     * Test the copy constructor with a DefaultModification
      *
      */
     @Test
@@ -233,12 +233,12 @@ public class ServerModificationTest
     {
         EntryAttribute attribute = new DefaultEntryAttribute( atC.getName() );
         attribute.add( "test1", "test2" );
-        Modification clientModification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
+        Modification clientModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
         
-        Modification copy = new ClientModification( schemaManager, clientModification );
+        Modification copy = new DefaultModification( schemaManager, clientModification );
         
-        assertTrue( copy instanceof ClientModification );
-        assertTrue( copy instanceof ClientModification );
+        assertTrue( copy instanceof DefaultModification );
+        assertTrue( copy instanceof DefaultModification );
         assertFalse( copy.equals(  clientModification ) );
         assertTrue( copy.getAttribute() instanceof EntryAttribute );
         assertEquals( atC, copy.getAttribute().getAttributeType() );
@@ -260,7 +260,7 @@ public class ServerModificationTest
         EntryAttribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
         
-        ClientModification mod = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
+        DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
         
         Modification modSer = deserializeValue( serializeValue( mod ) );
         
@@ -274,7 +274,7 @@ public class ServerModificationTest
         EntryAttribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
         
-        ClientModification mod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
+        DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
         
         Modification modSer = deserializeValue( serializeValue( mod ) );
         
@@ -288,7 +288,7 @@ public class ServerModificationTest
         EntryAttribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
         
-        ClientModification mod = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
+        DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
         
         Modification modSer = deserializeValue( serializeValue( mod ) );
         
@@ -299,13 +299,13 @@ public class ServerModificationTest
     @Test
     public void testSerializationModificationNoAttribute() throws ClassNotFoundException, IOException, LdapException
     {
-        Modification mod = new ClientModification();
+        Modification mod = new DefaultModification();
         
         mod.setOperation( ModificationOperation.ADD_ATTRIBUTE );
         
         try
         {
-            deserializeValue( serializeValue( (ClientModification)mod ) );
+            deserializeValue( serializeValue( (DefaultModification)mod ) );
             fail();
         }
         catch ( IOException ioe )

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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 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.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.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -139,7 +139,7 @@ public class AuthorizationServiceAsNonAd
 
         List<Modification> mods = new ArrayList<Modification>();
         
-        Modification mod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
+        Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
         mods.add( mod );
       
         DN userDn = new DN( "uid=akarasulu,ou=users,ou=system" );

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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 2010
@@ -38,12 +38,12 @@ 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.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.ClientModification;
 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;
@@ -239,7 +239,7 @@ public class ModifyAuthorizationIT exten
         for ( int i = 0; i < attrs.length; i++ )
         {
             EntryAttribute ea = attrs[i];
-            mods[i] = new ClientModification( modOp, ea );
+            mods[i] = new DefaultModification( modOp, ea );
         }
 
         return mods;

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=937653&r1=937652&r2=937653&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 Sat Apr 24 17:18:08 2010
@@ -46,13 +46,13 @@ 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.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.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -241,7 +241,7 @@ public class ModifyReferralIT extends Ab
         try
         {
             EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
-            Modification mod = new ClientModification(
+            Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
             
@@ -269,7 +269,7 @@ public class ModifyReferralIT extends Ab
         try
         {
             EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
-            Modification mod = new ClientModification(
+            Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
             
@@ -377,7 +377,7 @@ public class ModifyReferralIT extends Ab
         try
         {
             EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
-            Modification mod = new ClientModification(
+            Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
             
@@ -416,7 +416,7 @@ public class ModifyReferralIT extends Ab
         CoreSession session = service.getAdminSession();
         
         EntryAttribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, attr );
         List<Modification> mods = new ArrayList<Modification>();
         

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Sat Apr 24 17:18:08 2010
@@ -46,11 +46,11 @@ 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.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -513,7 +513,7 @@ public class MockCoreSession implements 
         
         for ( Modification mod:mods )
         {
-            serverModifications.add( new ClientModification( directoryService.getSchemaManager(), mod ) );
+            serverModifications.add( new DefaultModification( directoryService.getSchemaManager(), mod ) );
         }
         
         ModifyOperationContext opContext = new ModifyOperationContext( this, dn, serverModifications );
@@ -548,7 +548,7 @@ public class MockCoreSession implements 
         
         for ( Modification mod:mods )
         {
-            serverModifications.add( new ClientModification( directoryService.getSchemaManager(), mod ) );
+            serverModifications.add( new DefaultModification( directoryService.getSchemaManager(), mod ) );
         }
 
         ModifyOperationContext opContext = new ModifyOperationContext( this, dn, serverModifications );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Sat Apr 24 17:18:08 2010
@@ -46,11 +46,11 @@ 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.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -513,7 +513,7 @@ public class DefaultCoreSession implemen
         
         for ( Modification mod:mods )
         {
-            serverModifications.add( new ClientModification( directoryService.getSchemaManager(), mod ) );
+            serverModifications.add( new DefaultModification( directoryService.getSchemaManager(), mod ) );
         }
         
         ModifyOperationContext opContext = new ModifyOperationContext( this, dn, serverModifications );
@@ -548,7 +548,7 @@ public class DefaultCoreSession implemen
         
         for ( Modification mod:mods )
         {
-            serverModifications.add( new ClientModification( directoryService.getSchemaManager(), mod ) );
+            serverModifications.add( new DefaultModification( directoryService.getSchemaManager(), mod ) );
         }
 
         ModifyOperationContext opContext = new ModifyOperationContext( this, dn, serverModifications );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sat Apr 24 17:18:08 2010
@@ -46,6 +46,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -53,7 +54,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.AVA;
@@ -275,7 +275,7 @@ public class OperationalAttributeInterce
             MODIFIERS_NAME_ATTRIBUTE_TYPE, 
             getPrincipal().getName());
 
-        Modification modifiersName = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
+        Modification modifiersName = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
 
         mods.add( modifiersName );
         
@@ -284,7 +284,7 @@ public class OperationalAttributeInterce
             MODIFY_TIMESTAMP_ATTRIBUTE_TYPE,
             DateUtils.getGeneralizedTime() );
         
-        Modification timestamp = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
+        Modification timestamp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
 
         mods.add( timestamp );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sat Apr 24 17:18:08 2010
@@ -34,12 +34,12 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.i18n.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.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.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -273,7 +273,7 @@ public class ServerSystemPreferences ext
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
             EntryAttribute attr = new DefaultEntryAttribute( at );
-            Modification mi = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
+            Modification mi = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
             addDelta( mi );
         }
         catch ( LdapException e )
@@ -347,7 +347,7 @@ public class ServerSystemPreferences ext
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
             EntryAttribute attr = new DefaultEntryAttribute( at, value );
-            Modification mi = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
+            Modification mi = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
             addDelta( mi );
         }
         catch ( LdapException e )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat Apr 24 17:18:08 2010
@@ -55,6 +55,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -63,7 +64,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
@@ -1390,7 +1390,7 @@ public class SchemaInterceptor extends B
             
             for ( Modification mod:mods )
             {
-                AttributeType at = ( (ClientModification)mod).getAttribute().getAttributeType();
+                AttributeType at = ( (DefaultModification)mod).getAttribute().getAttributeType();
                 
                 if ( !MODIFIERS_NAME_ATTRIBUTE_TYPE.equals( at ) && !MODIFY_TIMESTAMP_ATTRIBUTE_TYPE.equals( at ) ) 
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sat Apr 24 17:18:08 2010
@@ -55,6 +55,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 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.StringValue;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
@@ -63,7 +64,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -728,7 +728,7 @@ public class SubentryInterceptor extends
                             op = ModificationOperation.REMOVE_ATTRIBUTE;
                         }
 
-                        modList.add( new ClientModification( op, opAttr ) );
+                        modList.add( new DefaultModification( op, opAttr ) );
                     }
                 }
             }
@@ -741,7 +741,7 @@ public class SubentryInterceptor extends
                     EntryAttribute opAttr = new DefaultEntryAttribute( aSUBENTRY_OPATTRS, schemaManager
                         .lookupAttributeTypeRegistry( aSUBENTRY_OPATTRS ) );
                     opAttr.add( subentryDn );
-                    modList.add( new ClientModification( op, opAttr ) );
+                    modList.add( new DefaultModification( op, opAttr ) );
                 }
             }
         }
@@ -1168,7 +1168,7 @@ public class SubentryInterceptor extends
                 operational.add( newName.toString() );
             }
 
-            modList.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
+            modList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
         }
 
         if ( subentry.isSchemaSubentry() )
@@ -1187,7 +1187,7 @@ public class SubentryInterceptor extends
                 operational.add( newName.toString() );
             }
 
-            modList.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
+            modList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
         }
 
         if ( subentry.isCollectiveSubentry() )
@@ -1206,7 +1206,7 @@ public class SubentryInterceptor extends
                 operational.add( newName.toString() );
             }
 
-            modList.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
+            modList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
         }
 
         if ( subentry.isTriggerSubentry() )
@@ -1225,7 +1225,7 @@ public class SubentryInterceptor extends
                 operational.add( newName.toString() );
             }
 
-            modList.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
+            modList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, operational ) );
         }
 
         return modList;
@@ -1320,7 +1320,7 @@ public class SubentryInterceptor extends
             {
                 AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( opAttrId );
                 EntryAttribute attr = new DefaultEntryAttribute( opAttrId, attributeType, dn );
-                modList.add( new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) );
+                modList.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) );
             }
         }
 
@@ -1372,7 +1372,7 @@ public class SubentryInterceptor extends
                 op = ModificationOperation.ADD_ATTRIBUTE;
             }
 
-            modList.add( new ClientModification( op, result ) );
+            modList.add( new DefaultModification( op, result ) );
         }
 
         return modList;
@@ -1480,7 +1480,7 @@ public class SubentryInterceptor extends
                             op = ModificationOperation.REMOVE_ATTRIBUTE;
                         }
 
-                        modList.add( new ClientModification( op, opAttr ) );
+                        modList.add( new DefaultModification( op, opAttr ) );
                     }
                 }
             }
@@ -1493,7 +1493,7 @@ public class SubentryInterceptor extends
                     AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute );
                     EntryAttribute opAttr = new DefaultEntryAttribute( attribute, type );
                     opAttr.add( subentryDn );
-                    modList.add( new ClientModification( op, opAttr ) );
+                    modList.add( new DefaultModification( op, opAttr ) );
                 }
             }
         }

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sat Apr 24 17:18:08 2010
@@ -61,6 +61,7 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -68,7 +69,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -373,14 +373,14 @@ public class KeyDerivationInterceptor ex
 
         // Add our modification items.
         newModsList.add( 
-            new ClientModification( 
+            new DefaultModification( 
                 ModificationOperation.REPLACE_ATTRIBUTE, 
                 new DefaultEntryAttribute(
                     KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, 
                     schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ),
                     principalName ) ) );
         newModsList.add( 
-            new ClientModification( 
+            new DefaultModification( 
                 ModificationOperation.REPLACE_ATTRIBUTE, 
                 new DefaultEntryAttribute(
                     KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT, 
@@ -389,7 +389,7 @@ public class KeyDerivationInterceptor ex
         
         EntryAttribute attribute = getKeyAttribute( modContext.getSession()
             .getDirectoryService().getSchemaManager(), keys );
-        newModsList.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute ) );
+        newModsList.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute ) );
 
         modContext.setModItems( newModsList );
     }

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sat Apr 24 17:18:08 2010
@@ -48,13 +48,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.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.client.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -662,7 +662,7 @@ public class JdbmStoreTest
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
         attrib.add( "Engineering" );
 
-        Modification add = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
 
         mods.add( add );
 
@@ -766,7 +766,7 @@ public class JdbmStoreTest
         String attribVal = "Walker";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -798,7 +798,7 @@ public class JdbmStoreTest
         String attribVal = "Johnny";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -828,7 +828,7 @@ public class JdbmStoreTest
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
-        Modification add = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );
@@ -871,7 +871,7 @@ public class JdbmStoreTest
         String attribVal = "Marketing";
         attrib.add( attribVal );
 
-        Modification add = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
+        Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
         mods.add( add );
 
         ServerEntry lookedup = store.lookup( store.getEntryId( dn.getNormName() ) );

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Sat Apr 24 17:18:08 2010
@@ -29,12 +29,12 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
 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.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.client.ClientModification;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -82,11 +82,11 @@ public class ChangePassword implements D
         
         EntryAttribute newPasswordAttribute = new DefaultEntryAttribute( 
             schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), StringTools.getBytesUtf8( newPassword ) );
-        mods.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) );
+        mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) );
         
         EntryAttribute principalAttribute = new DefaultEntryAttribute( 
             schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() );
-        mods.add( new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) );
+        mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) );
         
         //FIXME check if keyderivation is necessary
         

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java Sat Apr 24 17:18:08 2010
@@ -25,11 +25,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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.ClientModification;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -182,7 +182,7 @@ public class ModifyRequest extends Abstr
 
     public void addModification( EntryAttribute attr, ModificationOperation modOp )
     {
-        mods.add( new ClientModification( modOp, attr ) );
+        mods.add( new DefaultModification( modOp, attr ) );
     }
 
 

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Sat Apr 24 17:18:08 2010
@@ -29,6 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -36,7 +37,6 @@ import org.apache.directory.shared.ldap.
 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.ClientModification;
 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;
@@ -196,7 +196,7 @@ public class LdifEntry implements Clonea
     {
         if ( changeType == ChangeType.Modify )
         {
-            Modification item = new ClientModification( modOp, attr );
+            Modification item = new DefaultModification( modOp, attr );
             modificationList.add( item );
             modificationItems.put( attr.getId(), item );
         }
@@ -231,7 +231,7 @@ public class LdifEntry implements Clonea
                 attr = (EntryAttribute)value;
             }
 
-            Modification item = new ClientModification( modOp, attr );
+            Modification item = new DefaultModification( modOp, attr );
             modificationList.add( item );
             modificationItems.put( id, item );
         }
@@ -532,7 +532,7 @@ public class LdifEntry implements Clonea
         {
             for ( Modification modif:modificationList )
             {
-                Modification modifClone = new ClientModification( modif.getOperation(), 
+                Modification modifClone = new DefaultModification( modif.getOperation(), 
                     (EntryAttribute) modif.getAttribute().clone() );
                 clone.modificationList.add( modifClone );
             }
@@ -543,7 +543,7 @@ public class LdifEntry implements Clonea
             for ( String key:modificationItems.keySet() )
             {
                 Modification modif = modificationItems.get( key );
-                Modification modifClone = new ClientModification( modif.getOperation(), 
+                Modification modifClone = new DefaultModification( modif.getOperation(), 
                     (EntryAttribute) modif.getAttribute().clone() );
                 clone.modificationItems.put( key, modifClone );
             }

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java Sat Apr 24 17:18:08 2010
@@ -26,12 +26,12 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.directory.shared.i18n.I18n;
+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.ClientModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.name.AVA;
@@ -142,7 +142,7 @@ public class LdifRevertor
                         continue;
                     }
 
-                    Modification reverseModification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE,
+                    Modification reverseModification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
                         mod );
                     reverseModifications.add( 0, reverseModification );
                     break;
@@ -160,12 +160,12 @@ public class LdifRevertor
 
                     if ( mod.get() == null )
                     {
-                        reverseModification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, previous );
+                        reverseModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, previous );
                         reverseModifications.add( 0, reverseModification );
                         break;
                     }
 
-                    reverseModification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, mod );
+                    reverseModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, mod );
                     reverseModifications.add( 0, reverseModification );
                     break;
 
@@ -185,7 +185,7 @@ public class LdifRevertor
                      */
                     if ( ( mod.get() == null ) && ( previous == null ) )
                     {
-                        reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE,
+                        reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
                             new DefaultEntryAttribute( mod.getId() ) );
                         reverseModifications.add( 0, reverseModification );
                         continue;
@@ -193,7 +193,7 @@ public class LdifRevertor
 
                     if ( mod.get() == null )
                     {
-                        reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, previous );
+                        reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, previous );
                         reverseModifications.add( 0, reverseModification );
                         continue;
                     }
@@ -201,13 +201,13 @@ public class LdifRevertor
                     if ( previous == null )
                     {
                         EntryAttribute emptyAttribute = new DefaultEntryAttribute( mod.getId() );
-                        reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE,
+                        reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
                             emptyAttribute );
                         reverseModifications.add( 0, reverseModification );
                         continue;
                     }
 
-                    reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, previous );
+                    reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, previous );
                     reverseModifications.add( 0, reverseModification );
                     break;
 
@@ -349,7 +349,7 @@ public class LdifRevertor
                    ava.getNormValue().equals( oldRdn.getNormValue() ) ) )
             {
                 // Create the modification, which is an Remove
-                Modification modification = new ClientModification( 
+                Modification modification = new DefaultModification( 
                     ModificationOperation.REMOVE_ATTRIBUTE, 
                     new DefaultEntryAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
                 

Modified: directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Sat Apr 24 17:18:08 2010
@@ -32,12 +32,12 @@ import java.util.List;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
+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.ClientModification;
 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;
@@ -130,7 +130,7 @@ public class LdifRevertorTest
 
         DN dn = new DN( "cn=test, ou=system" );
 
-        Modification mod = new ClientModification( 
+        Modification mod = new DefaultModification( 
             ModificationOperation.REMOVE_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou", "acme corp" ) );
 
@@ -174,7 +174,7 @@ public class LdifRevertorTest
 
         DN dn = new DN( "cn=test, ou=system" );
 
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou" ) );
 
@@ -218,7 +218,7 @@ public class LdifRevertorTest
         
         DN dn = new DN( "cn=test, ou=system" );
         
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, ou );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn, 
@@ -266,7 +266,7 @@ public class LdifRevertorTest
         ouModified.add( "directory" );
         ouModified.add( "BigCompany inc." );
         
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.REPLACE_ATTRIBUTE, ouModified );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
@@ -310,7 +310,7 @@ public class LdifRevertorTest
         newOu.add( "acme corp" );
 
         
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.REPLACE_ATTRIBUTE, newOu );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
@@ -354,7 +354,7 @@ public class LdifRevertorTest
         
         DN dn = new DN( "cn=test, ou=system" );
         
-        Modification mod = new ClientModification( 
+        Modification mod = new DefaultModification( 
             ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
@@ -484,27 +484,27 @@ public class LdifRevertorTest
 
         // First, inject the 'ou'
         
-        Modification mod = new ClientModification( 
+        Modification mod = new DefaultModification( 
             ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
         modifications.add( mod );
 
         // Remove the 'l'
-        mod = new ClientModification(
+        mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute( "l" ) );
         modifications.add( mod );
         
         // Add 'l=FR'
-        mod = new ClientModification( 
+        mod = new DefaultModification( 
             ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "l", "FR" ) );
         modifications.add( mod );
 
         // Replace it with 'l=USA'
-        mod = new ClientModification( 
+        mod = new DefaultModification( 
             ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "l", "USA" ) );
         modifications.add( mod );
 
         // Replace the ou value
-        mod = new ClientModification( 
+        mod = new DefaultModification( 
             ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou", "apache" ) );
         modifications.add( mod );
         
@@ -556,7 +556,7 @@ public class LdifRevertorTest
         modifiedEntry.put( ou );
         
         DN dn = new DN( "cn=test, ou=system" );
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
 
@@ -593,7 +593,7 @@ public class LdifRevertorTest
         Entry modifiedEntry = buildEntry();
         
         DN dn = new DN( "cn=test, ou=system" );
-        Modification mod = new ClientModification(
+        Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java?rev=937653&r1=937652&r2=937653&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java Sat Apr 24 17:18:08 2010
@@ -34,11 +34,11 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 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.ClientModification;
 import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -190,7 +190,7 @@ public class ModifyRequestCodec extends 
     {
         currentAttribute = new DefaultEntryAttribute( type );
 
-        Modification modification = new ClientModification( currentOperation, currentAttribute );
+        Modification modification = new DefaultModification( currentOperation, currentAttribute );
         modifications.add( modification );
     }
 

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultModification.java (from r937645, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientModification.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultModification.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultModification.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientModification.java&r1=937645&r2=937653&rev=937653&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientModification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultModification.java Sat Apr 24 17:18:08 2010
@@ -17,17 +17,13 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.entry.client;
+package org.apache.directory.shared.ldap.entry;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-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.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -41,7 +37,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ClientModification implements Modification
+public class DefaultModification implements Modification
 {
     /** The modification operation */
     protected ModificationOperation operation;
@@ -53,12 +49,12 @@ public class ClientModification implemen
     protected static final Logger LOG = LoggerFactory.getLogger( Modification.class );
 
     /**
-     * Creates a new instance of ClientModification.
+     * Creates a new instance of DefaultModification.
      *
      * @param operation The modification operation
      * @param attribute The asociated attribute 
      */
-    public ClientModification( ModificationOperation operation, EntryAttribute attribute )
+    public DefaultModification( ModificationOperation operation, EntryAttribute attribute )
     {
         this.operation = operation;
         this.attribute = attribute;
@@ -66,12 +62,12 @@ public class ClientModification implemen
     
     
     /**
-     * Creates a new instance of ClientModification.
+     * Creates a new instance of DefaultModification.
      *
      * @param schemaManager The schema manager 
      * @param operation The modification operation
      */
-    public ClientModification( SchemaManager schemaManager, Modification modification )
+    public DefaultModification( SchemaManager schemaManager, Modification modification )
     {
         operation = modification.getOperation();
         
@@ -95,9 +91,9 @@ public class ClientModification implemen
         }
     }
     /**
-     * Creates a new instance of ClientModification.
+     * Creates a new instance of DefaultModification.
      */
-    public ClientModification()
+    public DefaultModification()
     {
     }
     
@@ -232,7 +228,7 @@ public class ClientModification implemen
     
     
     /**
-     * Serialize a ClientModification.
+     * Serialize a DefaultModification.
      */
     public void serialize( ObjectOutput out ) throws IOException
     {
@@ -288,11 +284,11 @@ public class ClientModification implemen
      * 
      * @return  a copied instance of the current modification
      */
-    public ClientModification clone()
+    public DefaultModification clone()
     {
         try
         {
-            ClientModification clone = (ClientModification)super.clone();
+            DefaultModification clone = (DefaultModification)super.clone();
             
             clone.attribute = this.attribute.clone();
             return clone;



Mime
View raw message