directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087506 [6/6] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/java/org/apache/directory/server/core/entry/ core-a...
Date Thu, 31 Mar 2011 23:29:27 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java Thu Mar 31 23:29:24 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
 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.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.message.ModifyResponse;
@@ -278,7 +278,7 @@ public class AdministrativePointModifyDe
     }
 
 
-    private EntryAttribute getAdminRole( String dn ) throws Exception
+    private Attribute getAdminRole( String dn ) throws Exception
     {
         Entry lookup = connection.lookup( dn, "administrativeRole" );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java Thu Mar 31 23:29:24 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
 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.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.message.ModifyResponse;
@@ -277,7 +277,7 @@ public class AdministrativePointModifyIT
     }
 
 
-    private EntryAttribute getAdminRole( String dn ) throws Exception
+    private Attribute getAdminRole( String dn ) throws Exception
     {
         Entry lookup = connection.lookup( dn, "administrativeRole" );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java Thu Mar 31 23:29:24 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.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.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
@@ -148,7 +148,7 @@ public class AdministrativePointPersiste
     }
 
 
-    private EntryAttribute getAdminRole( String dn ) throws Exception
+    private Attribute getAdminRole( String dn ) throws Exception
     {
         Entry lookup = connection.lookup( dn, "administrativeRole" );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Thu Mar 31 23:29:24 2011
@@ -40,7 +40,6 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.PartialResultException;
 import javax.naming.ReferralException;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
@@ -84,11 +83,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.csn.Csn;
 import org.apache.directory.shared.ldap.model.csn.CsnFactory;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 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.DefaultModification;
 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.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
@@ -208,7 +207,7 @@ public class AddIT extends AbstractLdapT
         // Read again from directory
         person = ( DirContext ) ctx.lookup( RDN );
         attributes = person.getAttributes( "" );
-        Attribute newOcls = attributes.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = attributes.get( "objectClass" );
 
         String[] expectedOcls =
             { "top", "person", "organizationalPerson", "inetOrgPerson" };
@@ -234,7 +233,7 @@ public class AddIT extends AbstractLdapT
 
         // modify object classes, add two more
         Attributes attributes = new BasicAttributes( true );
-        Attribute desc = new BasicAttribute( "description", newDescription );
+        javax.naming.directory.Attribute desc = new BasicAttribute( "description", newDescription );
         attributes.put( desc );
 
         DirContext person = ( DirContext ) ctx.lookup( RDN );
@@ -243,7 +242,7 @@ public class AddIT extends AbstractLdapT
         // Read again from directory
         person = ( DirContext ) ctx.lookup( RDN );
         attributes = person.getAttributes( "" );
-        Attribute newDesc = attributes.get( "description" );
+        javax.naming.directory.Attribute newDesc = attributes.get( "description" );
 
         assertTrue( "new Description", newDesc.contains( newDescription ) );
     }
@@ -261,7 +260,7 @@ public class AddIT extends AbstractLdapT
 
         // person without sn
         Attributes attrs = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         attrs.put( ocls );
@@ -309,7 +308,7 @@ public class AddIT extends AbstractLdapT
         // Analyze entry and description attribute
         Entry kateReloaded = con.lookup( dn );
         assertNotNull( kateReloaded );
-        EntryAttribute attr = kateReloaded.get( "description" );
+        Attribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
         assertEquals( 2, attr.size() );
 
@@ -349,7 +348,7 @@ public class AddIT extends AbstractLdapT
         // Analyze entry and description attribute
         Entry kateReloaded = con.lookup( dn );
         assertNotNull( kateReloaded );
-        EntryAttribute attr = kateReloaded.get( "description" );
+        Attribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
         assertEquals( 2, attr.size() );
 
@@ -390,7 +389,7 @@ public class AddIT extends AbstractLdapT
         // Analyze entry and description attribute
         Entry kateReloaded = con.lookup( dn );
         assertNotNull( kateReloaded );
-        EntryAttribute attr = kateReloaded.get( "description" );
+        Attribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
         assertEquals( 2, attr.size() );
 
@@ -413,13 +412,13 @@ public class AddIT extends AbstractLdapT
 
         // add inetOrgPerson with two displayNames
         Attributes attrs = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "inetOrgPerson" );
         attrs.put( ocls );
         attrs.put( "cn", "Fiona Apple" );
         attrs.put( "sn", "Apple" );
-        Attribute displayName = new BasicAttribute( "displayName" );
+        javax.naming.directory.Attribute displayName = new BasicAttribute( "displayName" );
         displayName.add( "Fiona" );
         displayName.add( "Fiona A." );
         attrs.put( displayName );
@@ -447,7 +446,7 @@ public class AddIT extends AbstractLdapT
 
         // Create entry
         Attributes entry = new BasicAttributes( true );
-        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -458,7 +457,7 @@ public class AddIT extends AbstractLdapT
         // Create Alias
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
         Attributes alias = new BasicAttributes( true );
-        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -487,7 +486,7 @@ public class AddIT extends AbstractLdapT
 
         // Create container
         Attributes container = new BasicAttributes( true );
-        Attribute containerOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute containerOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         containerOcls.add( SchemaConstants.TOP_OC );
         containerOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         container.put( containerOcls );
@@ -497,7 +496,7 @@ public class AddIT extends AbstractLdapT
 
         // Create entry
         Attributes entry = new BasicAttributes( true );
-        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -508,7 +507,7 @@ public class AddIT extends AbstractLdapT
         // Create alias ou=bestFruit,ou=Fruits to entry ou=favorite,ou=Fruits
         String aliasedObjectName = entryRdn + "," + containerCtx.getNameInNamespace();
         Attributes alias = new BasicAttributes( true );
-        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -582,7 +581,7 @@ public class AddIT extends AbstractLdapT
 
         // Create entry ou=favorite,ou=system
         Attributes entry = new BasicAttributes( true );
-        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -593,7 +592,7 @@ public class AddIT extends AbstractLdapT
         // Create Alias ou=bestFruit,ou=system to ou=favorite
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
         Attributes alias = new BasicAttributes( true );
-        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -625,7 +624,7 @@ public class AddIT extends AbstractLdapT
 
         // Create entry ou=favorite,dc=example,dc=com
         Attributes entry = new BasicAttributes( true );
-        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -636,7 +635,7 @@ public class AddIT extends AbstractLdapT
         // Create Alias ou=bestFruit,dc=example,dc=com to ou=favorite
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
         Attributes alias = new BasicAttributes( true );
-        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -668,7 +667,7 @@ public class AddIT extends AbstractLdapT
 
         // Create entry ou=favorite,dc=directory,dc=apache,dc=org
         Attributes entry = new BasicAttributes( true );
-        Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute entryOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         entryOcls.add( SchemaConstants.TOP_OC );
         entryOcls.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
         entry.put( entryOcls );
@@ -679,7 +678,7 @@ public class AddIT extends AbstractLdapT
         // Create Alias ou=bestFruit,dc=directory,dc=apache,dc=org to ou=favorite
         String aliasedObjectName = entryRdn + "," + ctx.getNameInNamespace();
         Attributes alias = new BasicAttributes( true );
-        Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
+        javax.naming.directory.Attribute aliasOcls = new BasicAttribute( SchemaConstants.OBJECT_CLASS_AT );
         aliasOcls.add( SchemaConstants.TOP_OC );
         aliasOcls.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
         aliasOcls.add( SchemaConstants.ALIAS_OC );
@@ -932,7 +931,7 @@ public class AddIT extends AbstractLdapT
 
         DirContext jackson = ( DirContext ) ctx.lookup( "givenname=Michael" );
         person = jackson.getAttributes( "" );
-        Attribute newOcls = person.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = person.get( "objectClass" );
 
         String[] expectedOcls =
             { "top", "person", "organizationalPerson", "inetOrgPerson" };
@@ -942,7 +941,7 @@ public class AddIT extends AbstractLdapT
             assertTrue( "object class " + name + " is present", newOcls.contains( name ) );
         }
 
-        Attribute givenName = person.get( "givenname" );
+        javax.naming.directory.Attribute givenName = person.get( "givenname" );
 
         assertEquals( "Michael", givenName.get() );
     }
@@ -972,7 +971,7 @@ public class AddIT extends AbstractLdapT
 
         DirContext jackson = ( DirContext ) ctx.lookup( "cn=Michael" );
         person = jackson.getAttributes( "" );
-        Attribute newOcls = person.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = person.get( "objectClass" );
 
         String[] expectedOcls =
             { "top", "person", "organizationalPerson", "inetOrgPerson" };
@@ -982,7 +981,7 @@ public class AddIT extends AbstractLdapT
             assertTrue( "object class " + name + " is present", newOcls.contains( name ) );
         }
 
-        Attribute cn = person.get( "cn" );
+        javax.naming.directory.Attribute cn = person.get( "cn" );
 
         assertEquals( 2, cn.size() );
         String[] expectedCns =
@@ -1019,7 +1018,7 @@ public class AddIT extends AbstractLdapT
 
         DirContext jackson = ( DirContext ) ctx.lookup( "displayName=test" );
         person = jackson.getAttributes( "" );
-        Attribute newOcls = person.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = person.get( "objectClass" );
 
         String[] expectedOcls =
             { "top", "person", "organizationalPerson", "inetOrgPerson" };
@@ -1030,7 +1029,7 @@ public class AddIT extends AbstractLdapT
         }
 
         // Check that the displayName attribute has been replaced
-        Attribute displayName = person.get( "displayName" );
+        javax.naming.directory.Attribute displayName = person.get( "displayName" );
 
         assertEquals( 1, displayName.size() );
         assertTrue( displayName.contains( "test" ) );
@@ -1060,7 +1059,7 @@ public class AddIT extends AbstractLdapT
 
         DirContext jackson = ( DirContext ) ctx.lookup( "displayName=test+cn=Michael" );
         person = jackson.getAttributes( "" );
-        Attribute newOcls = person.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = person.get( "objectClass" );
 
         String[] expectedOcls =
             { "top", "person", "organizationalPerson", "inetOrgPerson" };
@@ -1071,13 +1070,13 @@ public class AddIT extends AbstractLdapT
         }
 
         // Check that the DIsplayName attribute has been added
-        Attribute displayName = person.get( "displayName" );
+        javax.naming.directory.Attribute displayName = person.get( "displayName" );
 
         assertEquals( 1, displayName.size() );
         assertTrue( displayName.contains( "test" ) );
 
         // Check that the cn attribute value has been added
-        Attribute cn = person.get( "cn" );
+        javax.naming.directory.Attribute cn = person.get( "cn" );
 
         assertEquals( 2, cn.size() );
         assertTrue( cn.contains( "Jackson" ) );
@@ -1100,7 +1099,7 @@ public class AddIT extends AbstractLdapT
 
         // modify object classes, add two more
         Attributes attributes = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "description" );
+        javax.naming.directory.Attribute ocls = new BasicAttribute( "description" );
 
         // Inject a 1024 bytes long description
         StringBuilder sb = new StringBuilder();
@@ -1148,7 +1147,7 @@ public class AddIT extends AbstractLdapT
 
         assertNotNull( person );
         attributes = person.getAttributes( "" );
-        Attribute newOcls = attributes.get( "objectClass" );
+        javax.naming.directory.Attribute newOcls = attributes.get( "objectClass" );
 
         assertNotNull( newOcls );
     }
@@ -1176,7 +1175,7 @@ public class AddIT extends AbstractLdapT
             sb.append( "0123456789ABCDEF" );
         }
 
-        EntryAttribute description = new DefaultEntryAttribute( "description", sb.toString() );
+        Attribute description = new DefaultEntryAttribute( "description", sb.toString() );
 
         try
         {
@@ -1212,7 +1211,7 @@ public class AddIT extends AbstractLdapT
         LdapContext ctx = ( LdapContext ) getWiredContext( getLdapServer() ).lookup( BASE );
 
         Attributes tori = new BasicAttributes( true );
-        Attribute toriOC = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute toriOC = new BasicAttribute( "objectClass" );
         toriOC.add( "top" );
         toriOC.add( "person" );
         tori.put( toriOC );
@@ -1227,7 +1226,7 @@ public class AddIT extends AbstractLdapT
         ctx.createSubcontext( " cn = Amos\\,Tori ", tori );
 
         Attributes binary = new BasicAttributes( true );
-        Attribute binaryOC = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute binaryOC = new BasicAttribute( "objectClass" );
         binaryOC.add( "top" );
         binaryOC.add( "person" );
         binary.put( binaryOC );
@@ -1249,7 +1248,7 @@ public class AddIT extends AbstractLdapT
         // search for the implicit added cn
         res = ctx.search( "", "(cn=Amos,Tori)", controls );
         assertTrue( res.hasMore() );
-        Attribute cnAttribute = res.next().getAttributes().get( "cn" );
+        javax.naming.directory.Attribute cnAttribute = res.next().getAttributes().get( "cn" );
         assertEquals( 2, cnAttribute.size() );
         assertTrue( cnAttribute.contains( "Tori Amos" ) );
         assertTrue( cnAttribute.contains( "Amos,Tori" ) );
@@ -1258,7 +1257,7 @@ public class AddIT extends AbstractLdapT
         // search for the implicit added userPassword
         res = ctx.search( "", "(userPassword=\\41\\42\\43)", controls );
         assertTrue( res.hasMore() );
-        Attribute userPasswordAttribute = res.next().getAttributes().get( "userPassword" );
+        javax.naming.directory.Attribute userPasswordAttribute = res.next().getAttributes().get( "userPassword" );
         assertEquals( 2, userPasswordAttribute.size() );
         assertTrue( userPasswordAttribute.contains( Strings.getBytesUtf8( "test" ) ) );
         assertTrue( userPasswordAttribute.contains( Strings.getBytesUtf8( "ABC" ) ) );
@@ -1293,7 +1292,7 @@ public class AddIT extends AbstractLdapT
         Entry addedEntry = con.lookup( dn, "*", "+" );
         assertNotNull( addedEntry );
 
-        EntryAttribute attr = addedEntry.get( SchemaConstants.ENTRY_UUID_AT );
+        Attribute attr = addedEntry.get( SchemaConstants.ENTRY_UUID_AT );
         assertNotNull( attr );
 
         assertEquals( uuid.toString(), attr.getString() );
@@ -1311,7 +1310,7 @@ public class AddIT extends AbstractLdapT
     protected Attributes getPersonAttributes( String sn, String cn )
     {
         Attributes attrs = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "person" );
         attrs.put( ocls );
@@ -1325,7 +1324,7 @@ public class AddIT extends AbstractLdapT
     protected Attributes getOrgUnitAttributes( String ou )
     {
         Attributes attrs = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute ocls = new BasicAttribute( "objectClass" );
         ocls.add( "top" );
         ocls.add( "organizationalUnit" );
         attrs.put( ocls );
@@ -1363,7 +1362,7 @@ public class AddIT extends AbstractLdapT
 
         // The alias under ou=engineering, pointing to the real entry
         Attributes aliasAttrs = new BasicAttributes( true );
-        Attribute aliasOC = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute aliasOC = new BasicAttribute( "objectClass" );
         aliasOC.add( "top" );
         aliasOC.add( "alias" );
         aliasOC.add( "extensibleObject" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Thu Mar 31 23:29:24 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
@@ -99,7 +99,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
 
             assertTrue( personEntry.getDn().equals( sr.getDn() ) );
-            EntryAttribute cn = sr.get( "cn" );
+            Attribute cn = sr.get( "cn" );
             assertNotNull( cn );
             assertTrue( cn.contains( "Kate#Bush" ) );
         }
@@ -135,7 +135,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            EntryAttribute cn = sr.get( "cn" );
+            Attribute cn = sr.get( "cn" );
             assertNotNull( cn );
 
             assertTrue( cn.contains( "Bush, Kate" ) );
@@ -169,7 +169,7 @@ public class AddingEntriesWithSpecialCha
             Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            EntryAttribute cn = sr.get( "cn" );
+            Attribute cn = sr.get( "cn" );
             assertNotNull( cn );
             assertTrue( cn.contains( "Mackie \"The Knife\" Messer" ) );
         }
@@ -203,7 +203,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
 
-            EntryAttribute ou = sr.get( "ou" );
+            Attribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "AC\\DC" ) );
         }
@@ -239,7 +239,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            EntryAttribute ou = sr.get( "ou" );
+            Attribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "East -> West" ) );
         }
@@ -276,7 +276,7 @@ public class AddingEntriesWithSpecialCha
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
 
-            EntryAttribute ou = sr.get( "ou" );
+            Attribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "Scissors 8<" ) );
         }
@@ -313,7 +313,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            EntryAttribute ou = sr.get( "ou" );
+            Attribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "semicolon group;" ) );
         }
@@ -350,7 +350,7 @@ public class AddingEntriesWithSpecialCha
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            EntryAttribute ou = sr.get( "ou" );
+            Attribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "nomen=omen" ) );
         }

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Thu Mar 31 23:29:24 2011
@@ -55,7 +55,7 @@ import org.apache.directory.server.ntp.N
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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.filter.ExprNode;
@@ -644,7 +644,7 @@ public class ApacheDsService
 
             AttributeType atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.ENTRY_UUID_AT ).getAttributeType();
 
-            EntryAttribute uuidAt = entry.get( atType );
+            Attribute uuidAt = entry.get( atType );
             String uuid = ( uuidAt == null ? null : uuidAt.getString() );
 
             if ( !uuidChecker.isValidSyntax( uuid ) )
@@ -656,7 +656,7 @@ public class ApacheDsService
             mods.add( uuidMod );
 
             atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.ENTRY_CSN_AT ).getAttributeType();
-            EntryAttribute csnAt = entry.get( atType );
+            Attribute csnAt = entry.get( atType );
             String csn = ( csnAt == null ? null : csnAt.getString() );
 
             if ( !csnChecker.isValidSyntax( csn ) )
@@ -668,7 +668,7 @@ public class ApacheDsService
             mods.add( csnMod );
 
             atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.CREATORS_NAME_AT ).getAttributeType();
-            EntryAttribute creatorAt = entry.get( atType );
+            Attribute creatorAt = entry.get( atType );
             String creator = ( creatorAt == null ? "" : creatorAt.getString().trim() );
 
             if ( ( creator.length() == 0 ) || ( !Dn.isValid(creator) ) )
@@ -680,7 +680,7 @@ public class ApacheDsService
             mods.add( creatorMod );
 
             atType = MANDATORY_ENTRY_ATOP_MAP.get( SchemaConstants.CREATE_TIMESTAMP_AT ).getAttributeType();
-            EntryAttribute createdTimeAt = entry.get( atType );
+            Attribute createdTimeAt = entry.get( atType );
             String createdTime = ( createdTimeAt == null ? null : createdTimeAt.getString() );
 
             if ( !timeChecker.isValidSyntax( createdTime ) )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Thu Mar 31 23:29:24 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 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;
@@ -924,7 +924,7 @@ public abstract class AbstractStore<E, I
 
         rdnIdx.add( key, id );
 
-        EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
+        Attribute objectClass = entry.get( OBJECT_CLASS_AT );
 
         if ( objectClass == null )
         {
@@ -945,7 +945,7 @@ public abstract class AbstractStore<E, I
 
         if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
         {
-            EntryAttribute aliasAttr = entry.get( ALIASED_OBJECT_NAME_AT );
+            Attribute aliasAttr = entry.get( ALIASED_OBJECT_NAME_AT );
             addAliasIndices( id, entryDn, aliasAttr.getString() );
         }
 
@@ -957,7 +957,7 @@ public abstract class AbstractStore<E, I
         oneLevelIdx.add( parentId, id );
 
         // Update the EntryCsn index
-        EntryAttribute entryCsn = entry.get( ENTRY_CSN_AT );
+        Attribute entryCsn = entry.get( ENTRY_CSN_AT );
 
         if ( entryCsn == null )
         {
@@ -968,7 +968,7 @@ public abstract class AbstractStore<E, I
         entryCsnIdx.add( entryCsn.getString(), id );
 
         // Update the EntryUuid index
-        EntryAttribute entryUuid = entry.get( ENTRY_UUID_AT );
+        Attribute entryUuid = entry.get( ENTRY_UUID_AT );
 
         if ( entryUuid == null )
         {
@@ -990,7 +990,7 @@ public abstract class AbstractStore<E, I
         subLevelIdx.add( id, id );
 
         // Now work on the user defined userIndices
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             String attributeOid = attribute.getAttributeType().getOid();
 
@@ -1035,7 +1035,7 @@ public abstract class AbstractStore<E, I
 
         for ( AttributeType attributeType : mods.getAttributeTypes() )
         {
-            EntryAttribute attr = mods.get( attributeType );
+            Attribute attr = mods.get( attributeType );
 
             switch ( modOp )
             {
@@ -1077,7 +1077,7 @@ public abstract class AbstractStore<E, I
 
         for ( Modification mod : mods )
         {
-            EntryAttribute attrMods = mod.getAttribute();
+            Attribute attrMods = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {
@@ -1118,7 +1118,7 @@ public abstract class AbstractStore<E, I
     {
         Entry entry = master.get( id );
 
-        EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
+        Attribute objectClass = entry.get( OBJECT_CLASS_AT );
 
         if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
         {
@@ -1136,7 +1136,7 @@ public abstract class AbstractStore<E, I
         entryCsnIdx.drop( id );
         entryUuidIdx.drop( id );
 
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             String attributeOid = attribute.getAttributeType().getOid();
 
@@ -1516,7 +1516,7 @@ public abstract class AbstractStore<E, I
      * @throws Exception if index alteration or attribute addition fails
      */
     @SuppressWarnings("unchecked")
-    protected void add( ID id, Entry entry, EntryAttribute mods ) throws Exception
+    protected void add( ID id, Entry entry, Attribute mods ) throws Exception
     {
         if ( entry instanceof ClonedServerEntry )
         {
@@ -1577,7 +1577,7 @@ public abstract class AbstractStore<E, I
      * fails.
      */
     @SuppressWarnings("unchecked")
-    protected void replace( ID id, Entry entry, EntryAttribute mods ) throws Exception
+    protected void replace( ID id, Entry entry, Attribute mods ) throws Exception
     {
         if ( entry instanceof ClonedServerEntry )
         {
@@ -1668,7 +1668,7 @@ public abstract class AbstractStore<E, I
      * @throws Exception if index alteration or attribute modification fails.
      */
     @SuppressWarnings("unchecked")
-    protected void remove( ID id, Entry entry, EntryAttribute mods ) throws Exception
+    protected void remove( ID id, Entry entry, Attribute mods ) throws Exception
     {
         if ( entry instanceof ClonedServerEntry )
         {
@@ -1742,7 +1742,7 @@ public abstract class AbstractStore<E, I
         }
         else
         {
-            EntryAttribute entryAttr = entry.get( mods.getAttributeType() );
+            Attribute entryAttr = entry.get( mods.getAttributeType() );
 
             for ( Value<?> value : mods )
             {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 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.filter.ApproximateNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -80,7 +80,7 @@ public class ApproximateEvaluator<T, ID 
     public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute does not exist just return false
         if ( ( attr != null ) && evaluate( attr ) )
@@ -149,7 +149,7 @@ public class ApproximateEvaluator<T, ID 
 
     // TODO - determine if comparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( EntryAttribute attribute ) throws Exception
+    private boolean evaluate( Attribute attribute ) throws Exception
     {
         /*
          * Cycle through the attribute values testing normalized version

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 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.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -115,7 +115,7 @@ public class EqualityEvaluator<T, ID ext
     public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute does not exist just return false
         if ( ( attr != null ) && evaluate( attr ) )
@@ -164,7 +164,7 @@ public class EqualityEvaluator<T, ID ext
 
     // TODO - determine if comparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( EntryAttribute attribute ) throws Exception
+    private boolean evaluate( Attribute attribute ) throws Exception
     {
         /*
          * Cycle through the attribute values testing normalized version

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 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.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -112,7 +112,7 @@ public class GreaterEqEvaluator<T, ID ex
          */
 
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute exists and has a greater than or equal value return true
         //noinspection unchecked
@@ -164,7 +164,7 @@ public class GreaterEqEvaluator<T, ID ex
     public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute exists and has a greater than or equal value return true
         if ( ( attr != null ) && evaluate( null, attr ) )
@@ -202,7 +202,7 @@ public class GreaterEqEvaluator<T, ID ex
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value 
-    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, EntryAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 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.filter.LessEqNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -120,7 +120,7 @@ public class LessEqEvaluator<T, ID exten
         }
 
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute does not exist just return false
         //noinspection unchecked
@@ -161,7 +161,7 @@ public class LessEqEvaluator<T, ID exten
     public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute does not exist just return false
         if ( ( attr != null ) && evaluate( null, attr ) )
@@ -199,7 +199,7 @@ public class LessEqEvaluator<T, ID exten
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, EntryAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 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.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -135,7 +135,7 @@ public class PresenceEvaluator<ID extend
         }
 
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute exists just return true
         if ( attr != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Thu Mar 31 23:29:24 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 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.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -255,7 +255,7 @@ public class SubstringEvaluator<ID exten
     private boolean evaluateWithoutIndex( Entry entry ) throws Exception
     {
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute exists and the pattern matches return true
         if ( attr != null )
@@ -344,7 +344,7 @@ public class SubstringEvaluator<ID exten
          */
 
         // get the attribute
-        EntryAttribute attr = entry.get( attributeType );
+        Attribute attr = entry.get( attributeType );
 
         // if the attribute exists and the pattern matches return true
         if ( attr != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Thu Mar 31 23:29:24 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 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.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.name.Dn;
@@ -170,7 +170,7 @@ public class AbstractStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) );
 
         String attribVal = "uidObject";
@@ -203,7 +203,7 @@ public class AbstractStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
 
         String attribVal = "sales";
         attrib.add( attribVal );
@@ -237,7 +237,7 @@ public class AbstractStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
         mods.add( add );
@@ -270,7 +270,7 @@ public class AbstractStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) );
 
         String attribVal = "person";
@@ -303,7 +303,7 @@ public class AbstractStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) );
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
@@ -333,7 +333,7 @@ public class AbstractStoreTest
 
         List<Modification> mods = new ArrayList<Modification>();
         AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
-        EntryAttribute attrib = new DefaultEntryAttribute( csnAt );
+        Attribute attrib = new DefaultEntryAttribute( csnAt );
         
         CsnFactory csnF = new CsnFactory( 0 );
         String csn = csnF.newInstance().toString();

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Thu Mar 31 23:29:24 2011
@@ -28,7 +28,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.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
@@ -204,7 +204,7 @@ public class StoreUtils
                 IndexEntry rec = list.get();
                 String val = rec.getValue().toString();
                 String attrId = index.getAttribute().getName();
-                EntryAttribute attr = entry.get( attrId );
+                Attribute attr = entry.get( attrId );
 
                 if ( attr == null )
                 {
@@ -232,7 +232,7 @@ public class StoreUtils
             val.append( "]" );
 
             String valStr = val.toString();
-            EntryAttribute attr = entry.get( valStr );
+            Attribute attr = entry.get( valStr );
 
             if ( attr == null )
             {
@@ -251,7 +251,7 @@ public class StoreUtils
         recordForward.setId( id );
         children.before( longRecordForward );
 
-        EntryAttribute childAttr = new DefaultEntryAttribute( "_child" );
+        Attribute childAttr = new DefaultEntryAttribute( "_child" );
         entry.put( childAttr );
 
         while ( children.next() )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Thu Mar 31 23:29:24 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 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.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.exception.LdapNoSuchObjectException;
@@ -598,7 +598,7 @@ public class AvlStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
         attrib.add( "Engineering" );
 
         Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
@@ -692,7 +692,7 @@ public class AvlStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SURNAME_AT ) );
 
         String attribVal = "Walker";
@@ -723,7 +723,7 @@ public class AvlStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         String attribVal = "Johnny";
@@ -755,7 +755,7 @@ public class AvlStoreTest
         Dn dn = new Dn( schemaManager, "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
@@ -794,7 +794,7 @@ public class AvlStoreTest
         store.add( entry );
 
         List<Modification> mods = new ArrayList<Modification>();
-        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
+        Attribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
 
         String attribVal = "Marketing";
         attrib.add( attribVal );

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Thu Mar 31 23:29:24 2011
@@ -26,7 +26,7 @@ import javax.swing.table.AbstractTableMo
 
 import org.apache.directory.server.i18n.I18n;
 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;
 
 
@@ -77,7 +77,7 @@ public class AttributesTableModel extend
 
         int rowCount = 0;
 
-        for ( EntryAttribute attribute:entry )
+        for ( Attribute attribute:entry )
         {
             String attrId = attribute.getId();
             rowCount = rowCount + entry.get( attrId ).size();
@@ -86,7 +86,7 @@ public class AttributesTableModel extend
         keyList = new ArrayList<Object>( rowCount );
         valList = new ArrayList<Object>( rowCount );
 
-        for ( EntryAttribute attribute:entry )
+        for ( Attribute attribute:entry )
         {
             for ( Value<?> value:attribute )
             {



Mime
View raw message