directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087506 [3/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/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Thu Mar 31 23:29:24 2011
@@ -36,7 +36,7 @@ import java.util.List;
 
 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;
@@ -187,7 +187,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testCreateClientModification() throws LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atCN );
+        Attribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
 
         Modification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -195,7 +195,7 @@ public class SchemaAwareModificationTest
 
         attribute.remove( "test2" );
 
-        EntryAttribute clonedAttribute = clone.getAttribute();
+        Attribute clonedAttribute = clone.getAttribute();
 
         assertEquals( 1, mod.getAttribute().size() );
         assertTrue( mod.getAttribute().contains( "test1" ) );
@@ -213,7 +213,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testCopyClientModification() throws LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atC );
+        Attribute attribute = new DefaultEntryAttribute( atC );
         attribute.add( "test1", "test2" );
         Modification serverModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
 
@@ -225,7 +225,7 @@ public class SchemaAwareModificationTest
         serverModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute( atCN, "t" );
+        Attribute attribute2 = new DefaultEntryAttribute( atCN, "t" );
         serverModification.setAttribute( attribute2 );
         assertNotSame( attribute2, copy.getAttribute() );
     }
@@ -238,7 +238,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testCopyModification() throws LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atC.getName() );
+        Attribute attribute = new DefaultEntryAttribute( atC.getName() );
         attribute.add( "test1", "test2" );
         Modification clientModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
 
@@ -247,7 +247,7 @@ public class SchemaAwareModificationTest
         assertTrue( copy instanceof DefaultModification );
         assertTrue( copy instanceof DefaultModification );
         assertFalse( copy.equals( clientModification ) );
-        assertTrue( copy.getAttribute() instanceof EntryAttribute);
+        assertTrue( copy.getAttribute() instanceof Attribute);
         assertEquals( atC, copy.getAttribute().getAttributeType() );
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
         assertTrue( copy.getAttribute().contains( "test1", "test2" ) );
@@ -255,7 +255,7 @@ public class SchemaAwareModificationTest
         clientModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
         assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
 
-        EntryAttribute attribute2 = new DefaultEntryAttribute( "cn", "t" );
+        Attribute attribute2 = new DefaultEntryAttribute( "cn", "t" );
         clientModification.setAttribute( attribute2 );
         assertNotSame( attribute2, copy.getAttribute() );
     }
@@ -264,7 +264,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atCN );
+        Attribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
 
         DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -279,7 +279,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atCN );
+        Attribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
 
         DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -294,7 +294,7 @@ public class SchemaAwareModificationTest
     @Test
     public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapException
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( atCN );
+        Attribute attribute = new DefaultEntryAttribute( atCN );
         attribute.add( "test1", "test2" );
 
         DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );

Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Thu Mar 31 23:29:24 2011
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
@@ -46,9 +45,9 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+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.EntryAttribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.ldif.ChangeType;
 import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
@@ -271,7 +270,7 @@ public class IntegrationUtils
         ldif.setDn( dnstr );
         ldif.setChangeType( ChangeType.Add );
 
-        EntryAttribute attr = new DefaultEntryAttribute( "objectClass",
+        Attribute attr = new DefaultEntryAttribute( "objectClass",
             "top", "person", "organizationalPerson", "inetOrgPerson" );
         ldif.addAttribute( attr );
 
@@ -306,7 +305,7 @@ public class IntegrationUtils
 
         // now enable the test schema
         ModificationItem[] mods = new ModificationItem[1];
-        Attribute attr = new BasicAttribute( "m-disabled", "FALSE" );
+        javax.naming.directory.Attribute attr = new BasicAttribute( "m-disabled", "FALSE" );
         mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
         schemaRoot.modifyAttributes( "cn=" + schemaName, mods );
     }
@@ -318,7 +317,7 @@ public class IntegrationUtils
 
         // now enable the test schema
         ModificationItem[] mods = new ModificationItem[1];
-        Attribute attr = new BasicAttribute( "m-disabled", "TRUE" );
+        javax.naming.directory.Attribute attr = new BasicAttribute( "m-disabled", "TRUE" );
         mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
         schemaRoot.modifyAttributes( "cn=" + schemaName, mods );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Thu Mar 31 23:29:24 2011
@@ -34,7 +34,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.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
@@ -116,11 +116,11 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         Entry entry = connection.lookup( userDn );
-        EntryAttribute ou = entry.get( "ou" );
+        Attribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
 
-        EntryAttribute objectClass = entry.get( "objectClass" );
+        Attribute objectClass = entry.get( "objectClass" );
         assertTrue( objectClass.contains( "top" ) );
         assertTrue( objectClass.contains( "person" ) );
         assertTrue( objectClass.contains( "organizationalPerson" ) );
@@ -181,11 +181,11 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         Entry entry = connection.lookup( userDn );
-        EntryAttribute ou = entry.get( "ou" );
+        Attribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
 
-        EntryAttribute objectClass = entry.get( "objectClass" );
+        Attribute objectClass = entry.get( "objectClass" );
         assertTrue( objectClass.contains( "top" ) );
         assertTrue( objectClass.contains( "person" ) );
         assertTrue( objectClass.contains( "organizationalPerson" ) );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Thu Mar 31 23:29:24 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
@@ -144,7 +144,7 @@ public class PasswordPolicyTest extends 
         assertNotNull( respCtrl );
         assertEquals( PASSWORD_TOO_SHORT, respCtrl.getResponse().getPasswordPolicyError() );
 
-        EntryAttribute pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
         pwdAt.clear();
         pwdAt.add( "12345" );
 
@@ -185,7 +185,7 @@ public class PasswordPolicyTest extends 
         assertEquals( INSUFFICIENT_PASSWORD_QUALITY, respCtrl.getResponse().getPasswordPolicyError() );
 
         policyConfig.setPwdCheckQuality( 1 ); // allow the password if its quality can't be checked
-        EntryAttribute pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute pwdAt = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
         pwdAt.clear();
         pwdAt.add( password );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Thu Mar 31 23:29:24 2011
@@ -39,7 +39,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.LdapNoPermissionException;
@@ -136,7 +136,7 @@ public class AuthorizationServiceAsNonAd
         
         assertTrue( Arrays.equals( akarasulu.get( "userPassword" ).getBytes(), readEntry.get( "userPassword" ).getBytes() ) );
 
-        EntryAttribute attribute = new DefaultEntryAttribute( "userPassword", "replaced" );
+        Attribute attribute = new DefaultEntryAttribute( "userPassword", "replaced" );
 
         List<Modification> mods = new ArrayList<Modification>();
         

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Thu Mar 31 23:29:24 2011
@@ -24,7 +24,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.server.core.DirectoryService;
 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.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
@@ -241,7 +241,7 @@ public class AutzIntegUtils
         Entry systemEntry = connection.lookup( "ou=system", "+", "*" );
 
         // modify ou=system to be an AP for an A/C AA if it is not already
-        EntryAttribute administrativeRole = systemEntry.get( "administrativeRole" );
+        Attribute administrativeRole = systemEntry.get( "administrativeRole" );
 
         if ( ( administrativeRole == null ) || !administrativeRole.contains( "accessControlSpecificArea" ) )
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Thu Mar 31 23:29:24 2011
@@ -41,7 +41,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.message.ModifyRequest;
@@ -165,7 +165,7 @@ public class ModifyAuthorizationIT exten
      * @throws javax.naming.Exception if there are problems conducting the test
      */
     public boolean checkCanModifyAs( String uid, String password, String entryRdn, ModificationOperation modOp,
-        EntryAttribute attr ) throws Exception
+        Attribute attr ) throws Exception
     {
         Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result;
@@ -246,13 +246,13 @@ public class ModifyAuthorizationIT exten
      * @return the array of modification items represting the changes
      * @throws Exception if there are problems accessing attributes
      */
-    private Modification[] toItems( ModificationOperation modOp, EntryAttribute... attrs ) throws Exception
+    private Modification[] toItems( ModificationOperation modOp, Attribute... attrs ) throws Exception
     {
         Modification[] mods = new Modification[attrs.length];
 
         for ( int i = 0; i < attrs.length; i++ )
         {
-            EntryAttribute ea = attrs[i];
+            Attribute ea = attrs[i];
             mods[i] = new DefaultModification( modOp, ea );
         }
 
@@ -305,7 +305,7 @@ public class ModifyAuthorizationIT exten
         // ----------------------------------------------------------------------------------
 
         // create the add modifications
-        EntryAttribute attr = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
+        Attribute attr = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
         Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, attr );
 
         // create the non-admin user
@@ -398,7 +398,7 @@ public class ModifyAuthorizationIT exten
         // Modify with Attribute Addition
         // ----------------------------------------------------------------------------------
         // create the add modifications
-        EntryAttribute changes = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
+        Attribute changes = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
 
         // try a modify operation which should fail without any ACI
         assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.ADD_ATTRIBUTE, changes ) );
@@ -618,7 +618,7 @@ public class ModifyAuthorizationIT exten
 
         assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
 
-        EntryAttribute attr = new DefaultEntryAttribute( "description" );
+        Attribute attr = new DefaultEntryAttribute( "description" );
         attr.add( "description 1" );
         attr.add( "description 2" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Thu Mar 31 23:29:24 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
@@ -296,7 +296,7 @@ public class DefaultChangeLogIT extends 
 
         Entry resusitated = sysRoot.lookup( "ou=test5,ou=system" );
         assertNotNull( resusitated );
-        EntryAttribute description = resusitated.get( "description" );
+        Attribute description = resusitated.get( "description" );
         assertNotNull( description );
         assertEquals( "a desc value", description.getString() );
 
@@ -393,7 +393,7 @@ public class DefaultChangeLogIT extends 
         description = resusitated.get( "description" );
         assertNull( description );
         assertPassword( resusitated, "a replaced value" );
-        EntryAttribute seeAlso = resusitated.get( "seeAlso" );
+        Attribute seeAlso = resusitated.get( "seeAlso" );
         assertNotNull( seeAlso );
         assertEquals( seeAlso.getString(), "ou=added" );
 
@@ -412,7 +412,7 @@ public class DefaultChangeLogIT extends 
 
     private void assertPassword( Entry entry, String password ) throws Exception
     {
-        EntryAttribute userPassword = entry.get( "userPassword" );
+        Attribute userPassword = entry.get( "userPassword" );
         assertNotNull( userPassword );
         assertTrue( Arrays.equals( password.getBytes(), userPassword.getBytes() ) );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Thu Mar 31 23:29:24 2011
@@ -37,7 +37,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.LdapException;
@@ -110,7 +110,7 @@ public class CollectiveAttributeServiceI
 
     private void addAdministrativeRole( String role ) throws Exception
     {
-        EntryAttribute attribute = new DefaultEntryAttribute( "administrativeRole", role );
+        Attribute attribute = new DefaultEntryAttribute( "administrativeRole", role );
 
         connection.modify( "ou=system", new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute ) );
     }
@@ -210,7 +210,7 @@ public class CollectiveAttributeServiceI
         // -------------------------------------------------------------------
 
         Entry entry = connection.lookup( "ou=services,ou=configuration,ou=system" );
-        EntryAttribute c_ou = entry.get( "c-ou" );
+        Attribute c_ou = entry.get( "c-ou" );
         assertNotNull( "a collective c-ou attribute should be present", c_ou );
         assertEquals( "configuration", c_ou.getString() );
 
@@ -279,7 +279,7 @@ public class CollectiveAttributeServiceI
 
         // the new attribute c-st should appear in the node with the c-ou exclusion
         entry = connection.lookup( "ou=services,ou=configuration,ou=system" );
-        EntryAttribute c_st = entry.get( "c-st" );
+        Attribute c_st = entry.get( "c-st" );
 
         assertNotNull( "a collective c-st attribute should be present", c_st );
         assertTrue( c_st.contains( "FL" ) );
@@ -365,7 +365,7 @@ public class CollectiveAttributeServiceI
         // -------------------------------------------------------------------
         Map<String, Entry> entries = getAllEntries();
         Entry entry = entries.get( "ou=services,ou=configuration,ou=system" );
-        EntryAttribute c_ou = entry.get( "c-ou" );
+        Attribute c_ou = entry.get( "c-ou" );
         assertNotNull( "a collective c-ou attribute should be present", c_ou );
         assertEquals( "configuration", c_ou.getString() );
 
@@ -450,7 +450,7 @@ public class CollectiveAttributeServiceI
 
         // the new attribute c-st should appear in the node with the c-ou exclusion
         entry = entries.get( "ou=services,ou=configuration,ou=system" );
-        EntryAttribute c_st = entry.get( "c-st" );
+        Attribute c_st = entry.get( "c-st" );
         assertNotNull( "a collective c-st attribute should be present", c_st );
         assertTrue( c_st.contains( "FL" ) );
 
@@ -546,7 +546,7 @@ public class CollectiveAttributeServiceI
         // request the collective attribute's super type specifically
         Entry entry = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "ou" );
 
-        EntryAttribute c_ou = entry.get( "c-ou" );
+        Attribute c_ou = entry.get( "c-ou" );
         assertNotNull( "a collective c-ou attribute should be present", c_ou );
         assertTrue( c_ou.contains( "configuration" ) );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Thu Mar 31 23:29:24 2011
@@ -37,7 +37,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.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
@@ -290,7 +290,7 @@ public class ExceptionServiceIT extends 
 
         connection.modify( modReq );
         Entry entry = connection.lookup( "ou=users,ou=system" );
-        EntryAttribute ou = entry.get( "ou" );
+        Attribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "users" ) );
         assertTrue( ou.contains( "dummyValue" ) );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Thu Mar 31 23:29:24 2011
@@ -34,7 +34,6 @@ import javax.naming.Context;
 import javax.naming.NameNotFoundException;
 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;
@@ -47,11 +46,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
+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.exception.LdapNoSuchObjectException;
@@ -151,7 +150,7 @@ public class ModifyReferralIT extends Ab
     {
         try
         {
-            Attribute description = new BasicAttribute( "description", "This is a description" );
+            javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
             Attributes attrs = new BasicAttributes( true );
             attrs.put( description );
             
@@ -177,7 +176,7 @@ public class ModifyReferralIT extends Ab
             // Set to 'throw'
             MNNCtx.addToEnvironment( Context.REFERRAL, "throw" );
 
-            Attribute description = new BasicAttribute( "description", "This is a description" );
+            javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
             Attributes attrs = new BasicAttributes( true );
             attrs.put( description );
 
@@ -216,7 +215,7 @@ public class ModifyReferralIT extends Ab
             // Set to 'throw'
             MNNCtx.addToEnvironment( Context.REFERRAL, "ignore" );
 
-            Attribute description = new BasicAttribute( "description", "This is a description" );
+            javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
             Attributes attrs = new BasicAttributes( true );
             attrs.put( description );
 
@@ -241,7 +240,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+            Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
             Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -269,7 +268,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+            Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
             Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -293,7 +292,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyExistingEntryNoReferral() throws Exception
     {
-        Attribute description = new BasicAttribute( "description", "This is a description" );
+        javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
         Attributes attrs = new BasicAttributes( true );
         attrs.put( description );
         
@@ -314,7 +313,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyExistingEntryReferralJNDIThrow() throws Exception
     {
-        Attribute description = new BasicAttribute( "description", "This is a description" );
+        javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
         Attributes attrs = new BasicAttributes( true );
         attrs.put( description );
         
@@ -349,7 +348,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyExistingEntryReferralJNDIIgnore() throws Exception
     {
-        Attribute description = new BasicAttribute( "description", "This is a description" );
+        javax.naming.directory.Attribute description = new BasicAttribute( "description", "This is a description" );
         Attributes attrs = new BasicAttributes( true );
         attrs.put( description );
         
@@ -377,7 +376,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+            Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
             Modification mod = new DefaultModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -416,7 +415,7 @@ public class ModifyReferralIT extends Ab
     {
         CoreSession session = getService().getAdminSession();
         
-        EntryAttribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
+        Attribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
         Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, attr );
         List<Modification> mods = new ArrayList<Modification>();

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Thu Mar 31 23:29:24 2011
@@ -37,7 +37,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.ldif.LdifUtils;
@@ -110,7 +110,7 @@ public class OperationalAttributeService
 
         // test without turning on the property
         Entry result = connection.lookup( "ou=test,ou=system" );
-        EntryAttribute ou = result.get( "ou" );
+        Attribute ou = result.get( "ou" );
         Object value = ou.getString();
         assertTrue( value instanceof String );
 
@@ -126,7 +126,7 @@ public class OperationalAttributeService
         ou = loadedEntry.get( "ou" );
         value = ou.getString();
         assertEquals( "anothertest", value );
-        EntryAttribute jpegPhoto = loadedEntry.get( "jpegPhoto" );
+        Attribute jpegPhoto = loadedEntry.get( "jpegPhoto" );
         value = jpegPhoto.getBytes();
         assertTrue( value instanceof byte[] );
         assertEquals( "0xFF 0xD8 0xFF 0xE0 0x01 0x02 0x4A 0x46 0x49 0x46 0x00 0x45 0x23 0x7D 0x7F ", Strings
@@ -150,7 +150,7 @@ public class OperationalAttributeService
 
         assertNotNull( entry );
         assertEquals( "testing00", entry.get( "ou" ).getString() );
-        EntryAttribute attribute = entry.get( "objectClass" );
+        Attribute attribute = entry.get( "objectClass" );
         assertNotNull( attribute );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "organizationalUnit" ) );
@@ -279,7 +279,7 @@ public class OperationalAttributeService
         // Determine modifyTimestamp
         Entry entry = connection.lookup( DN_KATE_BUSH, "modifyTimestamp" );
 
-        EntryAttribute modifyTimestamp = entry.get( "modifyTimestamp" );
+        Attribute modifyTimestamp = entry.get( "modifyTimestamp" );
         assertNotNull( modifyTimestamp );
         String oldTimestamp = modifyTimestamp.getString();
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.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;
@@ -74,7 +74,7 @@ public class PasswordHashingInterceptorT
         Dn dn = new Dn( "cn=test,ou=system" );
 
         Entry entry = connection.lookup( dn );
-        EntryAttribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
         
         assertFalse( Arrays.equals( plainPwd, pwdAt.getBytes() ) );
         assertTrue( PasswordUtil.compareCredentials( plainPwd, pwdAt.getBytes() ) );
@@ -91,7 +91,7 @@ public class PasswordHashingInterceptorT
 
         AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
-        EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
+        Attribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( plainPwd );
         
         Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, pwdAt );
@@ -123,7 +123,7 @@ public class PasswordHashingInterceptorT
         connection.add( entry );
 
         entry = connection.lookup( dn );
-        EntryAttribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
         assertTrue( Arrays.equals( hashedPwd, pwdAt.getBytes() ) );
         assertTrue( PasswordUtil.compareCredentials( plainPwd, pwdAt.getBytes() ) );
     }
@@ -141,7 +141,7 @@ public class PasswordHashingInterceptorT
 
         AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
-        EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
+        Attribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( hashedPwd );
         
         Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, pwdAt );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Thu Mar 31 23:29:24 2011
@@ -32,7 +32,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.message.ModifyRequest;
@@ -108,7 +108,7 @@ public class ModifyPerfIT extends Abstra
             ModifyRequest modRequest = new ModifyRequestImpl();
             modRequest.setName( dn );
             Modification modification = new DefaultModification();
-            EntryAttribute attribute = new DefaultEntryAttribute( "sn" );
+            Attribute attribute = new DefaultEntryAttribute( "sn" );
 
             attribute.add( "test" + i );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Thu Mar 31 23:29:24 2011
@@ -31,7 +31,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
@@ -51,8 +50,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
@@ -199,7 +198,7 @@ public class SubentryServiceIT extends A
     public Attributes getTestEntry( String cn )
     {
         Attributes subentry = new BasicAttributes( true );
-        Attribute objectClass = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute objectClass = new BasicAttribute( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "person" );
         subentry.put( objectClass );
@@ -212,7 +211,7 @@ public class SubentryServiceIT extends A
     public Attributes getTestSubentry()
     {
         Attributes subentry = new BasicAttributes( true );
-        Attribute objectClass = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute objectClass = new BasicAttribute( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -237,7 +236,7 @@ public class SubentryServiceIT extends A
     public Attributes getTestSubentryWithExclusion()
     {
         Attributes subentry = new BasicAttributes( true );
-        Attribute objectClass = new BasicAttribute( "objectClass" );
+        javax.naming.directory.Attribute objectClass = new BasicAttribute( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -267,7 +266,7 @@ public class SubentryServiceIT extends A
     private void addAdministrativeRole( String role ) throws Exception
     {
         LdapContext sysRoot = getSystemContext( getService() );
-        Attribute attribute = new BasicAttribute( "administrativeRole" );
+        javax.naming.directory.Attribute attribute = new BasicAttribute( "administrativeRole" );
         attribute.add( role );
         ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
         sysRoot.modifyAttributes( "", new ModificationItem[]
@@ -341,7 +340,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes marked = results.get( "cn=marked,ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = marked.get( "collectiveAttributeSubentries" );
+        javax.naming.directory.Attribute collectiveAttributeSubentries = marked.get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=marked,ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
         assertEquals( 1, collectiveAttributeSubentries.size() );
@@ -358,7 +357,7 @@ public class SubentryServiceIT extends A
 
     private void checkHasOpAttr( Entry entry, String opAttr, int nbOpAttr, String... subentryDns ) throws Exception
     {
-        EntryAttribute attribute = entry.get( opAttr );
+        Attribute attribute = entry.get( opAttr );
         assertNotNull( attribute );
         assertEquals( nbOpAttr, attribute.size() );
 
@@ -371,7 +370,7 @@ public class SubentryServiceIT extends A
 
     private void checkDoesNotHaveOpAttr( Entry entry, String opAttr ) throws Exception
     {
-        EntryAttribute attribute = entry.get( opAttr );
+        Attribute attribute = entry.get( opAttr );
         assertNull( attribute );
     }
 
@@ -583,7 +582,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -634,7 +633,7 @@ public class SubentryServiceIT extends A
         // Now modify the subentry by introducing an exclusion
         // --------------------------------------------------------------------
 
-        Attribute subtreeSpecification = new BasicAttribute( "subtreeSpecification" );
+        javax.naming.directory.Attribute subtreeSpecification = new BasicAttribute( "subtreeSpecification" );
         subtreeSpecification.add( "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
         ModificationItem item = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, subtreeSpecification );
         sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItem[]
@@ -709,7 +708,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -836,7 +835,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
 
         if ( collectiveAttributeSubentries != null )
@@ -903,7 +902,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=newname,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -968,7 +967,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -1069,7 +1068,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -1170,7 +1169,7 @@ public class SubentryServiceIT extends A
         // --------------------------------------------------------------------
 
         Attributes configuration = results.get( "ou=configuration,ou=system" );
-        Attribute collectiveAttributeSubentries = configuration
+        javax.naming.directory.Attribute collectiveAttributeSubentries = configuration
             .get( "collectiveAttributeSubentries" );
         assertNotNull( "ou=configuration,ou=system should be marked", collectiveAttributeSubentries );
         assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", collectiveAttributeSubentries.get() );
@@ -1368,7 +1367,7 @@ public class SubentryServiceIT extends A
         Attributes attributes = sysRoot.getAttributes( "cn=testsubentry", new String[]{"subtreeSpecification"} );
 
         assertNotNull( attributes );
-        Attribute ss = attributes.get( "SubtreeSpecification" );
+        javax.naming.directory.Attribute ss = attributes.get( "SubtreeSpecification" );
         assertNotNull( ss );
     }
 

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Thu Mar 31 23:29:24 2011
@@ -32,7 +32,7 @@ import org.apache.directory.server.i18n.
 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.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.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -198,7 +198,7 @@ class JavaLdapSupport
         // Add all the class names this object can be cast to:
         Class<?>[] classes = obj.getClass().getClasses();
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
-        EntryAttribute javaClassNames = new DefaultEntryAttribute( attributeType, JCLASSNAMES_ATTR );
+        Attribute javaClassNames = new DefaultEntryAttribute( attributeType, JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )
         {

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Mar 31 23:29:24 2011
@@ -100,7 +100,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeTypeException;
@@ -1118,7 +1118,7 @@ public abstract class ServerContext impl
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
-                for ( EntryAttribute serverAttribute : outServerEntry )
+                for ( Attribute serverAttribute : outServerEntry )
                 {
                     try
                     {
@@ -1170,7 +1170,7 @@ public abstract class ServerContext impl
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
-                for ( EntryAttribute serverAttribute : outServerEntry )
+                for ( Attribute serverAttribute : outServerEntry )
                 {
                     try
                     {

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Thu Mar 31 23:29:24 2011
@@ -32,7 +32,6 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InvalidAttributeIdentifierException;
@@ -57,10 +56,10 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeTypeException;
@@ -210,7 +209,7 @@ public abstract class ServerDirContext e
         if ( attrs != null )
         {
             modItems = new ArrayList<ModificationItem>( attrs.size() );
-            NamingEnumeration<? extends Attribute> e = attrs.getAll();
+            NamingEnumeration<? extends javax.naming.directory.Attribute> e = attrs.getAll();
 
             while ( e.hasMore() )
             {
@@ -391,7 +390,7 @@ public abstract class ServerDirContext e
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
-                for ( EntryAttribute attribute : outServerEntry )
+                for ( Attribute attribute : outServerEntry )
                 {
                     try
                     {
@@ -436,7 +435,7 @@ public abstract class ServerDirContext e
 
             if ( outServerEntry != null && outServerEntry.size() > 0 )
             {
-                for ( EntryAttribute attribute : outServerEntry )
+                for ( Attribute attribute : outServerEntry )
                 {
                     try
                     {
@@ -479,7 +478,7 @@ public abstract class ServerDirContext e
 
             if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
             {
-                for ( EntryAttribute attribute : outServerEntry )
+                for ( Attribute attribute : outServerEntry )
                 {
                     try
                     {
@@ -745,8 +744,8 @@ public abstract class ServerDirContext e
         // Handle simple filter expressions without multiple terms
         if ( matchingAttributes.size() == 1 )
         {
-            NamingEnumeration<? extends Attribute> list = matchingAttributes.getAll();
-            Attribute attr = list.next();
+            NamingEnumeration<? extends javax.naming.directory.Attribute> list = matchingAttributes.getAll();
+            javax.naming.directory.Attribute attr = list.next();
             list.close();
 
             if ( attr.size() == 1 )
@@ -783,10 +782,10 @@ public abstract class ServerDirContext e
          * Go through the set of attributes using each attribute value pair as
          * an attribute value assertion within one big AND filter expression.
          */
-        Attribute attr;
+        javax.naming.directory.Attribute attr;
         SimpleNode node;
         BranchNode filter = new AndNode();
-        NamingEnumeration<? extends Attribute> list = matchingAttributes.getAll();
+        NamingEnumeration<? extends javax.naming.directory.Attribute> list = matchingAttributes.getAll();
 
         // Loop through each attribute value pair
         while ( list.hasMore() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Mar 31 23:29:24 2011
@@ -89,7 +89,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.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -981,7 +981,7 @@ public class DefaultDirectoryService imp
         loc.setAttrsId( new String[]{ "+" } );
         ClonedServerEntry entry = systemPartition.lookup( loc );
 
-        EntryAttribute cntextCsnAt = entry.get( SchemaConstants.CONTEXT_CSN_AT );
+        Attribute cntextCsnAt = entry.get( SchemaConstants.CONTEXT_CSN_AT );
         if( cntextCsnAt != null )
         {
             // this is a multivalued attribute but current syncrepl provider implementation stores only ONE value at ou=system
@@ -1572,8 +1572,8 @@ public class DefaultDirectoryService imp
                     continue;
                 }
 
-                EntryAttribute attribute = LdifReader.parseAttributeValue( addedLine );
-                EntryAttribute oldAttribute = entry.get( attribute.getId() );
+                Attribute attribute = LdifReader.parseAttributeValue( addedLine );
+                Attribute oldAttribute = entry.get( attribute.getId() );
 
                 if ( oldAttribute != null )
                 {
@@ -1894,7 +1894,7 @@ public class DefaultDirectoryService imp
         
         if ( pwdPolicyContainer.hasCustomConfigs() )
         {
-            EntryAttribute pwdPolicySubentry = userEntry.get( pwdPolicySubentryAT );
+            Attribute pwdPolicySubentry = userEntry.get( pwdPolicySubentryAT );
             
             if ( pwdPolicySubentry != null )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Thu Mar 31 23:29:24 2011
@@ -44,7 +44,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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.LdapAffectMultipleDsaException;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -88,7 +88,7 @@ public class DefaultOperationManager imp
         throws LdapException //, LdapURLEncodingException
     {
         // Get the Ref attributeType
-        EntryAttribute refs = parentEntry.get( SchemaConstants.REF_AT );
+        Attribute refs = parentEntry.get( SchemaConstants.REF_AT );
 
         List<String> urls = new ArrayList<String>();
 
@@ -130,7 +130,7 @@ public class DefaultOperationManager imp
         throws LdapException
     {
         // Get the Ref attributeType
-        EntryAttribute refs = parentEntry.get( SchemaConstants.REF_AT );
+        Attribute refs = parentEntry.get( SchemaConstants.REF_AT );
 
         List<String> urls = new ArrayList<String>();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Thu Mar 31 23:29:24 2011
@@ -68,7 +68,7 @@ import org.apache.directory.shared.ldap.
 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.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.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -227,7 +227,7 @@ public class AdministrativePointIntercep
     /**
      * Create the list of AP for a given entry
      */
-    private void createAdministrativePoints( EntryAttribute adminPoint, Dn dn, String uuid ) throws LdapException
+    private void createAdministrativePoints( Attribute adminPoint, Dn dn, String uuid ) throws LdapException
     {
         if ( isAAP( adminPoint ) )
         {
@@ -600,7 +600,7 @@ public class AdministrativePointIntercep
      * Check if we can safely add a role. If it's an AAP, we have to be sure that
      * it's the only role present in the AT.
      */
-    private void checkAddRole( Value<?> role, EntryAttribute adminPoint, Dn dn ) throws LdapException
+    private void checkAddRole( Value<?> role, Attribute adminPoint, Dn dn ) throws LdapException
     {
         String roleStr = Strings.toLowerCase(Strings.trim(role.getString()));
 
@@ -655,7 +655,7 @@ public class AdministrativePointIntercep
     /**
      * Check if we can safely delete a role
      */
-    private void checkDelRole( Value<?> role, EntryAttribute adminPoint, Dn dn ) throws LdapException
+    private void checkDelRole( Value<?> role, Attribute adminPoint, Dn dn ) throws LdapException
     {
         String roleStr = Strings.toLowerCase(Strings.trim(role.getString()));
 
@@ -816,7 +816,7 @@ public class AdministrativePointIntercep
             Dn dn = adminPointEntry.getDn();
 
             String uuid = adminPointEntry.get( ENTRY_UUID_AT ).getString();
-            EntryAttribute adminPoint = adminPointEntry.get( ADMINISTRATIVE_ROLE_AT );
+            Attribute adminPoint = adminPointEntry.get( ADMINISTRATIVE_ROLE_AT );
 
             createAdministrativePoints( adminPoint, dn, uuid );
         }
@@ -826,7 +826,7 @@ public class AdministrativePointIntercep
     /**
      * Update The Administrative Points cache, removing the given AdminPoint
      */
-    private void deleteAdminPointCache( EntryAttribute adminPoint, DeleteOperationContext deleteContext )
+    private void deleteAdminPointCache( Attribute adminPoint, DeleteOperationContext deleteContext )
         throws LdapException
     {
         Dn dn = deleteContext.getDn();
@@ -974,14 +974,14 @@ public class AdministrativePointIntercep
     /**
      * Tells if the Administrative Point role is an AAP
      */
-    private boolean isAAP( EntryAttribute adminPoint )
+    private boolean isAAP( Attribute adminPoint )
     {
         return ( adminPoint.contains( SchemaConstants.AUTONOMOUS_AREA ) || adminPoint
             .contains( SchemaConstants.AUTONOMOUS_AREA_OID ) );
     }
 
 
-    private boolean hasAccessControlSpecificRole( EntryAttribute adminPoint )
+    private boolean hasAccessControlSpecificRole( Attribute adminPoint )
     {
         return adminPoint.contains( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA ) ||
                adminPoint.contains( SchemaConstants.ACCESS_CONTROL_SPECIFIC_AREA_OID );
@@ -994,14 +994,14 @@ public class AdministrativePointIntercep
     }
 
 
-    private boolean hasCollectiveAttributeSpecificRole( EntryAttribute adminPoint )
+    private boolean hasCollectiveAttributeSpecificRole( Attribute adminPoint )
     {
         return adminPoint.contains( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA ) ||
                adminPoint.contains( SchemaConstants.COLLECTIVE_ATTRIBUTE_SPECIFIC_AREA_OID );
     }
 
 
-    private boolean hasTriggerExecutionSpecificRole( EntryAttribute adminPoint )
+    private boolean hasTriggerExecutionSpecificRole( Attribute adminPoint )
     {
         return adminPoint.contains( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA ) ||
                adminPoint.contains( SchemaConstants.TRIGGER_EXECUTION_SPECIFIC_AREA_OID );
@@ -1011,7 +1011,7 @@ public class AdministrativePointIntercep
     /**
      * Check that we don't have an IAP and a SAP with the same family
      */
-    private void checkInnerSpecificMix( String role, EntryAttribute adminPoint ) throws LdapUnwillingToPerformException
+    private void checkInnerSpecificMix( String role, Attribute adminPoint ) throws LdapUnwillingToPerformException
     {
         if ( isAccessControlInnerRole( role ) )
         {
@@ -1067,7 +1067,7 @@ public class AdministrativePointIntercep
      * Check that the IAPs (if any) have a parent. We will check for each kind or role :
      * AC, CA and TE.
      */
-    private void checkIAPHasParent( String role, EntryAttribute adminPoint, Dn dn )
+    private void checkIAPHasParent( String role, Attribute adminPoint, Dn dn )
         throws LdapUnwillingToPerformException
     {
         // Check for the AC role
@@ -1163,7 +1163,7 @@ public class AdministrativePointIntercep
     }
 
 
-    private void updateAPEntries( EntryAttribute adminPoint, String apUuid )
+    private void updateAPEntries( Attribute adminPoint, String apUuid )
     {
         if ( isAAP( adminPoint ) )
         {
@@ -1193,7 +1193,7 @@ public class AdministrativePointIntercep
         Dn dn = entry.getDn();
 
         // Check if we are adding an Administrative Point
-        EntryAttribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
+        Attribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
 
         if ( adminPoint == null )
         {
@@ -1248,7 +1248,7 @@ public class AdministrativePointIntercep
         Dn dn = entry.getDn();
 
         // Check if we are deleting an Administrative Point
-        EntryAttribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
+        Attribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
 
         if ( adminPoint == null )
         {
@@ -1312,7 +1312,7 @@ public class AdministrativePointIntercep
         String uuid = modifyContext.getEntry().get( ENTRY_UUID_AT ).getString();
 
         // Create a clone of the current AdminRole AT
-        EntryAttribute modifiedAdminRole = ( modifyContext.getEntry() ).getOriginalEntry().get( ADMINISTRATIVE_ROLE_AT );
+        Attribute modifiedAdminRole = ( modifyContext.getEntry() ).getOriginalEntry().get( ADMINISTRATIVE_ROLE_AT );
 
         if ( modifiedAdminRole == null )
         {
@@ -1335,7 +1335,7 @@ public class AdministrativePointIntercep
         // on it
         for ( Modification modification : modifications )
         {
-            EntryAttribute attribute = modification.getAttribute();
+            Attribute attribute = modification.getAttribute();
 
             // Skip all the attributes but AdministrativeRole
             if ( attribute.getAttributeType() == ADMINISTRATIVE_ROLE_AT )
@@ -1438,7 +1438,7 @@ public class AdministrativePointIntercep
         Entry entry = moveContext.getOriginalEntry();
 
         // Check if we are moving an Administrative Point
-        EntryAttribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
+        Attribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
 
         if ( adminPoint == null )
         {
@@ -1467,7 +1467,7 @@ public class AdministrativePointIntercep
         Entry entry = moveAndRenameContext.getOriginalEntry();
 
         // Check if we are moving and renaming an Administrative Point
-        EntryAttribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
+        Attribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
 
         if ( adminPoint == null )
         {
@@ -1495,7 +1495,7 @@ public class AdministrativePointIntercep
         Entry entry = renameContext.getEntry();
 
         // Check if we are renaming an Administrative Point
-        EntryAttribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
+        Attribute adminPoint = entry.get( ADMINISTRATIVE_ROLE_AT );
 
         if ( adminPoint == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Thu Mar 31 23:29:24 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 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.LdapException;
@@ -164,7 +164,7 @@ public abstract class AbstractAuthentica
         {
             LOG.debug( "checking if account with the Dn {} is locked", userEntry.getDn() );
             
-            EntryAttribute accountLockAttr = userEntry.get( PWD_ACCOUNT_LOCKED_TIME_AT );
+            Attribute accountLockAttr = userEntry.get( PWD_ACCOUNT_LOCKED_TIME_AT );
             if( accountLockAttr != null )
             {
                 String lockedTime = accountLockAttr.getString();
@@ -195,7 +195,7 @@ public abstract class AbstractAuthentica
             }
         }
         
-        EntryAttribute pwdStartTimeAttr = userEntry.get( PWD_START_TIME_AT );
+        Attribute pwdStartTimeAttr = userEntry.get( PWD_START_TIME_AT );
         if( pwdStartTimeAttr != null )
         {
             Date pwdStartTime = DateUtils.getDate( pwdStartTimeAttr.getString() );
@@ -206,7 +206,7 @@ public abstract class AbstractAuthentica
             }
         }
         
-        EntryAttribute pwdEndTimeAttr = userEntry.get( PWD_END_TIME_AT );
+        Attribute pwdEndTimeAttr = userEntry.get( PWD_END_TIME_AT );
         if( pwdEndTimeAttr != null )
         {
             Date pwdEndTime = DateUtils.getDate( pwdEndTimeAttr.getString() );
@@ -219,7 +219,7 @@ public abstract class AbstractAuthentica
         
         if( pPolicyConfig.getPwdMaxIdle() > 0 )
         {
-            EntryAttribute pwdLastSuccessTimeAttr = userEntry.get( PWD_LAST_SUCCESS_AT );
+            Attribute pwdLastSuccessTimeAttr = userEntry.get( PWD_LAST_SUCCESS_AT );
             long time = pPolicyConfig.getPwdMaxIdle() * 1000;
             time += DateUtils.getDate( pwdLastSuccessTimeAttr.getString() ).getTime();
             
@@ -233,7 +233,7 @@ public abstract class AbstractAuthentica
         {
             if( pPolicyConfig.getPwdGraceAuthNLimit() > 0 )
             {
-                EntryAttribute pwdGraceUseAttr = userEntry.get( PWD_GRACE_USE_TIME_AT );
+                Attribute pwdGraceUseAttr = userEntry.get( PWD_GRACE_USE_TIME_AT );
 
                 // check for grace authentication count
                 if( pwdGraceUseAttr != null )
@@ -246,7 +246,7 @@ public abstract class AbstractAuthentica
             }
             else
             {
-                EntryAttribute pwdChangeTimeAttr = userEntry.get( PWD_CHANGED_TIME_AT );
+                Attribute pwdChangeTimeAttr = userEntry.get( PWD_CHANGED_TIME_AT );
                 boolean expired = PasswordUtil.isPwdExpired( pwdChangeTimeAttr.getString(), pPolicyConfig.getPwdMaxAge() );
                 
                 if( expired )



Mime
View raw message