directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087504 [1/4] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ dsml/parser/src/test/java/org/apache/directory/shared/d...
Date Thu, 31 Mar 2011 23:21:52 GMT
Author: elecharny
Date: Thu Mar 31 23:21:50 2011
New Revision: 1087504

URL: http://svn.apache.org/viewvc?rev=1087504&view=rev
Log:
o Renamed the EntryAttribute interface to Attribute
o Made the DefautEntryAttribute() constructor package protected

Added:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Attribute.java
      - copied, changed from r1087352, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
Removed:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
Modified:
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
    directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
    directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
    directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
    directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
    directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
    directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
    directory/shared/trunk/ldap/extras/aci/src/main/antlr/ACIItem.g
    directory/shared/trunk/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
    directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
    directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Entry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/ImmutableEntry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Modification.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReader.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
    directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Thu Mar 31 23:21:50 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -50,7 +50,7 @@ public class SearchResultEntryDsml 
     private static final String SEARCH_RESULT_ENTRY_TAG = "searchResultEntry";
 
     /** The current attribute being processed */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
     
     
     /**
@@ -76,7 +76,7 @@ public class SearchResultEntryDsml 
     
     
     
-    public EntryAttribute getCurrentAttribute()
+    public Attribute getCurrentAttribute()
     {
         return currentAttribute;
     }
@@ -142,7 +142,7 @@ public class SearchResultEntryDsml 
         element.addAttribute( "dn", searchResultEntry.getObjectName().getName() );
 
         Entry entry = searchResultEntry.getEntry();
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
 
             Element attributeElement = element.addElement( "attr" );

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Thu Mar 31 23:21:50 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
@@ -48,7 +48,7 @@ public class AddRequestDsml 
 {
 
     /** The current attribute being decoded */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
     
     
     /**
@@ -162,7 +162,7 @@ public class AddRequestDsml 
         Entry entry = getDecorated().getEntry();
         if ( entry != null )
         {
-            for ( EntryAttribute attribute : entry )
+            for ( Attribute attribute : entry )
             {
                 Element attributeElement = element.addElement( "attr" );
                 attributeElement.addAttribute( "name", attribute.getId() );

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Thu Mar 31 23:21:50 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -53,7 +53,7 @@ public class ModifyRequestDsml 
 {
 
     /** The current attribute being decoded */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
 
     /** A local storage for the operation */
     private ModificationOperation currentOperation;
@@ -290,7 +290,7 @@ public class ModifyRequestDsml 
     /**
      * {@inheritDoc}
      */
-    public void remove( EntryAttribute attr )
+    public void remove( Attribute attr )
     {
         getDecorated().remove( attr );
     }
@@ -299,7 +299,7 @@ public class ModifyRequestDsml 
     /**
      * {@inheritDoc}
      */
-    public void addModification( EntryAttribute attr, ModificationOperation modOp )
+    public void addModification( Attribute attr, ModificationOperation modOp )
     {
         getDecorated().addModification( attr, modOp );
     }
@@ -326,7 +326,7 @@ public class ModifyRequestDsml 
     /**
      * {@inheritDoc}
      */
-    public void add( EntryAttribute attr )
+    public void add( Attribute attr )
     {
         getDecorated().add( attr );
     }
@@ -362,7 +362,7 @@ public class ModifyRequestDsml 
     /**
      * {@inheritDoc}
      */
-    public void replace( EntryAttribute attr )
+    public void replace( Attribute attr )
     {
         getDecorated().replace( attr );
     }

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Thu Mar 31 23:21:50 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -329,8 +329,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute  
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value
@@ -366,8 +366,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute       
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value
@@ -403,8 +403,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute       
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value
@@ -442,8 +442,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute       
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value
@@ -482,8 +482,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute       
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value
@@ -535,8 +535,8 @@ public class AddRequestTest extends Abst
         assertEquals( 1, entry.size() );
 
         // Getting the Attribute       
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
 
         // Getting the Value

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Thu Mar 31 23:21:50 2011
@@ -37,7 +37,7 @@ import javax.naming.NamingException;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -310,7 +310,7 @@ public class ModifyRequestTest extends A
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
 
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
 
         assertEquals( "directreport", attribute.getId() );
         assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getString() );
@@ -346,7 +346,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.size() );
 
         Modification modification = modifications.iterator().next();
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
 
@@ -393,7 +393,7 @@ public class ModifyRequestTest extends A
         Modification modification = iter.next();
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
         assertEquals( "directreport", attribute.getId() );
 
         assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getString() );
@@ -568,7 +568,7 @@ public class ModifyRequestTest extends A
         Modification modification = modifications.iterator().next();
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
 
         assertEquals( "directreport", attribute.getId() );
         assertEquals( 0, attribute.size() );
@@ -605,7 +605,7 @@ public class ModifyRequestTest extends A
         Modification modification = modifications.iterator().next();
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
 
         assertEquals( "directreport", attribute.getId() );
 
@@ -646,7 +646,7 @@ public class ModifyRequestTest extends A
         Modification modification = modifications.iterator().next();
 
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() );
-        EntryAttribute attribute = modification.getAttribute();
+        Attribute attribute = modification.getAttribute();
 
         assertEquals( "directreport", attribute.getId() );
 

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Thu Mar 31 23:21:50 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponseDsml;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
@@ -349,8 +349,8 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 1, entry.size() );
 
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "dc", attribute.getUpId() );
     }
 
@@ -382,8 +382,8 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 1, entry.size() );
 
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "dc", attribute.getUpId() );
 
         Iterator<Value<?>> valueIterator = attribute.iterator();
@@ -421,8 +421,8 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 1, entry.size() );
 
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "cn", attribute.getUpId() );
         assertEquals( 1, attribute.size() );
 
@@ -464,8 +464,8 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 1, entry.size() );
 
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "dc", attribute.getUpId() );
         assertEquals( 1, attribute.size() );
 
@@ -503,8 +503,8 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 1, entry.size() );
 
-        Iterator<EntryAttribute> attributeIterator = entry.iterator();
-        EntryAttribute attribute = attributeIterator.next();
+        Iterator<Attribute> attributeIterator = entry.iterator();
+        Attribute attribute = attributeIterator.next();
         assertEquals( "objectclass", attribute.getUpId() );
         assertEquals( 2, attribute.size() );
 
@@ -546,7 +546,7 @@ public class SearchResultEntryTest exten
         Entry entry = searchResultEntry.getEntry();
         assertEquals( 2, entry.size() );
 
-        EntryAttribute objectClassAttribute = entry.get( "objectclass" );
+        Attribute objectClassAttribute = entry.get( "objectclass" );
         assertEquals( 1, objectClassAttribute.size() );
 
         Iterator<Value<?>> valueIterator = objectClassAttribute.iterator();
@@ -555,7 +555,7 @@ public class SearchResultEntryTest exten
         assertEquals( "top", value.getString() );
         assertFalse( valueIterator.hasNext() );
 
-        EntryAttribute dcAttribute = entry.get( "dc" );
+        Attribute dcAttribute = entry.get( "dc" );
         assertEquals( 1, objectClassAttribute.size() );
 
         valueIterator = dcAttribute.iterator();

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Thu Mar 31 23:21:50 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -81,10 +81,10 @@ public class EntryTest
         {
             Entry entry = new DefaultEntry( EXAMPLE_DN );
             
-            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 );
+            Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+            Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+            Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+            Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
             
             entry.put( attrOC, attrCN, attrSN, attrPWD );
             
@@ -256,9 +256,9 @@ public class EntryTest
     @Test
     public void testDefaultClientEntryLdapDNEntryAttributeArray()
     {
-        EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
-        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
-        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         Entry entry = new DefaultEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
         
@@ -278,7 +278,7 @@ public class EntryTest
         assertTrue( entry.containsAttribute( "OBJECTCLASS" ) );
         assertTrue( entry.containsAttribute( "CN" ) );
         
-        entry = new DefaultEntry( EXAMPLE_DN, attrOC, (EntryAttribute)null );
+        entry = new DefaultEntry( EXAMPLE_DN, attrOC, (Attribute)null );
         assertNotNull( entry );
         assertNotNull( entry.getDn() );
         assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -301,10 +301,10 @@ public class EntryTest
         assertTrue( entry.containsAttribute( "  sn  " ) );
         assertTrue( entry.containsAttribute( "userPassword" ) );
     
-        EntryAttribute attr = entry.get( "objectclass" );
+        Attribute attr = entry.get( "objectclass" );
         assertEquals( 2, attr.size() );
         
-        EntryAttribute attrCN2 = new DefaultEntryAttribute( "cn", "test1", "test3" );
+        Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test1", "test3" );
         entry.add( attrCN2 );
         assertEquals( 4, entry.size() );
         attr = entry.get( "cn" );
@@ -333,14 +333,14 @@ public class EntryTest
         
         entry.add( "userPassword", (byte[])null );
         assertEquals( 1, entry.size() );
-        EntryAttribute attributePWD = entry.get( "userPassword" );
+        Attribute attributePWD = entry.get( "userPassword" );
         assertEquals( 1, attributePWD.size() );
         assertNotNull( attributePWD.get() );
         assertNull( attributePWD.get().getValue() );
         
         entry.add( "jpegPhoto", BYTES1, BYTES1, BYTES2 );
         assertEquals( 2, entry.size() );
-        EntryAttribute attributeJPG = entry.get( "jpegPhoto" );
+        Attribute attributeJPG = entry.get( "jpegPhoto" );
         assertEquals( 2, attributeJPG.size() );
         assertNotNull( attributeJPG.get() );
         assertTrue( attributeJPG.contains( BYTES1 ) );
@@ -358,14 +358,14 @@ public class EntryTest
         
         entry.add( "cn", (String)null );
         assertEquals( 1, entry.size() );
-        EntryAttribute attributeCN = entry.get( "cn" );
+        Attribute attributeCN = entry.get( "cn" );
         assertEquals( 1, attributeCN.size() );
         assertNotNull( attributeCN.get() );
         assertNull( attributeCN.get().getValue() );
         
         entry.add( "sn", "test", "test", "TEST" );
         assertEquals( 2, entry.size() );
-        EntryAttribute attributeSN = entry.get( "sn" );
+        Attribute attributeSN = entry.get( "sn" );
         assertEquals( 2, attributeSN.size() );
         assertNotNull( attributeSN.get() );
         assertTrue( attributeSN.contains( "test" ) );
@@ -385,7 +385,7 @@ public class EntryTest
         
         entry.add( "cn", value );
         assertEquals( 1, entry.size() );
-        EntryAttribute attributeCN = entry.get( "cn" );
+        Attribute attributeCN = entry.get( "cn" );
         assertEquals( 1, attributeCN.size() );
         assertNotNull( attributeCN.get() );
         assertNull( attributeCN.get().getValue() );
@@ -396,7 +396,7 @@ public class EntryTest
 
         entry.add( "sn", value1, value2, value3 );
         assertEquals( 2, entry.size() );
-        EntryAttribute attributeSN = entry.get( "sn" );
+        Attribute attributeSN = entry.get( "sn" );
         assertEquals( 2, attributeSN.size() );
         assertNotNull( attributeSN.get() );
         assertTrue( attributeSN.contains( value1 ) );
@@ -405,7 +405,7 @@ public class EntryTest
         Value<byte[]> value4 = new BinaryValue( BYTES1 );
         entry.add( "l", value1, value4 );
         assertEquals( 3, entry.size() );
-        EntryAttribute attributeL = entry.get( "l" );
+        Attribute attributeL = entry.get( "l" );
         assertEquals( 2, attributeL.size() );
         assertNotNull( attributeL.get() );
         assertTrue( attributeL.contains( value1 ) );
@@ -483,10 +483,10 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         assertFalse( entry.contains( attrOC, attrCN ) );
         
@@ -511,7 +511,7 @@ public class EntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
 
         entry.add( attrPWD );
         
@@ -535,10 +535,10 @@ public class EntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2", (String)null );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
@@ -564,8 +564,8 @@ public class EntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
-        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
 
         entry.add( attrCN, attrPWD );
         
@@ -597,10 +597,10 @@ public class EntryTest
         
         assertFalse( entry.containsAttribute( "objectClass" ) );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
@@ -635,10 +635,10 @@ public class EntryTest
         entry2.setDn( EXAMPLE_DN );
         assertEquals( entry1, entry2 );
 
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry1.put( attrOC, attrCN, attrSN, attrPWD );
         entry2.put( attrOC, attrCN, attrSN );
@@ -647,8 +647,8 @@ public class EntryTest
         entry2.put( attrPWD );
         assertEquals( entry1, entry2 );
         
-        EntryAttribute attrL1 = new DefaultEntryAttribute( "l", "Paris", "New-York" );
-        EntryAttribute attrL2 = new DefaultEntryAttribute( "l", "Paris", "Tokyo" );
+        Attribute attrL1 = new DefaultEntryAttribute( "l", "Paris", "New-York" );
+        Attribute attrL2 = new DefaultEntryAttribute( "l", "Paris", "Tokyo" );
         
         entry1.put( attrL1 );
         entry2.put( attrL1 );
@@ -676,15 +676,15 @@ public class EntryTest
         
         assertNull( entry.get( "objectClass" ) );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
         
         assertNotNull( entry.get( "  CN  " ) );
-        EntryAttribute attribute = entry.get( "cN" );
+        Attribute attribute = entry.get( "cN" );
         
         assertEquals( attribute, attrCN );
         
@@ -729,10 +729,10 @@ public class EntryTest
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
 
         entry1.add( attrOC, attrCN, attrSN, attrPWD );
         entry2.add( attrOC, attrCN, attrSN, attrPWD );
@@ -775,7 +775,7 @@ public class EntryTest
     {
         Entry entry = createEntry();
         
-        Iterator<EntryAttribute> iterator = entry.iterator();
+        Iterator<Attribute> iterator = entry.iterator();
         
         assertTrue( iterator.hasNext() );
         
@@ -787,7 +787,7 @@ public class EntryTest
         
         while ( iterator.hasNext() )
         {
-            EntryAttribute attribute = iterator.next();
+            Attribute attribute = iterator.next();
             
             String id = attribute.getId();
             assertTrue( expectedIds.contains( id ) );
@@ -806,12 +806,12 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
-        List<EntryAttribute> removed = entry.put( attrOC, attrCN, attrSN, attrPWD );
+        List<Attribute> removed = entry.put( attrOC, attrCN, attrSN, attrPWD );
         
         assertEquals( 4, entry.size() );
         assertEquals( 0, removed.size() );
@@ -820,7 +820,7 @@ public class EntryTest
         assertTrue( entry.containsAttribute( "  sn  " ) );
         assertTrue( entry.containsAttribute( "userPassword" ) );
         
-        EntryAttribute attrCN2 = new DefaultEntryAttribute( "cn", "test3", "test4" );
+        Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test3", "test4" );
         removed = entry.put( attrCN2 );
         assertEquals( 4, entry.size() );
         assertEquals( 1, removed.size() );
@@ -867,7 +867,7 @@ public class EntryTest
         assertEquals( 2, entry.size() );
         assertNotNull( entry.get( "jpegPhoto" ) );
         assertEquals( 2, entry.get( "JPEGPhoto" ).size() );
-        EntryAttribute attribute = entry.get( "jpegPhoto" );
+        Attribute attribute = entry.get( "jpegPhoto" );
         assertTrue( attribute.contains( BYTES1 ) );
         assertTrue( attribute.contains( BYTES2 ) );
         assertEquals( "jpegphoto", attribute.getId() );
@@ -913,7 +913,7 @@ public class EntryTest
         assertEquals( 2, entry.size() );
         assertNotNull( "objectclass", entry.get( "sn" ) );
         assertEquals( 2, entry.get( "OBJECTCLASS" ).size() );
-        EntryAttribute attribute = entry.get( "objectClass" );
+        Attribute attribute = entry.get( "objectClass" );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "person" ) );
         assertEquals( "objectclass", attribute.getId() );
@@ -971,7 +971,7 @@ public class EntryTest
         assertEquals( 1, entry.size() );
         assertNotNull( "objectclass", entry.get( "objectclass" ) );
         assertEquals( 3, entry.get( "OBJECTCLASS" ).size() );
-        EntryAttribute attribute = entry.get( "objectClass" );
+        Attribute attribute = entry.get( "objectClass" );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "person" ) );
         assertTrue( attribute.contains( (String)null ) );
@@ -1009,10 +1009,10 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
 
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry.put( attrOC, attrCN, attrSN, attrPWD );
         
@@ -1021,7 +1021,7 @@ public class EntryTest
         assertFalse( entry.containsAttribute( "cn", "sn" ) );
         assertTrue( entry.containsAttribute( "objectclass", "userpassword" ) );
         
-        List<EntryAttribute> removed = entry.removeAttributes( "badId" );
+        List<Attribute> removed = entry.removeAttributes( "badId" );
         assertNull( removed );
         
         removed = entry.removeAttributes( (String )null );
@@ -1037,14 +1037,14 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
         
-        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 );
+        Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
+        Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
         
         entry.put( attrOC, attrCN, attrSN, attrPWD );
         
-        List<EntryAttribute> removed = entry.remove( attrSN, attrPWD );
+        List<Attribute> removed = entry.remove( attrSN, attrPWD );
         
         assertEquals( 2, removed.size() ); 
         assertEquals( 2, entry.size() );
@@ -1069,7 +1069,7 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
         
-        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
 
         entry.put( attrPWD );
         assertTrue( entry.remove( "userPassword", (byte[])null ) );
@@ -1120,8 +1120,8 @@ public class EntryTest
     {
         Entry entry = new DefaultEntry( EXAMPLE_DN );
 
-        EntryAttribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
-        EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+        Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
+        Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
 
         entry.add( attrCN, attrPWD );
         
@@ -1163,7 +1163,7 @@ public class EntryTest
         entry.add( "cn", "test1", "test2" );
         entry.add( "sn", "Test" );
         
-        List<EntryAttribute> removed = entry.set( "objectClass", "CN", "givenName" );
+        List<Attribute> removed = entry.set( "objectClass", "CN", "givenName" );
         
         assertEquals( 4, entry.size() );
         assertNotNull( entry.get( "objectclass" ) );

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java Thu Mar 31 23:21:50 2011
@@ -27,8 +27,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -73,7 +73,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeNoStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( cn );
+        Attribute attribute1 = new DefaultEntryAttribute( cn );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -85,7 +85,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( cn );
         attribute2.readExternal( in );
         attribute2.apply( cn );
 
@@ -96,7 +96,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeOneStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( "CommonName", cn, "test" );
+        Attribute attribute1 = new DefaultEntryAttribute( "CommonName", cn, "test" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -108,7 +108,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( cn );
         attribute2.readExternal( in );
         attribute2.apply( cn );
 
@@ -120,7 +120,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeManyStringValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( "CN", cn, "test1", "test2", "test3" );
+        Attribute attribute1 = new DefaultEntryAttribute( "CN", cn, "test1", "test2", "test3" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -132,7 +132,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( cn );
         attribute2.readExternal( in );
         attribute2.apply( cn );
 
@@ -144,7 +144,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeNoBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( userCertificate );
+        Attribute attribute1 = new DefaultEntryAttribute( userCertificate );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -156,7 +156,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
         attribute2.readExternal( in );
         attribute2.apply( userCertificate );
 
@@ -167,7 +167,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeOneBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( userCertificate, data1 );
+        Attribute attribute1 = new DefaultEntryAttribute( userCertificate, data1 );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -179,7 +179,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
         attribute2.readExternal( in );
         attribute2.apply( userCertificate );
 
@@ -190,7 +190,7 @@ public class SchemaAwareEntryAttributeSe
     @Test
     public void testEntryAttributeManyBinaryValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute1 = new DefaultEntryAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
+        Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -202,7 +202,7 @@ public class SchemaAwareEntryAttributeSe
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
         attribute2.readExternal( in );
         attribute2.apply( userCertificate );
 

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java Thu Mar 31 23:21:50 2011
@@ -30,7 +30,7 @@ import java.io.ObjectOutputStream;
 
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -121,7 +121,7 @@ public class SchemaAwareModificationSeri
             Modification modification = new DefaultModification();
             modification.readExternal( oIn );
 
-            EntryAttribute attribute = modification.getAttribute();
+            Attribute attribute = modification.getAttribute();
             
             if ( ( attribute != null ) && ( schemaManager != null ) )
             {
@@ -156,7 +156,7 @@ public class SchemaAwareModificationSeri
     @Test 
     public void testCreateServerModification() throws LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+        Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
         attribute.add( "test1", "test2" );
         
         Modification mod = new DefaultModification( CN_AT, ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -164,7 +164,7 @@ public class SchemaAwareModificationSeri
         
         attribute.remove( "test2" );
         
-        EntryAttribute clonedAttribute = clone.getAttribute();
+        Attribute clonedAttribute = clone.getAttribute();
         
         assertEquals( 1, mod.getAttribute().size() );
         assertTrue( mod.getAttribute().contains( "test1" ) );
@@ -178,7 +178,7 @@ public class SchemaAwareModificationSeri
     @Test
     public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+        Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -192,7 +192,7 @@ public class SchemaAwareModificationSeri
     @Test
     public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+        Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -206,7 +206,7 @@ public class SchemaAwareModificationSeri
     @Test
     public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+        Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Thu Mar 31 23:21:50 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -2035,7 +2035,7 @@ public class LdapNetworkConnection exten
         ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( entry.getDn() );
 
-        Iterator<EntryAttribute> itr = entry.iterator();
+        Iterator<Attribute> itr = entry.iterator();
         while ( itr.hasNext() )
         {
             modReq.addModification( itr.next(), modOp );
@@ -3195,7 +3195,7 @@ public class LdapNetworkConnection exten
 
         supportedControls = new ArrayList<String>();
 
-        EntryAttribute attr = rootDSE.get( SchemaConstants.SUPPORTED_CONTROL_AT );
+        Attribute attr = rootDSE.get( SchemaConstants.SUPPORTED_CONTROL_AT );
 
         for ( Value<?> value : attr )
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Thu Mar 31 23:21:50 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
@@ -61,7 +61,7 @@ public final class AddRequestDecorator e
     private List<Integer> valuesLength;
 
     /** The current attribute being decoded */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
 
     
     /**
@@ -318,7 +318,7 @@ public final class AddRequestDecorator e
             List<Integer> valuesLength = new LinkedList<Integer>();
 
             // Compute the attributes length
-            for ( EntryAttribute attribute : entry )
+            for ( Attribute attribute : entry )
             {
                 int localAttributeLength = 0;
                 int localValuesLength = 0;
@@ -408,7 +408,7 @@ public final class AddRequestDecorator e
                 int attributeNumber = 0;
 
                 // Compute the attributes length
-                for ( EntryAttribute attribute : entry )
+                for ( Attribute attribute : entry )
                 {
                     // The attributes list sequence
                     buffer.put( UniversalTag.SEQUENCE.getValue() );

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Thu Mar 31 23:21:50 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -68,7 +68,7 @@ public class ModifyRequestDecorator exte
     private List<Integer> valuesLength = new LinkedList<Integer>();
 
     /** The current attribute being decoded */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
 
     /** A local storage for the operation */
     private ModificationOperation currentOperation;
@@ -303,7 +303,7 @@ public class ModifyRequestDecorator exte
     /**
      * {@inheritDoc}
      */
-    public void remove( EntryAttribute attr )
+    public void remove( Attribute attr )
     {
         getDecorated().remove( attr );
     }
@@ -312,7 +312,7 @@ public class ModifyRequestDecorator exte
     /**
      * {@inheritDoc}
      */
-    public void addModification( EntryAttribute attr, ModificationOperation modOp )
+    public void addModification( Attribute attr, ModificationOperation modOp )
     {
         getDecorated().addModification( attr, modOp );
     }
@@ -339,7 +339,7 @@ public class ModifyRequestDecorator exte
     /**
      * {@inheritDoc}
      */
-    public void add( EntryAttribute attr )
+    public void add( Attribute attr )
     {
         getDecorated().add( attr );
     }
@@ -375,7 +375,7 @@ public class ModifyRequestDecorator exte
     /**
      * {@inheritDoc}
      */
-    public void replace( EntryAttribute attr )
+    public void replace( Attribute attr )
     {
         getDecorated().replace( attr );
     }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Thu Mar 31 23:21:50 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -66,7 +66,7 @@ public class SearchResultEntryDecorator 
     private List<Integer> valsLength;
     
     /** The current attribute being processed */
-    private EntryAttribute currentAttribute;
+    private Attribute currentAttribute;
 
 
     /**
@@ -177,7 +177,7 @@ public class SearchResultEntryDecorator 
     }
     
     
-    public EntryAttribute getCurrentAttribute()
+    public Attribute getCurrentAttribute()
     {
         return currentAttribute;
     }
@@ -325,7 +325,7 @@ public class SearchResultEntryDecorator 
             setValsLength( valsLength );
 
             // Compute the attributes length
-            for ( EntryAttribute attribute : entry )
+            for ( Attribute attribute : entry )
             {
                 int localAttributeLength = 0;
                 int localValuesLength = 0;
@@ -436,7 +436,7 @@ public class SearchResultEntryDecorator 
                 int attributeNumber = 0;
 
                 // Compute the attributes length
-                for ( EntryAttribute attribute : entry )
+                for ( Attribute attribute : entry )
                 {
                     // The partial attribute list sequence
                     buffer.put( UniversalTag.SEQUENCE.getValue() );

Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Thu Mar 31 23:21:50 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.decorators.AddRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.*;
 import org.apache.directory.shared.util.Strings;
@@ -154,7 +154,7 @@ public class AddRequestTest extends Abst
         lVal2.add( "test3" );
         typesVals.put( "attrs", lVal2 );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertTrue( expectedTypes.contains( attribute.getId().toLowerCase() ) );
 
@@ -676,7 +676,7 @@ public class AddRequestTest extends Abst
 
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertEquals( "l", attribute.getId().toLowerCase() );
 
@@ -768,7 +768,7 @@ public class AddRequestTest extends Abst
 
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertEquals( "l", attribute.getId().toLowerCase() );
 

Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Thu Mar 31 23:21:50 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException;
 import org.apache.directory.shared.ldap.codec.decorators.ModifyRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -134,7 +134,7 @@ public class ModifyRequestTest extends A
 
         for ( Modification modification : modifications )
         {
-            EntryAttribute attribute = modification.getAttribute();
+            Attribute attribute = modification.getAttribute();
 
             if ( "l".equalsIgnoreCase( attribute.getUpId() ) )
             {
@@ -304,7 +304,7 @@ public class ModifyRequestTest extends A
         assertEquals( 2, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "telephonenumber", attributeValue.getId().toLowerCase() );
 
@@ -438,7 +438,7 @@ public class ModifyRequestTest extends A
         assertEquals( 3, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "description", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -566,7 +566,7 @@ public class ModifyRequestTest extends A
         assertEquals( 2, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
 
@@ -1104,7 +1104,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -1185,7 +1185,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -1273,7 +1273,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 2, attributeValue.size() );

Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Thu Mar 31 23:21:50 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.decorators.SearchResultEntryDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.apache.directory.shared.util.Strings;
@@ -122,7 +122,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
 
@@ -226,7 +226,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < expectedAttributes.length; i++ )
         {
-            EntryAttribute attribute = entry.get( expectedAttributes[i] );
+            Attribute attribute = entry.get( expectedAttributes[i] );
 
             assertEquals( expectedAttributes[i].toLowerCase(), attribute.getUpId().toLowerCase() );
 
@@ -334,7 +334,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
 
@@ -835,7 +835,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
             assertEquals( 0, attribute.size() );
@@ -920,7 +920,7 @@ public class SearchResultEntryTest exten
 
         assertEquals( 2, entry.size() );
 
-        EntryAttribute attribute = entry.get( "objectclass" );
+        Attribute attribute = entry.get( "objectclass" );
         assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
         assertEquals( 0, attribute.size() );
 
@@ -1012,7 +1012,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
 
@@ -1110,7 +1110,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
 
@@ -1204,7 +1204,7 @@ public class SearchResultEntryTest exten
 
         for ( int i = 0; i < entry.size(); i++ )
         {
-            EntryAttribute attribute = entry.get( "objectclass" );
+            Attribute attribute = entry.get( "objectclass" );
 
             assertEquals( "objectClass".toLowerCase(), attribute.getUpId().toLowerCase() );
 

Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Thu Mar 31 23:21:50 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.decorators.AddRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.*;
 import org.apache.directory.shared.util.Strings;
@@ -154,7 +154,7 @@ public class AddRequestTest extends Abst
         lVal2.add( "test3" );
         typesVals.put( "attrs", lVal2 );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertTrue( expectedTypes.contains( attribute.getId().toLowerCase() ) );
 
@@ -676,7 +676,7 @@ public class AddRequestTest extends Abst
 
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertEquals( "l", attribute.getId().toLowerCase() );
 
@@ -768,7 +768,7 @@ public class AddRequestTest extends Abst
 
         assertEquals( 1, entry.size() );
 
-        EntryAttribute attribute = entry.get( "l" );
+        Attribute attribute = entry.get( "l" );
 
         assertEquals( "l", attribute.getId().toLowerCase() );
 

Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1087504&r1=1087503&r2=1087504&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Thu Mar 31 23:21:50 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException;
 import org.apache.directory.shared.ldap.codec.decorators.ModifyRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -134,7 +134,7 @@ public class ModifyRequestTest extends A
 
         for ( Modification modification : modifications )
         {
-            EntryAttribute attribute = modification.getAttribute();
+            Attribute attribute = modification.getAttribute();
 
             if ( "l".equalsIgnoreCase( attribute.getUpId() ) )
             {
@@ -304,7 +304,7 @@ public class ModifyRequestTest extends A
         assertEquals( 2, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "telephonenumber", attributeValue.getUpId().toLowerCase() );
 
@@ -438,7 +438,7 @@ public class ModifyRequestTest extends A
         assertEquals( 3, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "description", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -566,7 +566,7 @@ public class ModifyRequestTest extends A
         assertEquals( 2, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
 
@@ -1103,7 +1103,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -1184,7 +1184,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 0, attributeValue.size() );
@@ -1272,7 +1272,7 @@ public class ModifyRequestTest extends A
         assertEquals( 1, modifications.length );
 
         Modification modification = ( Modification ) modifications[0];
-        EntryAttribute attributeValue = modification.getAttribute();
+        Attribute attributeValue = modification.getAttribute();
 
         assertEquals( "l", attributeValue.getUpId().toLowerCase() );
         assertEquals( 2, attributeValue.size() );



Mime
View raw message