directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r936557 [4/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/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java Wed Apr 21 22:51:27 2010
@@ -31,7 +31,6 @@ import java.util.Set;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-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.name.DN;
@@ -158,7 +157,7 @@ public final class DefaultServerEntry ex
      */
     private void createAttribute( String upId, AttributeType attributeType, byte[]... values ) 
     {
-        EntryAttribute attribute = new DefaultClientAttribute( attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
         attributes.put( attributeType, attribute );
     }
@@ -172,7 +171,7 @@ public final class DefaultServerEntry ex
      */
     private void createAttribute( String upId, AttributeType attributeType, String... values ) 
     {
-        EntryAttribute attribute = new DefaultClientAttribute( attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
         attributes.put( attributeType, attribute );
     }
@@ -186,7 +185,7 @@ public final class DefaultServerEntry ex
      */
     private void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) 
     {
-        EntryAttribute attribute = new DefaultClientAttribute( attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
         attributes.put( attributeType, attribute );
     }
@@ -289,7 +288,7 @@ public final class DefaultServerEntry ex
                 }
                 
                 // Create a new ServerAttribute.
-                EntryAttribute serverAttribute = new DefaultClientAttribute( attributeType, attribute );
+                EntryAttribute serverAttribute = new DefaultEntryAttribute( attributeType, attribute );
                 
                 // And store it
                 add( serverAttribute );
@@ -1467,7 +1466,7 @@ public final class DefaultServerEntry ex
             throw new UnsupportedOperationException( message );
         }
 
-        EntryAttribute attribute = new DefaultClientAttribute( upId, attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
         
         return attributes.put( attributeType, attribute );
     }
@@ -1530,7 +1529,7 @@ public final class DefaultServerEntry ex
             }
         }
         
-        EntryAttribute attribute = new DefaultClientAttribute( upId, attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
         
         return attributes.put( attributeType, attribute );
     }
@@ -1584,7 +1583,7 @@ public final class DefaultServerEntry ex
             upId = getUpId( upId, attributeType );
         }
         
-        EntryAttribute attribute = new DefaultClientAttribute( upId, attributeType, values );
+        EntryAttribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
         
         return attributes.put( attributeType, attribute );
     }
@@ -2152,7 +2151,7 @@ public final class DefaultServerEntry ex
                 continue;
             }
             
-            EntryAttribute attribute = attributes.put( attributeType, new DefaultClientAttribute( attributeType ) );
+            EntryAttribute attribute = attributes.put( attributeType, new DefaultEntryAttribute( attributeType ) );
 
             if ( attribute != null )
             {
@@ -2209,7 +2208,7 @@ public final class DefaultServerEntry ex
             }
             
             EntryAttribute attribute = attributes.put( attributeType, 
-                new DefaultClientAttribute( upId, attributeType ));
+                new DefaultEntryAttribute( upId, attributeType ));
             
             if ( attribute != null )
             {
@@ -2344,7 +2343,7 @@ public final class DefaultServerEntry ex
             out.writeUTF( oid );
             
             // Get the attribute
-            DefaultClientAttribute attribute = (DefaultClientAttribute)attributes.get( attributeType );
+            DefaultEntryAttribute attribute = (DefaultEntryAttribute)attributes.get( attributeType );
 
             // Write the attribute
             attribute.serialize( out );
@@ -2397,7 +2396,7 @@ public final class DefaultServerEntry ex
                 AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
                 
                 // Create the attribute we will read
-                EntryAttribute attribute = new DefaultClientAttribute( attributeType );
+                EntryAttribute attribute = new DefaultEntryAttribute( attributeType );
                 
                 // Read the attribute
                 attribute.deserialize( in );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerModification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerModification.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerModification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerModification.java Wed Apr 21 22:51:27 2010
@@ -25,7 +25,6 @@ import java.io.ObjectOutput;
 
 import org.apache.directory.shared.i18n.I18n;
 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.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -92,7 +91,7 @@ public class ServerModification implemen
                 at = schemaManager.lookupAttributeTypeRegistry( modAttribute.getId() );
             }
             
-            attribute = new DefaultClientAttribute( at, modAttribute );
+            attribute = new DefaultEntryAttribute( at, modAttribute );
         }
         catch ( LdapException ne )
         {
@@ -283,10 +282,10 @@ public class ServerModification implemen
         // Lookup for tha associated AttributeType
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
         
-        attribute = new DefaultClientAttribute( attributeType );
+        attribute = new DefaultEntryAttribute( attributeType );
         
         // Read the attribute
-        ((DefaultClientAttribute)attribute).deserialize( in );
+        ((DefaultEntryAttribute)attribute).deserialize( in );
     }
     
     
@@ -303,13 +302,13 @@ public class ServerModification implemen
         // Write the operation
         out.writeInt( operation.getValue() );
         
-        AttributeType at = ((DefaultClientAttribute)attribute).getAttributeType();
+        AttributeType at = ((DefaultEntryAttribute)attribute).getAttributeType();
         
         // Write the attribute's oid
         out.writeUTF( at.getOid() );
         
         // Write the attribute
-        ((DefaultClientAttribute)attribute).serialize( out );
+        ((DefaultEntryAttribute)attribute).serialize( out );
     }
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java Wed Apr 21 22:51:27 2010
@@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.AbstractEntry;
+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;
@@ -212,7 +213,7 @@ public final class DefaultClientEntry ex
         {
             // We have to create a new Attribute and set the values
             // and the upId
-            attributes.put( id, new DefaultClientAttribute( upId, values ) );
+            attributes.put( id, new DefaultEntryAttribute( upId, values ) );
         }
     }
 
@@ -245,7 +246,7 @@ public final class DefaultClientEntry ex
         {
             // We have to create a new Attribute and set the values
             // and the upId
-            attributes.put( id, new DefaultClientAttribute( upId, values ) );
+            attributes.put( id, new DefaultEntryAttribute( upId, values ) );
         }
     }
 
@@ -277,7 +278,7 @@ public final class DefaultClientEntry ex
         {
             // We have to create a new Attribute and set the values
             // and the upId
-            attributes.put( id, new DefaultClientAttribute( upId, values ) );
+            attributes.put( id, new DefaultEntryAttribute( upId, values ) );
         }
     }
 
@@ -508,7 +509,7 @@ public final class DefaultClientEntry ex
         String id = getId( upId );
         
         // Create a new attribute
-        EntryAttribute clientAttribute = new DefaultClientAttribute( upId, values );
+        EntryAttribute clientAttribute = new DefaultEntryAttribute( upId, values );
 
         // Replace the previous one, and return it back
         return attributes.put( id, clientAttribute );
@@ -534,7 +535,7 @@ public final class DefaultClientEntry ex
         String id = getId( upId );
         
         // Create a new attribute
-        EntryAttribute clientAttribute = new DefaultClientAttribute( upId, values );
+        EntryAttribute clientAttribute = new DefaultEntryAttribute( upId, values );
 
         // Replace the previous one, and return it back
         return attributes.put( id, clientAttribute );
@@ -560,7 +561,7 @@ public final class DefaultClientEntry ex
         String id = getId( upId );
         
         // Create a new attribute
-        EntryAttribute clientAttribute = new DefaultClientAttribute( upId, values );
+        EntryAttribute clientAttribute = new DefaultEntryAttribute( upId, values );
 
         // Replace the previous one, and return it back
         return attributes.put( id, clientAttribute );
@@ -609,7 +610,7 @@ public final class DefaultClientEntry ex
                 returnedClientAttributes.add( attributes.remove( id ) );
             }
 
-            EntryAttribute newAttribute = new DefaultClientAttribute( upId );
+            EntryAttribute newAttribute = new DefaultEntryAttribute( upId );
             attributes.put( id, newAttribute );
         }
         
@@ -993,7 +994,7 @@ public final class DefaultClientEntry ex
         for ( int i = 0; i < nbAttributes; i++ )
         {
             // Read each attribute
-            EntryAttribute attribute = (DefaultClientAttribute)in.readObject();
+            EntryAttribute attribute = (DefaultEntryAttribute)in.readObject();
             
             attributes.put( attribute.getId(), attribute );
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Wed Apr 21 22:51:27 2010
@@ -34,11 +34,11 @@ import javax.naming.directory.BasicAttri
 import javax.naming.directory.InvalidAttributeIdentifierException;
 
 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.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
@@ -1310,7 +1310,7 @@ public class AttributeUtils
 
         try
         {
-            EntryAttribute clientAttribute = new DefaultClientAttribute( attribute.getID() );
+            EntryAttribute clientAttribute = new DefaultEntryAttribute( attribute.getID() );
 
             for ( NamingEnumeration<?> values = attribute.getAll(); values.hasMoreElements(); )
             {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientModificationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientModificationTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientModificationTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientModificationTest.java Wed Apr 21 22:51:27 2010
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+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;
@@ -120,7 +121,7 @@ public class ClientModificationTest
     @Test 
     public void testCreateServerModification()
     {
-        EntryAttribute attribute = new DefaultClientAttribute( "cn" );
+        EntryAttribute attribute = new DefaultEntryAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         Modification mod = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -142,7 +143,7 @@ public class ClientModificationTest
     @Test
     public void testSerializationModificationADD() throws ClassNotFoundException, IOException
     {
-        EntryAttribute attribute = new DefaultClientAttribute( "cn" );
+        EntryAttribute attribute = new DefaultEntryAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         ClientModification mod = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -156,7 +157,7 @@ public class ClientModificationTest
     @Test
     public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException
     {
-        EntryAttribute attribute = new DefaultClientAttribute( "cn" );
+        EntryAttribute attribute = new DefaultEntryAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         ClientModification mod = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -170,7 +171,7 @@ public class ClientModificationTest
     @Test
     public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException
     {
-        EntryAttribute attribute = new DefaultClientAttribute( "cn" );
+        EntryAttribute attribute = new DefaultEntryAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         ClientModification mod = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttributeTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttributeTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttributeTest.java Wed Apr 21 22:51:27 2010
@@ -36,6 +36,7 @@ import java.util.Iterator;
 import javax.naming.directory.InvalidAttributeValueException;
 
 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.Value;
@@ -47,7 +48,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
- * Test the DefaultClientAttribute class
+ * Test the DefaultEntryAttribute class
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -74,9 +75,9 @@ public class DefaultClientAttributeTest
     
     
     /**
-     * Serialize a DefaultClientAttribute
+     * Serialize a DefaultEntryAttribute
      */
-    private ByteArrayOutputStream serializeValue( DefaultClientAttribute value ) throws IOException
+    private ByteArrayOutputStream serializeValue( DefaultEntryAttribute value ) throws IOException
     {
         ObjectOutputStream oOut = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -111,9 +112,9 @@ public class DefaultClientAttributeTest
     
     
     /**
-     * Deserialize a DefaultClientAttribute
+     * Deserialize a DefaultEntryAttribute
      */
-    private DefaultClientAttribute deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
+    private DefaultEntryAttribute deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
     {
         ObjectInputStream oIn = null;
         ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
@@ -122,7 +123,7 @@ public class DefaultClientAttributeTest
         {
             oIn = new ObjectInputStream( in );
 
-            DefaultClientAttribute value = ( DefaultClientAttribute ) oIn.readObject();
+            DefaultEntryAttribute value = ( DefaultEntryAttribute ) oIn.readObject();
 
             return value;
         }
@@ -157,12 +158,12 @@ public class DefaultClientAttributeTest
 
 
     /**
-     * Test method new DefaultClientAttribute()
+     * Test method new DefaultEntryAttribute()
      */
     @Test
     public void testDefaultClientAttribute()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
         
         assertFalse( attr.isHR() );
         assertEquals( 0, attr.size() );
@@ -172,12 +173,12 @@ public class DefaultClientAttributeTest
 
 
     /**
-     * Test method new DefaultClientAttribute( String )
+     * Test method new DefaultEntryAttribute( String )
      */
     @Test
     public void testDefaultClientAttributeString()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "TEST" );
+        EntryAttribute attr = new DefaultEntryAttribute( "TEST" );
         
         assertFalse( attr.isHR() );
         assertEquals( 0, attr.size() );
@@ -187,12 +188,12 @@ public class DefaultClientAttributeTest
 
 
     /**
-     * Test method new DefaultClientAttribute( String, Value... )
+     * Test method new DefaultEntryAttribute( String, Value... )
      */
     @Test
     public void testDefaultClientAttributeStringValueArray()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "Test", STR_VALUE1, STR_VALUE2 );
+        EntryAttribute attr = new DefaultEntryAttribute( "Test", STR_VALUE1, STR_VALUE2 );
         
         assertTrue( attr.isHR() );
         assertEquals( 2, attr.size() );
@@ -209,7 +210,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testDefaultClientAttributeStringStringArray()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "Test", "a", "b" );
+        EntryAttribute attr = new DefaultEntryAttribute( "Test", "a", "b" );
         
         assertTrue( attr.isHR() );
         assertEquals( 2, attr.size() );
@@ -226,7 +227,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testDefaultClientAttributeStringBytesArray()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "Test", BYTES1, BYTES2 );
+        EntryAttribute attr = new DefaultEntryAttribute( "Test", BYTES1, BYTES2 );
         
         assertFalse( attr.isHR() );
         assertEquals( 2, attr.size() );
@@ -243,17 +244,17 @@ public class DefaultClientAttributeTest
     @Test
     public void testGetBytes() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         attr1.add( (byte[])null );
         assertNull( attr1.getBytes() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( BYTES1, BYTES2 );
         assertTrue( Arrays.equals( BYTES1, attr2.getBytes() ) );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         attr3.add( "a", "b" );
         
@@ -275,17 +276,17 @@ public class DefaultClientAttributeTest
     @Test
     public void testGetString() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         attr1.add( (String)null );
         assertEquals( "", attr1.getString() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( "a", "b" );
         assertEquals( "a", attr2.getString() );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2 );
         
@@ -307,7 +308,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testGetId()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
 
         assertNull( attr.getId() );
         
@@ -325,7 +326,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testSetId()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
 
         try
         {
@@ -371,7 +372,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testGetUpId()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
 
         assertNull( attr.getUpId() );
         
@@ -389,7 +390,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testSetUpId()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
 
         try
         {
@@ -437,7 +438,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testIsValidSyntaxChecker() throws LdapException
     {
-        EntryAttribute attr = new DefaultClientAttribute( "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "test" );
         
         attr.add( "test", "another test" );
         
@@ -454,7 +455,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testIterator()
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
         attr.add(  "a", "b", "c" );
         
         Iterator<Value<?>> iter = attr.iterator();
@@ -478,21 +479,21 @@ public class DefaultClientAttributeTest
     @Test
     public void testAddValueArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         int nbAdded = attr1.add( new StringValue( (String)null ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHR() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr2.add( new BinaryValue( (byte[])null ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHR() );
         assertEquals( NULL_BINARY_VALUE, attr2.get() );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr3.add( new StringValue( "a" ), new StringValue( "b" ) );
         assertEquals( 2, nbAdded );
@@ -500,7 +501,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr3.contains( "a" ) );
         assertTrue( attr3.contains( "b" ) );
         
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr4.add( new BinaryValue( BYTES1 ), new BinaryValue( BYTES2 ) );
         assertEquals( 2, nbAdded );
@@ -508,7 +509,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr4.contains( BYTES1 ) );
         assertTrue( attr4.contains( BYTES2 ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr5.add( new StringValue( "c" ), new BinaryValue( BYTES1 ) );
         assertEquals( 2, nbAdded );
@@ -516,7 +517,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr5.contains( "ab" ) );
         assertTrue( attr5.contains( "c" ) );
 
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr6.add( new BinaryValue( BYTES1 ), new StringValue( "c" ) );
         assertEquals( 2, nbAdded );
@@ -524,7 +525,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr6.contains( BYTES1 ) );
         assertTrue( attr6.contains( BYTES3 ) );
 
-        EntryAttribute attr7 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr7 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr7.add( new BinaryValue( (byte[])null ), new StringValue( "c" ) );
         assertEquals( 2, nbAdded );
@@ -532,7 +533,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr7.contains( NULL_BINARY_VALUE ) );
         assertTrue( attr7.contains( BYTES3 ) );
 
-        EntryAttribute attr8 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr8 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr8.add( new StringValue( (String)null ), new BinaryValue( BYTES1 ) );
         assertEquals( 2, nbAdded );
@@ -548,28 +549,28 @@ public class DefaultClientAttributeTest
     @Test
     public void testAddStringArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         int nbAdded = attr1.add( (String)null );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHR() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr2.add( "" );
         assertEquals( 1, nbAdded );
         assertTrue( attr2.isHR() );
         assertEquals( "", attr2.getString() );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr3.add( "t" );
         assertEquals( 1, nbAdded );
         assertTrue( attr3.isHR() );
         assertEquals( "t", attr3.getString() );
         
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr4.add( "a", "b", "c", "d" );
         assertEquals( 4, nbAdded );
@@ -601,7 +602,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr4.contains( "e" ) );
         assertFalse( attr4.contains( "ab" ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr5.add( "a", "b", (String)null, "d" );
         assertEquals( 4, nbAdded );
@@ -611,7 +612,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr5.contains( (String)null ) );
         assertTrue( attr5.contains( "d" ) );
 
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         attr6.setHR( false );
         nbAdded = attr6.add( "a", (String)null );
@@ -620,7 +621,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr6.contains( new byte[]{'a'} ) );
         assertTrue( attr6.contains( (byte[])null ) );
         
-        EntryAttribute attr7 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr7 = new DefaultEntryAttribute( "test" );
         
         attr7.add( "a", "b" );
         assertEquals( 2, attr7.size() );
@@ -637,28 +638,28 @@ public class DefaultClientAttributeTest
     @Test
     public void testAddByteArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         int nbAdded = attr1.add( (byte[])null );
         assertEquals( 1, nbAdded );
         assertFalse( attr1.isHR() );
         assertTrue( Arrays.equals( NULL_BINARY_VALUE.getBytes(), attr1.getBytes() ) );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr2.add( StringTools.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHR() );
         assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, attr2.getBytes() ) );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr3.add( BYTES1 );
         assertEquals( 1, nbAdded );
         assertFalse( attr3.isHR() );
         assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
         
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr4.add( BYTES1, BYTES2, BYTES3, BYTES4 );
         assertEquals( 4, nbAdded );
@@ -668,7 +669,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr4.contains( BYTES3 ) );
         assertTrue( attr4.contains( BYTES4 ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr5.add( BYTES1, BYTES2, (byte[])null, BYTES3 );
         assertEquals( 4, nbAdded );
@@ -678,7 +679,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr5.contains( (byte[])null ) );
         assertTrue( attr5.contains( BYTES3 ) );
 
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         attr6.setHR( true );
         nbAdded = attr6.add( BYTES1, (byte[])null );
@@ -695,7 +696,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testClear() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         
@@ -706,7 +707,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.isHR() );
         assertEquals( 0, attr1.size() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         attr2.add( BYTES1, BYTES2 );
         assertEquals( 2, attr2.size() );
         assertFalse( attr2.isHR() );
@@ -722,7 +723,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testContainsValueArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( STR_VALUE1 ) );
@@ -746,7 +747,7 @@ public class DefaultClientAttributeTest
         assertFalse( attr1.contains( NULL_STRING_VALUE ) );
         assertTrue( attr1.contains( STR_VALUE1, BIN_VALUE2 ) );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( BYTES1 ) );
         assertFalse( attr2.contains( NULL_BINARY_VALUE ) );
@@ -775,7 +776,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testContainsStringArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( "a" ) );
@@ -797,7 +798,7 @@ public class DefaultClientAttributeTest
         assertFalse( attr1.contains( "e" ) );
         assertFalse( attr1.contains( (String)null ) );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( BYTES1 ) );
         assertFalse( attr2.contains( (byte[])null ) );
@@ -825,7 +826,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testContainsByteArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( BYTES1 ) );
@@ -847,7 +848,7 @@ public class DefaultClientAttributeTest
         assertFalse( attr1.contains( BYTES4 ) );
         assertFalse( attr1.contains( (byte[])null ) );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( "a" ) );
         assertFalse( attr2.contains( (String)null ) );
@@ -875,12 +876,12 @@ public class DefaultClientAttributeTest
     @Test
     public void testGet() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         attr1.add( (String)null );
         assertEquals( NULL_STRING_VALUE,attr1.get() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( "a", "b", "c" );
         assertEquals( "a", attr2.get().getString() );
@@ -894,7 +895,7 @@ public class DefaultClientAttributeTest
         attr2.remove( "c" );
         assertNull( attr2.get() );
 
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2, BYTES3 );
         assertTrue( Arrays.equals( BYTES1, attr3.get().getBytes() ) );
@@ -916,7 +917,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testGetAll()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "test" );
         
         Iterator<Value<?>> iterator = attr.getAll(); 
         assertFalse( iterator.hasNext() );
@@ -948,14 +949,14 @@ public class DefaultClientAttributeTest
     @Test
     public void testSize() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
 
         assertEquals( 0, attr1.size() );
         
         attr1.add( (String)null );
         assertEquals( 1, attr1.size() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( "a", "b" );
         assertEquals( 2, attr2.size() );
@@ -971,7 +972,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testRemoveValueArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
 
         assertFalse( attr1.remove( STR_VALUE1 ) );
 
@@ -1003,7 +1004,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.remove( NULL_STRING_VALUE, STR_VALUE1 ) );
         assertEquals( 1, attr1.size() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
 
         assertFalse( attr2.remove( BIN_VALUE1 ) );
 
@@ -1045,7 +1046,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testRemoveByteArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
 
         assertFalse( attr1.remove( BYTES1 ) );
 
@@ -1071,7 +1072,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.remove( (byte[])null, BYTES1 ) );
         assertEquals( 1, attr1.size() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( "ab", "b", "c" );
         
@@ -1087,7 +1088,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testRemoveStringArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
 
         assertFalse( attr1.remove( "a" ) );
 
@@ -1113,7 +1114,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.remove( (String )null, "a" ) );
         assertEquals( 1, attr1.size() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         attr2.add( BYTES1, BYTES2, BYTES3 );
         
@@ -1129,28 +1130,28 @@ public class DefaultClientAttributeTest
     @Test
     public void testPutStringArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         int nbAdded = attr1.add( (String)null );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHR() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr2.add( "" );
         assertEquals( 1, nbAdded );
         assertTrue( attr2.isHR() );
         assertEquals( "", attr2.getString() );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr3.add( "t" );
         assertEquals( 1, nbAdded );
         assertTrue( attr3.isHR() );
         assertEquals( "t", attr3.getString() );
         
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr4.add( "a", "b", "c", "d" );
         assertEquals( 4, nbAdded );
@@ -1160,7 +1161,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr4.contains( "c" ) );
         assertTrue( attr4.contains( "d" ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr5.add( "a", "b", (String)null, "d" );
         assertEquals( 4, nbAdded );
@@ -1170,7 +1171,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr5.contains( (String)null ) );
         assertTrue( attr5.contains( "d" ) );
 
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         attr6.setHR( false );
         nbAdded = attr6.add( "a", (String)null );
@@ -1187,28 +1188,28 @@ public class DefaultClientAttributeTest
     @Test
     public void testPutByteArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         int nbAdded = attr1.add( (byte[])null );
         assertEquals( 1, nbAdded );
         assertFalse( attr1.isHR() );
         assertTrue( Arrays.equals( NULL_BINARY_VALUE.getBytes(), attr1.getBytes() ) );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr2.add( StringTools.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHR() );
         assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, attr2.getBytes() ) );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr3.add( BYTES1 );
         assertEquals( 1, nbAdded );
         assertFalse( attr3.isHR() );
         assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
         
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr4.add( BYTES1, BYTES2 );
         assertEquals( 2, nbAdded );
@@ -1222,7 +1223,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr4.contains( BYTES3 ) );
         assertTrue( attr4.contains( BYTES4 ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
         
         nbAdded = attr5.add( BYTES1, BYTES2, (byte[])null, BYTES3 );
         assertEquals( 4, nbAdded );
@@ -1232,7 +1233,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr5.contains( (byte[])null ) );
         assertTrue( attr5.contains( BYTES3 ) );
 
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         attr6.setHR( true );
         nbAdded = attr6.add( BYTES1, (byte[])null );
@@ -1249,7 +1250,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testPutValueArray() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         
@@ -1279,7 +1280,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.contains( STR_VALUE3 ) );
         
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         assertEquals( 0, attr2.size() );
         
         attr2.add( NULL_BINARY_VALUE );
@@ -1308,7 +1309,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testPutListOfValues()
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         
@@ -1350,7 +1351,7 @@ public class DefaultClientAttributeTest
         assertTrue( attr1.contains( STR_VALUE3 ) );
         
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         assertEquals( 0, attr2.size() );
         
         list.clear();
@@ -1387,7 +1388,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testToString() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertEquals( "    test: (null)\n", attr1.toString() );
         
@@ -1397,7 +1398,7 @@ public class DefaultClientAttributeTest
         attr1.add( "b" );
         assertEquals( "    test: a\n    test: b\n", attr1.toString() );
 
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
 
         attr2.add( BYTES1 );
         assertEquals( "    test: '0x61 0x62 '\n", attr2.toString() );
@@ -1413,7 +1414,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testHashCode() throws InvalidAttributeValueException, LdapException
     {
-        EntryAttribute attr = new DefaultClientAttribute();
+        EntryAttribute attr = new DefaultEntryAttribute();
         assertEquals( 37, attr.hashCode() );
         
         attr.setHR( true );
@@ -1422,8 +1423,8 @@ public class DefaultClientAttributeTest
         attr.setHR(  false );
         assertEquals( 37*17 + 1237, attr.hashCode() );
 
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         assertEquals( attr1.hashCode(), attr2.hashCode() );
         
@@ -1446,8 +1447,8 @@ public class DefaultClientAttributeTest
         attr2.add( "c", "b", "a" );
         assertNotSame( attr1.hashCode(), attr2.hashCode() );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2 );
         attr4.add( BYTES1, BYTES2 );
@@ -1476,11 +1477,11 @@ public class DefaultClientAttributeTest
     @Test
     public void testEquals()
     {
-        EntryAttribute attr1 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr1 = new DefaultEntryAttribute( "test" );
         
         assertFalse( attr1.equals( null ) );
         
-        EntryAttribute attr2 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
         assertTrue( attr1.equals( attr2 ) );
         
@@ -1501,29 +1502,29 @@ public class DefaultClientAttributeTest
         attr2.setHR( false );
         assertFalse( attr1.equals( attr2 ) );
         
-        EntryAttribute attr3 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr4 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr4 = new DefaultEntryAttribute( "test" );
         
         attr3.add( NULL_BINARY_VALUE );
         attr4.add( NULL_BINARY_VALUE );
         assertTrue( attr3.equals( attr4 ) );
         
-        EntryAttribute attr5 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr6 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr5 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr6 = new DefaultEntryAttribute( "test" );
         
         attr5.add( NULL_BINARY_VALUE );
         attr6.add( NULL_STRING_VALUE );
         assertFalse( attr5.equals( attr6 ) );
 
-        EntryAttribute attr7 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr8 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr7 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr8 = new DefaultEntryAttribute( "test" );
         
         attr7.add( "a" );
         attr8.add( BYTES2 );
         assertFalse( attr7.equals( attr8 ) );
 
-        EntryAttribute attr9 = new DefaultClientAttribute( "test" );
-        EntryAttribute attr10 = new DefaultClientAttribute( "test" );
+        EntryAttribute attr9 = new DefaultEntryAttribute( "test" );
+        EntryAttribute attr10 = new DefaultEntryAttribute( "test" );
         
         attr7.add( "a" );
         attr7.add( BYTES2 );
@@ -1538,7 +1539,7 @@ public class DefaultClientAttributeTest
     @Test
     public void testClone()
     {
-        EntryAttribute attr = new DefaultClientAttribute( "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "test" );
         
         EntryAttribute clone = attr.clone();
         
@@ -1567,12 +1568,12 @@ public class DefaultClientAttributeTest
     @Test
     public void testSerializeCompleteAttribute() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultClientAttribute dca = new DefaultClientAttribute( "CommonName" );
+        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
         dca.setHR( true );
         dca.setId( "CN" );
         dca.add( "test1", "test2" );
 
-        DefaultClientAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1589,11 +1590,11 @@ public class DefaultClientAttributeTest
     @Test
     public void testSerializeAttributeWithNoValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultClientAttribute dca = new DefaultClientAttribute( "CommonName" );
+        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
         dca.setHR( true );
         dca.setId( "CN" );
 
-        DefaultClientAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1609,12 +1610,12 @@ public class DefaultClientAttributeTest
     @Test
     public void testSerializeAttributeNullValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultClientAttribute dca = new DefaultClientAttribute( "CommonName" );
+        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
         dca.setHR( true );
         dca.setId( "CN" );
         dca.add( (String)null );
 
-        DefaultClientAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1632,12 +1633,12 @@ public class DefaultClientAttributeTest
     @Test
     public void testSerializeAttributeBinaryValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultClientAttribute dca = new DefaultClientAttribute( "UserPassword" );
+        DefaultEntryAttribute dca = new DefaultEntryAttribute( "UserPassword" );
         dca.setHR( false );
         byte[] password = StringTools.getBytesUtf8( "secret" );
         dca.add( password );
 
-        DefaultClientAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "userpassword", dcaSer.getId() );
         assertEquals( "UserPassword", dcaSer.getUpId() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java Wed Apr 21 22:51:27 2010
@@ -41,6 +41,7 @@ import java.util.Set;
 
 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.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -77,10 +78,10 @@ public class DefaultClientEntryTest
         {
             Entry entry = new DefaultClientEntry( EXAMPLE_DN );
             
-            EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-            EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-            EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-            EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+            EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+            EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+            EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+            EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
             
             entry.put( attrOC, attrCN, attrSN, attrPWD );
             
@@ -269,9 +270,9 @@ public class DefaultClientEntryTest
     @Test
     public void testDefaultClientEntryLdapDNEntryAttributeArray()
     {
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         Entry entry = new DefaultClientEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
         
@@ -317,7 +318,7 @@ public class DefaultClientEntryTest
         EntryAttribute attr = entry.get( "objectclass" );
         assertEquals( 2, attr.size() );
         
-        EntryAttribute attrCN2 = new DefaultClientAttribute( "cn", "test1", "test3" );
+        EntryAttribute attrCN2 = new DefaultEntryAttribute( "cn", "test1", "test3" );
         entry.add( attrCN2 );
         assertEquals( 4, entry.size() );
         attr = entry.get( "cn" );
@@ -496,10 +497,10 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         assertFalse( entry.contains( attrOC, attrCN ) );
         
@@ -524,7 +525,7 @@ public class DefaultClientEntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
 
         entry.add( attrPWD );
         
@@ -548,10 +549,10 @@ public class DefaultClientEntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2", (String)null );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2", (String)null );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
@@ -577,8 +578,8 @@ public class DefaultClientEntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2", (String)null );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
 
         entry.add( attrCN, attrPWD );
         
@@ -610,10 +611,10 @@ public class DefaultClientEntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
@@ -648,10 +649,10 @@ public class DefaultClientEntryTest
         entry2.setDn( EXAMPLE_DN );
         assertEquals( entry1, entry2 );
 
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry1.put( attrOC, attrCN, attrSN, attrPWD );
         entry2.put( attrOC, attrCN, attrSN );
@@ -660,8 +661,8 @@ public class DefaultClientEntryTest
         entry2.put( attrPWD );
         assertEquals( entry1, entry2 );
         
-        EntryAttribute attrL1 = new DefaultClientAttribute( "l", "Paris", "New-York" );
-        EntryAttribute attrL2 = new DefaultClientAttribute( "l", "Paris", "Tokyo" );
+        EntryAttribute attrL1 = new DefaultEntryAttribute( "l", "Paris", "New-York" );
+        EntryAttribute attrL2 = new DefaultEntryAttribute( "l", "Paris", "Tokyo" );
         
         entry1.put( attrL1 );
         entry2.put( attrL1 );
@@ -689,10 +690,10 @@ public class DefaultClientEntryTest
         
         assertNull( entry.get( "objectClass" ) );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
@@ -742,10 +743,10 @@ public class DefaultClientEntryTest
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry1.add( attrOC, attrCN, attrSN, attrPWD );
         entry2.add( attrOC, attrCN, attrSN, attrPWD );
@@ -770,7 +771,7 @@ public class DefaultClientEntryTest
         assertFalse( entry.containsAttribute( "objectClass" ) );
         assertFalse( entry.hasObjectClass( "top" ) );
         
-        entry.add( new DefaultClientAttribute( "objectClass", "top", "person" ) );
+        entry.add( new DefaultEntryAttribute( "objectClass", "top", "person" ) );
         
         assertTrue( entry.hasObjectClass( "top" ) );
         assertTrue( entry.hasObjectClass( "person" ) );
@@ -819,10 +820,10 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         List<EntryAttribute> removed = entry.put( attrOC, attrCN, attrSN, attrPWD );
         
@@ -833,7 +834,7 @@ public class DefaultClientEntryTest
         assertTrue( entry.containsAttribute( "  sn  " ) );
         assertTrue( entry.containsAttribute( "userPassword" ) );
         
-        EntryAttribute attrCN2 = new DefaultClientAttribute( "cn", "test3", "test4" );
+        EntryAttribute attrCN2 = new DefaultEntryAttribute( "cn", "test3", "test4" );
         removed = entry.put( attrCN2 );
         assertEquals( 4, entry.size() );
         assertEquals( 1, removed.size() );
@@ -1022,10 +1023,10 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
 
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry.put( attrOC, attrCN, attrSN, attrPWD );
         
@@ -1050,10 +1051,10 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
         
-        EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrSN = new DefaultClientAttribute( "sn", "Test1", "Test2" );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2 );
+        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        EntryAttribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry.put( attrOC, attrCN, attrSN, attrPWD );
         
@@ -1082,7 +1083,7 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
         
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
 
         entry.put( attrPWD );
         assertTrue( entry.remove( "userPassword", (byte[])null ) );
@@ -1133,8 +1134,8 @@ public class DefaultClientEntryTest
     {
         Entry entry = new DefaultClientEntry( EXAMPLE_DN );
 
-        EntryAttribute attrCN = new DefaultClientAttribute( "cn", "test1", "test2", (String)null );
-        EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
+        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
 
         entry.add( attrCN, attrPWD );
         

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Wed Apr 21 22:51:27 2010
@@ -27,9 +27,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
@@ -58,7 +58,7 @@ public class AddRequestImplTest
      */
     private EntryAttribute getAttribute( String id )
     {
-        EntryAttribute attr = new DefaultClientAttribute( id );
+        EntryAttribute attr = new DefaultEntryAttribute( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Wed Apr 21 22:51:27 2010
@@ -30,11 +30,11 @@ import java.util.List;
 import java.util.Map;
 
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
@@ -72,19 +72,19 @@ public class ModifyRequestImplTest
             // do nothing
         }
 
-        EntryAttribute attr = new DefaultClientAttribute( "attr0" );
+        EntryAttribute attr = new DefaultEntryAttribute( "attr0" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
         Modification item = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
         req.addModification( item );
 
-        attr = new DefaultClientAttribute( "attr1" );
+        attr = new DefaultEntryAttribute( "attr1" );
         attr.add( "val3" );
         item = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         req.addModification( item );
 
-        attr = new DefaultClientAttribute( "attr2" );
+        attr = new DefaultEntryAttribute( "attr2" );
         attr.add( "val4" );
         attr.add( "val5" );
         item = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
@@ -158,7 +158,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModOps()
     {
         ModifyRequestImpl req0 = getRequest();
-        EntryAttribute attr = new DefaultClientAttribute( "attr3" );
+        EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -166,7 +166,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultClientAttribute( "attr3" );
+        attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -185,7 +185,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModCount()
     {
         ModifyRequestImpl req0 = getRequest();
-        EntryAttribute attr = new DefaultClientAttribute( "attr3" );
+        EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -206,7 +206,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModIds()
     {
         ModifyRequestImpl req0 = getRequest();
-        EntryAttribute attr = new DefaultClientAttribute( "attr3" );
+        EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -214,7 +214,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultClientAttribute( "attr4" );
+        attr = new DefaultEntryAttribute( "attr4" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -233,7 +233,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModValues()
     {
         ModifyRequestImpl req0 = getRequest();
-        EntryAttribute attr = new DefaultClientAttribute( "attr3" );
+        EntryAttribute attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -241,7 +241,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultClientAttribute( "attr3" );
+        attr = new DefaultEntryAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -265,19 +265,19 @@ public class ModifyRequestImplTest
             public Collection<Modification> getModificationItems()
             {
                 List<Modification> list = new ArrayList<Modification>();
-                EntryAttribute attr = new DefaultClientAttribute( "attr0" );
+                EntryAttribute attr = new DefaultEntryAttribute( "attr0" );
                 attr.add( "val0" );
                 attr.add( "val1" );
                 attr.add( "val2" );
                 Modification item = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
                 list.add( item );
 
-                attr = new DefaultClientAttribute( "attr1" );
+                attr = new DefaultEntryAttribute( "attr1" );
                 attr.add( "val3" );
                 item = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
                 list.add( item );
 
-                attr = new DefaultClientAttribute( "attr2" );
+                attr = new DefaultEntryAttribute( "attr2" );
                 attr.add( "val4" );
                 attr.add( "val5" );
                 item = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java Wed Apr 21 22:51:27 2010
@@ -20,9 +20,9 @@
 package org.apache.directory.shared.ldap.message;
 
 
+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.message.SearchResponseEntryImpl;
@@ -48,7 +48,7 @@ public class SearchResponseEntryImplTest
      */
     private EntryAttribute getEntry( String id )
     {
-        EntryAttribute attr = new DefaultClientAttribute( id );
+        EntryAttribute attr = new DefaultEntryAttribute( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java Wed Apr 21 22:51:27 2010
@@ -27,13 +27,13 @@ import static org.junit.Assert.assertTru
 import java.util.HashSet;
 import java.util.Set;
 
+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.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.junit.Test;
@@ -53,7 +53,7 @@ public class AttributeUtilsTest
     public void testApplyAddModificationToEmptyEntry() throws LdapException
     {
         Entry entry = new DefaultClientEntry();
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         Modification modification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
         AttributeUtils.applyModification( entry, modification );
         assertNotNull( entry.get(  "cn" ) );
@@ -72,7 +72,7 @@ public class AttributeUtilsTest
         entry.add( "dc", "apache" );
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         Modification modification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
 
         AttributeUtils.applyModification( entry, modification );
@@ -93,7 +93,7 @@ public class AttributeUtilsTest
         entry.put( "cn", "apache" );
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         Modification modification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
         AttributeUtils.applyModification( entry, modification );
         assertNotNull( entry.get(  "cn" ) );
@@ -131,7 +131,7 @@ public class AttributeUtilsTest
         entry.put( "cn", "test", "apache" );
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         Modification modification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attr );
         AttributeUtils.applyModification( entry, modification );
         assertNotNull( entry.get( "cn" ) );
@@ -166,7 +166,7 @@ public class AttributeUtilsTest
     {
         Entry entry = new DefaultClientEntry();
 
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
 
         Modification modification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         AttributeUtils.applyModification( entry, modification );
@@ -183,10 +183,10 @@ public class AttributeUtilsTest
     {
         Entry entry = new DefaultClientEntry();
 
-        EntryAttribute dc = new DefaultClientAttribute( "dc", "apache" );
+        EntryAttribute dc = new DefaultEntryAttribute( "dc", "apache" );
         entry.put( dc );
         
-        EntryAttribute cn = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute cn = new DefaultEntryAttribute( "cn", "test" );
         
         Modification modification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, cn );
         
@@ -208,10 +208,10 @@ public class AttributeUtilsTest
     {
         Entry entry = new DefaultClientEntry();
 
-        EntryAttribute cn = new DefaultClientAttribute( "cn", "apache" );
+        EntryAttribute cn = new DefaultEntryAttribute( "cn", "apache" );
         entry.put( cn );
         
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         
         Modification modification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         
@@ -234,7 +234,7 @@ public class AttributeUtilsTest
         Entry entry = new DefaultClientEntry();
         entry.put( "cn", "test" );
         
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
 
         Modification modification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         
@@ -257,7 +257,7 @@ public class AttributeUtilsTest
         Entry entry = new DefaultClientEntry();
         entry.put( "cn", "test", "apache" );
         
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
         
         Modification modification = new ClientModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         
@@ -293,7 +293,7 @@ public class AttributeUtilsTest
     {
         Entry entry = new DefaultClientEntry();
         
-        EntryAttribute attr = new DefaultClientAttribute( "cn", "test" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn", "test" );
 
         
         Modification modification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
@@ -315,7 +315,7 @@ public class AttributeUtilsTest
     {
         Entry entry = new DefaultClientEntry();
         
-        EntryAttribute attr = new DefaultClientAttribute( "cn" );
+        EntryAttribute attr = new DefaultEntryAttribute( "cn" );
 
         Modification modification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
         AttributeUtils.applyModification( entry, modification );
@@ -338,7 +338,7 @@ public class AttributeUtilsTest
         entry.put( "cn", "test" );
         entry.put( "ou", "apache", "acme corp" );
         
-        EntryAttribute newOu = new DefaultClientAttribute( "ou", "Big Company", "directory" );
+        EntryAttribute newOu = new DefaultEntryAttribute( "ou", "Big Company", "directory" );
         
         Modification modification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
         
@@ -382,7 +382,7 @@ public class AttributeUtilsTest
         entry.put(  "cn", "test" );
         entry.put( "ou", "apache", "acme corp" );
         
-        EntryAttribute newOu = new DefaultClientAttribute( "ou" );
+        EntryAttribute newOu = new DefaultEntryAttribute( "ou" );
         
         Modification modification = new ClientModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
         



Mime
View raw message