directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r936557 [3/4] - 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/schema/ apacheds/trunk/core-api/src/main/java/o...
Date Wed, 21 Apr 2010 22:51:28 GMT
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Apr 21 22:51:27 2010
@@ -29,11 +29,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+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.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -101,7 +101,7 @@ public class SchemaCheckerTest
         ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE;
         ServerEntry modifyAttributes = new DefaultServerEntry( schemaManager );
         AttributeType atCN = schemaManager.lookupAttributeTypeRegistry( "cn" );
-        modifyAttributes.put( new DefaultClientAttribute( atCN ) );
+        modifyAttributes.put( new DefaultEntryAttribute( atCN ) );
 
         // this should pass
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager.getObjectClassRegistry(), name, mod, modifyAttributes );
@@ -109,14 +109,14 @@ public class SchemaCheckerTest
         // this should succeed since person is still in replaced set and is structural
         modifyAttributes.removeAttributes( atCN );
         AttributeType atOC = schemaManager.lookupAttributeTypeRegistry( "objectClass" );
-        EntryAttribute objectClassesReplaced = new DefaultClientAttribute( atOC );
+        EntryAttribute objectClassesReplaced = new DefaultEntryAttribute( atOC );
         objectClassesReplaced.add( "top" );
         objectClassesReplaced.add( "person" );
         modifyAttributes.put( objectClassesReplaced );
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager.getObjectClassRegistry(), name, mod, modifyAttributes );
 
         // this should fail since only top is left
-        objectClassesReplaced = new DefaultClientAttribute( atOC );
+        objectClassesReplaced = new DefaultEntryAttribute( atOC );
         objectClassesReplaced.add( "top" );
         modifyAttributes.put( objectClassesReplaced );
         try
@@ -132,7 +132,7 @@ public class SchemaCheckerTest
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
         modifyAttributes.removeAttributes( "cn" );
-        objectClassesReplaced = new DefaultClientAttribute( atOC );
+        objectClassesReplaced = new DefaultEntryAttribute( atOC );
         modifyAttributes.put( objectClassesReplaced );
         try
         {
@@ -227,7 +227,7 @@ public class SchemaCheckerTest
 
         // test should fail since we are removing the ou attribute
         AttributeType OU_AT = schemaManager.lookupAttributeTypeRegistry( "ou" );
-        attributes.put( new DefaultClientAttribute( "ou", OU_AT ) );
+        attributes.put( new DefaultEntryAttribute( "ou", OU_AT ) );
 
         try
         {
@@ -247,7 +247,7 @@ public class SchemaCheckerTest
 
         // test for failure when modifying Rdn attribute in multi attribute Rdn
         AttributeType CN_AT = schemaManager.lookupAttributeTypeRegistry( "cn" );
-        attributes.put( new DefaultClientAttribute( "cn", CN_AT ) );
+        attributes.put( new DefaultEntryAttribute( "cn", CN_AT ) );
         
         try
         {
@@ -367,16 +367,16 @@ public class SchemaCheckerTest
         DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE;
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, 
-            new DefaultClientAttribute( "cn", CN_AT ) );
+            new DefaultEntryAttribute( "cn", CN_AT ) );
 
         // this should succeed since person is still in replaced set and is structural
-        EntryAttribute objectClassesReplaced = new DefaultClientAttribute( "objectClass", OBJECT_CLASS );
+        EntryAttribute objectClassesReplaced = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS );
         objectClassesReplaced.add( "top" );
         objectClassesReplaced.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, objectClassesReplaced );
 
         // this should fail since only top is left
-        objectClassesReplaced = new DefaultClientAttribute( "objectClass", OBJECT_CLASS );
+        objectClassesReplaced = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS );
         objectClassesReplaced.add( "top" );
         try
         {
@@ -390,7 +390,7 @@ public class SchemaCheckerTest
 
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
-        objectClassesReplaced = new DefaultClientAttribute( "objectClass", OBJECT_CLASS );
+        objectClassesReplaced = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS );
         try
         {
             SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, objectClassesReplaced );
@@ -414,7 +414,7 @@ public class SchemaCheckerTest
         ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
         AttributeType ocAt = schemaManager.lookupAttributeTypeRegistry( "objectClass" );
         
-        EntryAttribute entryObjectClasses = new DefaultClientAttribute( "objectClass", ocAt );
+        EntryAttribute entryObjectClasses = new DefaultEntryAttribute( "objectClass", ocAt );
         entryObjectClasses.add( "top", "person", "organizationalPerson" );
 
         // this should pass
@@ -422,18 +422,18 @@ public class SchemaCheckerTest
             schemaManager, 
             name, 
             mod, 
-            new DefaultClientAttribute( "cn", schemaManager.lookupAttributeTypeRegistry( "cn" ) ),
+            new DefaultEntryAttribute( "cn", schemaManager.lookupAttributeTypeRegistry( "cn" ) ),
             entryObjectClasses );
 
         // this should succeed since person is left and is structural
-        EntryAttribute objectClassesRemoved = new DefaultClientAttribute( 
+        EntryAttribute objectClassesRemoved = new DefaultEntryAttribute( 
             "objectClass", ocAt );
         objectClassesRemoved.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyRemove( schemaManager, name, mod, objectClassesRemoved,
             entryObjectClasses );
 
         // this should fail since only top is left
-        objectClassesRemoved = new DefaultClientAttribute( "objectClass", ocAt );
+        objectClassesRemoved = new DefaultEntryAttribute( "objectClass", ocAt );
         objectClassesRemoved.add( "person", "organizationalPerson" );
         
         try
@@ -449,7 +449,7 @@ public class SchemaCheckerTest
 
         // this should fail since the modify operation tries to delete all
         // objectClass attribute values
-        objectClassesRemoved = new DefaultClientAttribute( "objectClass", ocAt );
+        objectClassesRemoved = new DefaultEntryAttribute( "objectClass", ocAt );
 
         try
         {
@@ -480,13 +480,13 @@ public class SchemaCheckerTest
 
         // postive test which should pass
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-            new DefaultClientAttribute( "cn", cnAt, "does not matter" ), schemaManager );
+            new DefaultEntryAttribute( "cn", cnAt, "does not matter" ), schemaManager );
 
         // test should fail since we are removing the ou attribute
         try
         {
             SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-                new DefaultClientAttribute( "ou", ouAt ), schemaManager );
+                new DefaultEntryAttribute( "ou", ouAt ), schemaManager );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )
@@ -498,13 +498,13 @@ public class SchemaCheckerTest
         name = new DN( "ou=users+cn=system users,dc=example,dc=com" );
         name.normalize( oidNormalizers );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-            new DefaultClientAttribute( "sn", snAt, "does not matter" ), schemaManager );
+            new DefaultEntryAttribute( "sn", snAt, "does not matter" ), schemaManager );
 
         // test for failure when modifying Rdn attribute in multi attribute Rdn
         try
         {
             SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-                new DefaultClientAttribute( "cn", cnAt ), schemaManager );
+                new DefaultEntryAttribute( "cn", cnAt ), schemaManager );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )
@@ -515,13 +515,13 @@ public class SchemaCheckerTest
         // should succeed since the value being deleted from the rdn attribute is
         // is not used when composing the Rdn
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-            new DefaultClientAttribute( "ou", ouAt, "container" ), schemaManager );
+            new DefaultEntryAttribute( "ou", ouAt, "container" ), schemaManager );
 
         // now let's make it fail again just by providing the right value for ou (users)
         try
         {
             SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
-                new DefaultClientAttribute( "ou", ouAt, "users" ), schemaManager );
+                new DefaultEntryAttribute( "ou", ouAt, "users" ), schemaManager );
             fail( "should never get here due to a LdapSchemaViolationException being thrown" );
         }
         catch ( LdapSchemaViolationException e )

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Wed Apr 21 22:51:27 2010
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+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.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -120,7 +120,7 @@ public class RefinementEvaluatorTest
     {
         try
         {
-            assertFalse( evaluator.evaluate( null, new DefaultClientAttribute( "objectClass", OBJECT_CLASS ) ) );
+            assertFalse( evaluator.evaluate( null, new DefaultEntryAttribute( "objectClass", OBJECT_CLASS ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -139,7 +139,7 @@ public class RefinementEvaluatorTest
         try
         {
             assertFalse( evaluator.evaluate( new EqualityNode( "", new StringValue( "" ) ), 
-                new DefaultClientAttribute( "cn", CN ) ) );
+                new DefaultEntryAttribute( "cn", CN ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )
@@ -154,17 +154,17 @@ public class RefinementEvaluatorTest
         EntryAttribute objectClasses = null;
 
         // positive test
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         // negative tests
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "blah" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "blah" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
     }
 
@@ -172,19 +172,19 @@ public class RefinementEvaluatorTest
     @Test 
     public void testMatchByOID() throws Exception
     {
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         
         // positive test
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person", "blah" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         // negative tests
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "blah" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
     }
 
@@ -193,17 +193,17 @@ public class RefinementEvaluatorTest
     public void testComplexOrRefinement() throws Exception
     {
         ExprNode refinement = null;
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         String refStr = "(|(objectClass=person)(objectClass=organizationalUnit))";
         
         refinement = FilterParser.parse( refStr );
 
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "domain" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "domain" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
     }
 
@@ -212,7 +212,7 @@ public class RefinementEvaluatorTest
     public void testComplexAndRefinement() throws Exception
     {
         ExprNode refinement = null;
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         objectClasses.add( "organizationalUnit" );
         String refStr = "(&(objectClass=person)(objectClass=organizationalUnit))";
         
@@ -220,13 +220,13 @@ public class RefinementEvaluatorTest
 
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "domain" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "domain" );
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
     }
 
@@ -235,22 +235,22 @@ public class RefinementEvaluatorTest
     public void testComplexNotRefinement() throws Exception
     {
         ExprNode refinement = null;
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         String refStr = "(!(objectClass=person))";
 
         refinement = FilterParser.parse( refStr );
 
         assertFalse( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "organizationalUnit" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
         
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "domain" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "domain" );
         assertTrue( evaluator.evaluate( refinement, objectClasses ) );
 
         try
         {
-            assertFalse( evaluator.evaluate( new NotNode(), new DefaultClientAttribute( "objectClass", OBJECT_CLASS ) ) );
+            assertFalse( evaluator.evaluate( new NotNode(), new DefaultEntryAttribute( "objectClass", OBJECT_CLASS ) ) );
             fail( "should never get here due to an IAE" );
         }
         catch ( IllegalArgumentException iae )

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Wed Apr 21 22:51:27 2010
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+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.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
@@ -154,7 +154,7 @@ public class RefinementLeafEvaluatorTest
 
         try
         {
-            objectClasses = new DefaultClientAttribute( "cn", OBJECT_CLASS );
+            objectClasses = new DefaultEntryAttribute( "cn", OBJECT_CLASS );
             assertFalse( evaluator.evaluate( new EqualityNode( "cn", new StringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an IAE" );
         }
@@ -169,19 +169,19 @@ public class RefinementLeafEvaluatorTest
     public void testMatchByName() throws Exception
     {
         // positive test
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
 
         // negative tests
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "blah" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "blah" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "person" ) ), objectClasses ) );
     }
 
@@ -189,21 +189,21 @@ public class RefinementLeafEvaluatorTest
     @Test 
     public void testMatchByOID() throws Exception
     {
-        EntryAttribute objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
 
         // positive test
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS );
         objectClasses.add( "person" );
         objectClasses.add( "blah" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.6" ) ), objectClasses ) );
 
         // negative tests
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "person" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
 
-        objectClasses = new DefaultClientAttribute( "objectClass", OBJECT_CLASS, "blah" );
+        objectClasses = new DefaultEntryAttribute( "objectClass", OBJECT_CLASS, "blah" );
         assertFalse( evaluator.evaluate( new EqualityNode( "objectClass", new StringValue( "2.5.6.5" ) ), objectClasses ) );
     }
 }

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 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.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;
@@ -68,7 +69,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -375,14 +375,14 @@ public class KeyDerivationInterceptor ex
         newModsList.add( 
             new ServerModification( 
                 ModificationOperation.REPLACE_ATTRIBUTE, 
-                new DefaultClientAttribute(
+                new DefaultEntryAttribute(
                     KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, 
                     schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ),
                     principalName ) ) );
         newModsList.add( 
             new ServerModification( 
                 ModificationOperation.REPLACE_ATTRIBUTE, 
-                new DefaultClientAttribute(
+                new DefaultEntryAttribute(
                     KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT, 
                     schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ),
                     Integer.toString( kvno ) ) ) );
@@ -398,7 +398,7 @@ public class KeyDerivationInterceptor ex
     private EntryAttribute getKeyAttribute( SchemaManager schemaManager, Map<EncryptionType, EncryptionKey> keys ) throws Exception
     {
         EntryAttribute keyAttribute = 
-            new DefaultClientAttribute( KerberosAttribute.KRB5_KEY_AT, 
+            new DefaultEntryAttribute( KerberosAttribute.KRB5_KEY_AT, 
                 schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_AT ) );
 
         Iterator<EncryptionKey> it = keys.values().iterator();

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 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.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.ServerModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -658,7 +658,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultClientAttribute( SchemaConstants.OU_AT, schemaManager
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
         attrib.add( "Engineering" );
 
@@ -760,7 +760,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultClientAttribute( SchemaConstants.SURNAME_AT, schemaManager
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SURNAME_AT ) );
 
         String attribVal = "Walker";
@@ -792,7 +792,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultClientAttribute( SchemaConstants.SN_AT, schemaManager
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         String attribVal = "Johnny";
@@ -825,7 +825,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultClientAttribute( SchemaConstants.SN_AT, schemaManager
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         Modification add = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
@@ -865,7 +865,7 @@ public class JdbmStoreTest
         store.add( entry );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultClientAttribute( SchemaConstants.OU_AT, schemaManager
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
 
         String attribVal = "Marketing";

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Wed Apr 21 22:51:27 2010
@@ -30,10 +30,10 @@ import java.util.Map;
 
 import org.apache.directory.server.core.partition.impl.btree.jdbm.ServerEntrySerializer;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -251,7 +251,7 @@ public class ServerEntrySerializerTest
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
-        EntryAttribute oc = new DefaultClientAttribute( "ObjectClass", schemaManager.lookupAttributeTypeRegistry( "objectclass" ) );
+        EntryAttribute oc = new DefaultEntryAttribute( "ObjectClass", schemaManager.lookupAttributeTypeRegistry( "objectclass" ) );
         entry.add( oc );
         
         byte[] data = ses.serialize( entry );

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=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Wed Apr 21 22:51:27 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.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.ServerModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -80,11 +80,11 @@ public class ChangePassword implements D
         
         List<Modification> mods = new ArrayList<Modification>(2);
         
-        EntryAttribute newPasswordAttribute = new DefaultClientAttribute( 
+        EntryAttribute newPasswordAttribute = new DefaultEntryAttribute( 
             schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), StringTools.getBytesUtf8( newPassword ) );
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) );
         
-        EntryAttribute principalAttribute = new DefaultClientAttribute( 
+        EntryAttribute principalAttribute = new DefaultEntryAttribute( 
             schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() );
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) );
         

Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original)
+++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Wed Apr 21 22:51:27 2010
@@ -25,10 +25,10 @@ import java.util.List;
 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.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -113,7 +113,7 @@ public class AttributesFactory
         
         if ( dependencies != null && dependencies.length > 0 )
         {
-            EntryAttribute attr = new DefaultClientAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
+            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
             
             for ( String dependency:dependencies )
             {
@@ -336,7 +336,7 @@ public class AttributesFactory
         // handle the superior objectClasses 
         if ( objectClass.getSuperiorOids() != null && objectClass.getSuperiorOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultClientAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
+            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
             
             for ( String superior:objectClass.getSuperiorOids() )
             {
@@ -349,7 +349,7 @@ public class AttributesFactory
         // add the must list
         if ( objectClass.getMustAttributeTypeOids() != null && objectClass.getMustAttributeTypeOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultClientAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_MUST_AT ) );
+            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_MUST_AT ) );
 
             for ( String mustOid :objectClass.getMustAttributeTypeOids() )
             {
@@ -362,7 +362,7 @@ public class AttributesFactory
         // add the may list
         if ( objectClass.getMayAttributeTypeOids() != null && objectClass.getMayAttributeTypeOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultClientAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_MAY_AT ) );
+            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_MAY_AT ) );
 
             for ( String mayOid :objectClass.getMayAttributeTypeOids() )
             {
@@ -396,7 +396,7 @@ public class AttributesFactory
             return;
         }
         
-        EntryAttribute attr = new DefaultClientAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_NAME_AT ) );
+        EntryAttribute attr = new DefaultEntryAttribute( schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_NAME_AT ) );
 
         for ( String name:names )
         {

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Wed Apr 21 22:51:27 2010
@@ -30,11 +30,11 @@ 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.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.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -226,7 +226,7 @@ public class StoreUtils
 
                 if ( attr == null )
                 {
-                    attr = new DefaultClientAttribute( attrId );
+                    attr = new DefaultEntryAttribute( attrId );
                 }
 
                 attr.add( val );
@@ -254,7 +254,7 @@ public class StoreUtils
 
             if ( attr == null )
             {
-                attr = new DefaultClientAttribute( valStr );
+                attr = new DefaultEntryAttribute( valStr );
             }
 
             attr.add( rec.getId().toString() );
@@ -269,7 +269,7 @@ public class StoreUtils
         recordForward.setId( id );
         children.before( longRecordForward );
 
-        EntryAttribute childAttr = new DefaultClientAttribute( "_child" );
+        EntryAttribute childAttr = new DefaultEntryAttribute( "_child" );
         entry.put( childAttr );
 
         while ( children.next() )

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 2010
@@ -25,11 +25,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+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.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -168,14 +168,14 @@ public class ModifyRequest extends Abstr
 
     private void addModification( ModificationOperation modOp, String attributeName, String... attributeValue )
     {
-        EntryAttribute attr = new DefaultClientAttribute( attributeName, attributeValue );
+        EntryAttribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
         addModification( attr, modOp );
     }
 
 
     private void addModification( ModificationOperation modOp, String attributeName, byte[]... attributeValue )
     {
-        EntryAttribute attr = new DefaultClientAttribute( attributeName, attributeValue );
+        EntryAttribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
         addModification( attr, modOp );
     }
 

Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Wed Apr 21 22:51:27 2010
@@ -22,9 +22,9 @@ package org.apache.directory.shared.conv
 import java.util.ArrayList;
 import java.util.List;
 
+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.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
@@ -147,7 +147,7 @@ public abstract class SchemaElementImpl 
         else
         {
             Entry entry = new DefaultClientEntry();
-            EntryAttribute attribute = new DefaultClientAttribute( "m-name" );
+            EntryAttribute attribute = new DefaultEntryAttribute( "m-name" );
             
             for ( String name:names )
             {
@@ -172,7 +172,7 @@ public abstract class SchemaElementImpl 
         else
         {
             Entry entry = new DefaultClientEntry();
-            EntryAttribute attribute = new DefaultClientAttribute( "m-description", description );
+            EntryAttribute attribute = new DefaultEntryAttribute( "m-description", description );
 
             entry.put( attribute );
             
@@ -198,7 +198,7 @@ public abstract class SchemaElementImpl 
         StringBuilder sb = new StringBuilder();
         
         Entry entry = new DefaultClientEntry();
-        EntryAttribute attribute = new DefaultClientAttribute( ID ); 
+        EntryAttribute attribute = new DefaultEntryAttribute( ID ); 
 
         for ( String extension:extensions )
         {

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 2010
@@ -29,6 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -36,7 +37,6 @@ import org.apache.directory.shared.ldap.
 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.DefaultClientAttribute;
 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;
@@ -224,7 +224,7 @@ public class LdifEntry implements Clonea
             if ( value == null )
             {
                 value = new StringValue( (String)null );
-                attr = new DefaultClientAttribute( id, (Value<?>)value );
+                attr = new DefaultEntryAttribute( id, (Value<?>)value );
             }
             else
             {
@@ -370,7 +370,7 @@ public class LdifEntry implements Clonea
     {
         if ( "dn".equalsIgnoreCase( attributeId ) )
         {
-            return new DefaultClientAttribute( "dn", entry.getDn().getName() );
+            return new DefaultEntryAttribute( "dn", entry.getDn().getName() );
         }
 
         return entry.get( attributeId );
@@ -962,7 +962,7 @@ public class LdifEntry implements Clonea
                 {
                     int operation = in.readInt();
                     String modStr = in.readUTF();
-                    DefaultClientAttribute value = (DefaultClientAttribute)in.readObject();
+                    DefaultEntryAttribute value = (DefaultEntryAttribute)in.readObject();
                     
                     addModificationItem( ModificationOperation.getOperation( operation ), modStr, value );
                 }

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Wed Apr 21 22:51:27 2010
@@ -43,9 +43,9 @@ import java.util.NoSuchElementException;
 
 import org.apache.directory.shared.asn1.primitives.OID;
 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.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.control.Control;
@@ -887,11 +887,11 @@ public class LdifReader implements Itera
             // Create an attribute
             if ( attributeValue instanceof String )
             {
-                return new DefaultClientAttribute( attributeType, (String)attributeValue );
+                return new DefaultEntryAttribute( attributeType, (String)attributeValue );
             }
             else
             {
-                return new DefaultClientAttribute( attributeType, (byte[])attributeValue );
+                return new DefaultEntryAttribute( attributeType, (byte[])attributeValue );
             }
         }
         else
@@ -1060,7 +1060,7 @@ public class LdifReader implements Itera
 
                 modified = StringTools.trim( line.substring( "add:".length() ) );
                 modificationType = ModificationOperation.ADD_ATTRIBUTE;
-                attribute = new DefaultClientAttribute( modified );
+                attribute = new DefaultEntryAttribute( modified );
 
                 state = ATTRVAL_SPEC;
             }
@@ -1074,7 +1074,7 @@ public class LdifReader implements Itera
 
                 modified = StringTools.trim( line.substring( "delete:".length() ) );
                 modificationType = ModificationOperation.REMOVE_ATTRIBUTE;
-                attribute = new DefaultClientAttribute( modified );
+                attribute = new DefaultEntryAttribute( modified );
 
                 state = ATTRVAL_SPEC_OR_SEP;
             }
@@ -1088,7 +1088,7 @@ public class LdifReader implements Itera
 
                 modified = StringTools.trim( line.substring( "replace:".length() ) );
                 modificationType = ModificationOperation.REPLACE_ATTRIBUTE;
-                attribute = new DefaultClientAttribute( modified );
+                attribute = new DefaultEntryAttribute( modified );
 
                 state = ATTRVAL_SPEC_OR_SEP;
             }

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 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.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.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.name.AVA;
@@ -186,7 +186,7 @@ public class LdifRevertor
                     if ( ( mod.get() == null ) && ( previous == null ) )
                     {
                         reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE,
-                            new DefaultClientAttribute( mod.getId() ) );
+                            new DefaultEntryAttribute( mod.getId() ) );
                         reverseModifications.add( 0, reverseModification );
                         continue;
                     }
@@ -200,7 +200,7 @@ public class LdifRevertor
 
                     if ( previous == null )
                     {
-                        EntryAttribute emptyAttribute = new DefaultClientAttribute( mod.getId() );
+                        EntryAttribute emptyAttribute = new DefaultEntryAttribute( mod.getId() );
                         reverseModification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE,
                             emptyAttribute );
                         reverseModifications.add( 0, reverseModification );
@@ -351,7 +351,7 @@ public class LdifRevertor
                 // Create the modification, which is an Remove
                 Modification modification = new ClientModification( 
                     ModificationOperation.REMOVE_ATTRIBUTE, 
-                    new DefaultClientAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
+                    new DefaultEntryAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
                 
                 restored.addModificationItem( modification );
             }

Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Wed Apr 21 22:51:27 2010
@@ -24,11 +24,11 @@ import java.io.UnsupportedEncodingExcept
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.shared.i18n.I18n;
+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.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -362,7 +362,7 @@ public class LdifUtils
                 
                 
                 // Stores the new RDN
-                EntryAttribute newRdn = new DefaultClientAttribute( "newrdn", entry.getNewRdn() );
+                EntryAttribute newRdn = new DefaultEntryAttribute( "newrdn", entry.getNewRdn() );
                 sb.append( convertToLdif( newRdn, length ) );
 
                 // Stores the deleteoldrdn flag
@@ -382,7 +382,7 @@ public class LdifUtils
                 // Stores the optional newSuperior
                 if ( ! StringTools.isEmpty( entry.getNewSuperior() ) )
                 {
-                    EntryAttribute newSuperior = new DefaultClientAttribute( "newsuperior", entry.getNewSuperior() );
+                    EntryAttribute newSuperior = new DefaultEntryAttribute( "newsuperior", entry.getNewSuperior() );
                     sb.append( convertToLdif( newSuperior, length ) );
                 }
                 

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 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.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.DefaultClientAttribute;
 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;
@@ -97,7 +97,7 @@ public class LdifRevertorTest
         
         Entry deletedEntry = new DefaultClientEntry( dn );
         
-        EntryAttribute oc = new DefaultClientAttribute( "objectClass" );
+        EntryAttribute oc = new DefaultEntryAttribute( "objectClass" );
         oc.add( "top", "person" );
         
         deletedEntry.put( oc );
@@ -124,7 +124,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        EntryAttribute ou = new DefaultClientAttribute( "ou" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
@@ -132,7 +132,7 @@ public class LdifRevertorTest
 
         Modification mod = new ClientModification( 
             ModificationOperation.REMOVE_ATTRIBUTE, 
-            new DefaultClientAttribute( "ou", "acme corp" ) );
+            new DefaultEntryAttribute( "ou", "acme corp" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -168,7 +168,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        EntryAttribute ou = new DefaultClientAttribute( "ou" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
@@ -176,7 +176,7 @@ public class LdifRevertorTest
 
         Modification mod = new ClientModification(
             ModificationOperation.REMOVE_ATTRIBUTE, 
-            new DefaultClientAttribute( "ou" ) );
+            new DefaultEntryAttribute( "ou" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -213,7 +213,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        EntryAttribute ou = new DefaultClientAttribute( "ou", "apache", "acme corp" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou", "apache", "acme corp" );
         modifiedEntry.put( ou );
         
         DN dn = new DN( "cn=test, ou=system" );
@@ -256,13 +256,13 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        EntryAttribute ou = new DefaultClientAttribute( "ou" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
         DN dn = new DN( "cn=test, ou=system" );
 
-        EntryAttribute ouModified = new DefaultClientAttribute( "ou" );
+        EntryAttribute ouModified = new DefaultEntryAttribute( "ou" );
         ouModified.add( "directory" );
         ouModified.add( "BigCompany inc." );
         
@@ -305,7 +305,7 @@ public class LdifRevertorTest
         
         DN dn = new DN( "cn=test, ou=system" );
         
-        EntryAttribute newOu = new DefaultClientAttribute( "ou" );
+        EntryAttribute newOu = new DefaultEntryAttribute( "ou" );
         newOu.add( "apache" );
         newOu.add( "acme corp" );
 
@@ -347,7 +347,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        EntryAttribute ou = new DefaultClientAttribute( "ou" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou" );
         ou.add( "apache" );
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
@@ -355,7 +355,7 @@ public class LdifRevertorTest
         DN dn = new DN( "cn=test, ou=system" );
         
         Modification mod = new ClientModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "ou" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -485,27 +485,27 @@ public class LdifRevertorTest
         // First, inject the 'ou'
         
         Modification mod = new ClientModification( 
-            ModificationOperation.ADD_ATTRIBUTE, new DefaultClientAttribute( "ou", "BigCompany inc." ) );
+            ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
         modifications.add( mod );
 
         // Remove the 'l'
         mod = new ClientModification(
-            ModificationOperation.REMOVE_ATTRIBUTE, new DefaultClientAttribute( "l" ) );
+            ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute( "l" ) );
         modifications.add( mod );
         
         // Add 'l=FR'
         mod = new ClientModification( 
-            ModificationOperation.ADD_ATTRIBUTE, new DefaultClientAttribute( "l", "FR" ) );
+            ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "l", "FR" ) );
         modifications.add( mod );
 
         // Replace it with 'l=USA'
         mod = new ClientModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "l", "USA" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "l", "USA" ) );
         modifications.add( mod );
 
         // Replace the ou value
         mod = new ClientModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "ou", "apache" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou", "apache" ) );
         modifications.add( mod );
         
         LdifEntry reversedEntry = LdifRevertor.reverseModify( dn, modifications, initialEntry.getEntry() );
@@ -550,7 +550,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        EntryAttribute ou = new DefaultClientAttribute( "ou" );
+        EntryAttribute ou = new DefaultEntryAttribute( "ou" );
         ou.add( "apache" );
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
@@ -558,7 +558,7 @@ public class LdifRevertorTest
         DN dn = new DN( "cn=test, ou=system" );
         Modification mod = new ClientModification(
             ModificationOperation.ADD_ATTRIBUTE, 
-            new DefaultClientAttribute( "ou", "BigCompany inc." ) );
+            new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -595,7 +595,7 @@ public class LdifRevertorTest
         DN dn = new DN( "cn=test, ou=system" );
         Modification mod = new ClientModification(
             ModificationOperation.ADD_ATTRIBUTE, 
-            new DefaultClientAttribute( "ou", "BigCompany inc." ) );
+            new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );

Modified: directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original)
+++ directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Wed Apr 21 22:51:27 2010
@@ -34,9 +34,9 @@ import javax.naming.directory.Attributes
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
 
+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.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -343,7 +343,7 @@ public class LdifUtilsTest
         entry.setDn( "cn=Saarbr\u00FCcken, dc=example, dc=com" );
         entry.setChangeType( ChangeType.Add );
         
-        EntryAttribute oc = new DefaultClientAttribute( "objectClass" );
+        EntryAttribute oc = new DefaultEntryAttribute( "objectClass" );
         oc.add( "top", "person", "inetorgPerson" );
         
         entry.addAttribute( oc );

Modified: directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java Wed Apr 21 22:51:27 2010
@@ -31,10 +31,10 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.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.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -1074,7 +1074,7 @@ public class SchemaEntityFactory impleme
         }
 
         byte[] bytecode = Base64.decode( byteCodeString.toCharArray() );
-        EntryAttribute attr = new DefaultClientAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
+        EntryAttribute attr = new DefaultEntryAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
 
         return attr;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java Wed Apr 21 22:51:27 2010
@@ -34,9 +34,9 @@ import org.apache.directory.shared.asn1.
 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.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -175,7 +175,7 @@ public class AddRequestCodec extends Lda
         }
 
         // fix this to use AttributeImpl(type.getString().toLowerCase())
-        currentAttribute = new DefaultClientAttribute( type );
+        currentAttribute = new DefaultEntryAttribute( type );
         entry.put( currentAttribute );
     }
 

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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 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.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.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -188,7 +188,7 @@ public class ModifyRequestCodec extends 
      */
     public void addAttributeTypeAndValues( String type )
     {
-        currentAttribute = new DefaultClientAttribute( type );
+        currentAttribute = new DefaultEntryAttribute( type );
 
         Modification modification = new ClientModification( currentOperation, currentAttribute );
         modifications.add( modification );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java Wed Apr 21 22:51:27 2010
@@ -38,8 +38,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.DN;
 
@@ -157,7 +157,7 @@ public class SearchRequestCodec extends 
      */
     public void addAttribute( String attribute )
     {
-        attributes.add( new DefaultClientAttribute( attribute ) );
+        attributes.add( new DefaultEntryAttribute( attribute ) );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java Wed Apr 21 22:51:27 2010
@@ -36,9 +36,9 @@ 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.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -179,7 +179,7 @@ public class SearchResultEntryCodec exte
      */
     public void addAttributeValues( String type )
     {
-        currentAttributeValue = new DefaultClientAttribute( type );
+        currentAttributeValue = new DefaultEntryAttribute( type );
 
         try
         {

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java (from r936554, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java&r1=936554&r2=936557&rev=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java Wed Apr 21 22:51:27 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.shared.ldap.entry.client;
+package org.apache.directory.shared.ldap.entry;
 
 
 import java.io.Externalizable;
@@ -32,10 +32,6 @@ import org.apache.directory.shared.ldap.
 
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
@@ -53,10 +49,10 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DefaultClientAttribute implements EntryAttribute
+public class DefaultEntryAttribute implements EntryAttribute
 {
     /** logger for reporting errors that might not be handled properly upstream */
-    private static final Logger LOG = LoggerFactory.getLogger( DefaultClientAttribute.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DefaultEntryAttribute.class );
 
     /** The associated AttributeType */
     protected AttributeType attributeType;
@@ -156,7 +152,7 @@ public class DefaultClientAttribute impl
     /**
      * Create a new instance of a EntryAttribute, without ID nor value.
      */
-    public DefaultClientAttribute()
+    public DefaultEntryAttribute()
     {
     }
 
@@ -166,7 +162,7 @@ public class DefaultClientAttribute impl
      * 
      * @param attributeType the attributeType for the empty attribute added into the entry
      */
-    public DefaultClientAttribute( AttributeType attributeType )
+    public DefaultEntryAttribute( AttributeType attributeType )
     {
         if ( attributeType == null )
         {
@@ -180,7 +176,7 @@ public class DefaultClientAttribute impl
     /**
      * Create a new instance of a EntryAttribute, without value.
      */
-    public DefaultClientAttribute( String upId )
+    public DefaultEntryAttribute( String upId )
     {
         setUpId( upId );
     }
@@ -192,7 +188,7 @@ public class DefaultClientAttribute impl
      * @param upId the ID for the added attributeType
      * @param attributeType the added AttributeType
      */
-    public DefaultClientAttribute( String upId, AttributeType attributeType )
+    public DefaultEntryAttribute( String upId, AttributeType attributeType )
     {
         if ( attributeType == null ) 
         {
@@ -217,7 +213,7 @@ public class DefaultClientAttribute impl
      * @param attributeType the attribute type according to the schema
      * @param vals an initial set of values for this attribute
      */
-    public DefaultClientAttribute( String upId, Value<?>... vals )
+    public DefaultEntryAttribute( String upId, Value<?>... vals )
     {
         // The value can be null, this is a valid value.
         if ( vals[0] == null )
@@ -251,7 +247,7 @@ public class DefaultClientAttribute impl
      * @param attributeType The attributeType added on creation
      * @param vals The added value for this attribute
      */
-    public DefaultClientAttribute( AttributeType attributeType, String... vals )
+    public DefaultEntryAttribute( AttributeType attributeType, String... vals )
     {
         this( null, attributeType, vals );
     }
@@ -264,7 +260,7 @@ public class DefaultClientAttribute impl
      * @param attributeType The attributeType added on creation
      * @param vals the added values for this attribute
      */
-    public DefaultClientAttribute( String upId, AttributeType attributeType, String... vals )
+    public DefaultEntryAttribute( String upId, AttributeType attributeType, String... vals )
     {
         if ( attributeType == null )
         {
@@ -290,7 +286,7 @@ public class DefaultClientAttribute impl
      * @param attributeType the attribute type according to the schema
      * @param vals an initial set of values for this attribute
      */
-    public DefaultClientAttribute( String upId, AttributeType attributeType, Value<?>... vals )
+    public DefaultEntryAttribute( String upId, AttributeType attributeType, Value<?>... vals )
     {
         if ( attributeType == null )
         {
@@ -313,7 +309,7 @@ public class DefaultClientAttribute impl
      * @param attributeType the attribute type according to the schema
      * @param vals an initial set of values for this attribute
      */
-    public DefaultClientAttribute( AttributeType attributeType, Value<?>... vals )
+    public DefaultEntryAttribute( AttributeType attributeType, Value<?>... vals )
     {
         this( null, attributeType, vals );
     }
@@ -322,7 +318,7 @@ public class DefaultClientAttribute impl
     /**
      * Create a new instance of a EntryAttribute.
      */
-    public DefaultClientAttribute( String upId, String... vals )
+    public DefaultEntryAttribute( String upId, String... vals )
     {
         add( vals );
         setUpId( upId );
@@ -332,7 +328,7 @@ public class DefaultClientAttribute impl
     /**
      * Create a new instance of a EntryAttribute, with some byte[] values.
      */
-    public DefaultClientAttribute( String upId, byte[]... vals )
+    public DefaultEntryAttribute( String upId, byte[]... vals )
     {
         add( vals );
         setUpId( upId );
@@ -345,7 +341,7 @@ public class DefaultClientAttribute impl
      * @param attributeType The attributeType added on creation
      * @param vals The value for the added attribute
      */
-    public DefaultClientAttribute( AttributeType attributeType, byte[]... vals )
+    public DefaultEntryAttribute( AttributeType attributeType, byte[]... vals )
     {
         this( null, attributeType, vals );
     }
@@ -358,7 +354,7 @@ public class DefaultClientAttribute impl
      * @param attributeType the AttributeType to be added
      * @param vals the values for the added attribute
      */
-    public DefaultClientAttribute( String upId, AttributeType attributeType, byte[]... vals )
+    public DefaultEntryAttribute( String upId, AttributeType attributeType, byte[]... vals )
     {
         if ( attributeType == null )
         {
@@ -380,7 +376,7 @@ public class DefaultClientAttribute impl
      * @param attributeType The attribute's type 
      * @param attribute The attribute to be copied
      */
-    public DefaultClientAttribute( AttributeType attributeType, EntryAttribute attribute )
+    public DefaultEntryAttribute( AttributeType attributeType, EntryAttribute attribute )
     {
         // Copy the common values. isHR is only available on a ServerAttribute 
         this.attributeType = attributeType;
@@ -2169,7 +2165,7 @@ public class DefaultClientAttribute impl
     public EntryAttribute toClientAttribute()
     {
         // Create the new EntryAttribute
-        EntryAttribute clientAttribute = new DefaultClientAttribute( upId );
+        EntryAttribute clientAttribute = new DefaultEntryAttribute( upId );
         
         // Copy the values
         for ( Value<?> value:this )
@@ -2310,7 +2306,7 @@ public class DefaultClientAttribute impl
     {
         try
         {
-            DefaultClientAttribute attribute = (DefaultClientAttribute)super.clone();
+            DefaultEntryAttribute attribute = (DefaultEntryAttribute)super.clone();
             
             attribute.values = new LinkedHashSet<Value<?>>( values.size() );
             



Mime
View raw message