directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087506 [4/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/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Mar 31 23:29:24 2011
@@ -92,7 +92,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.entry.StringValue;
@@ -384,21 +384,21 @@ public class AuthenticationInterceptor e
             String pwdChangedTime = DateUtils.getGeneralizedTime();
             if ( ( policyConfig.getPwdMinAge() > 0 ) || ( policyConfig.getPwdMaxAge() > 0 ) )
             {
-                EntryAttribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
+                Attribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
                 pwdChangedTimeAt.add( pwdChangedTime );
                 entry.add( pwdChangedTimeAt );
             }
 
             if ( policyConfig.isPwdMustChange() && addContext.getSession().isAnAdministrator() )
             {
-                EntryAttribute pwdResetAt = new DefaultEntryAttribute( AT_PWD_RESET );
+                Attribute pwdResetAt = new DefaultEntryAttribute( AT_PWD_RESET );
                 pwdResetAt.add( "TRUE" );
                 entry.add( pwdResetAt );
             }
 
             if ( policyConfig.getPwdInHistory() > 0 )
             {
-                EntryAttribute pwdHistoryAt = new DefaultEntryAttribute( AT_PWD_HISTORY );
+                Attribute pwdHistoryAt = new DefaultEntryAttribute( AT_PWD_HISTORY );
                 byte[] pwdHistoryVal = new PasswordHistory( pwdChangedTime, userPassword.getValue() ).getHistoryValue();
                 pwdHistoryAt.add( pwdHistoryVal );
                 entry.add( pwdHistoryAt );
@@ -622,7 +622,7 @@ public class AuthenticationInterceptor e
 
             if ( histSize > 0 )
             {
-                EntryAttribute pwdHistoryAt = entry.get( PWD_HISTORY_AT );
+                Attribute pwdHistoryAt = entry.get( PWD_HISTORY_AT );
                 Set<PasswordHistory> pwdHistSet = new TreeSet<PasswordHistory>();
 
                 Iterator<Value<?>> itr = pwdHistoryAt.getAll();
@@ -672,7 +672,7 @@ public class AuthenticationInterceptor e
             List<Modification> mods = new ArrayList<Modification>();
             if ( ( policyConfig.getPwdMinAge() > 0 ) || ( policyConfig.getPwdMaxAge() > 0 ) )
             {
-                EntryAttribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
+                Attribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
                 pwdChangedTimeAt.add( pwdChangedTime );
                 Modification pwdChangedTimeMod = new DefaultModification( REPLACE_ATTRIBUTE, pwdChangedTimeAt );
                 mods.add( pwdChangedTimeMod );
@@ -691,7 +691,7 @@ public class AuthenticationInterceptor e
             boolean removeFromPwdResetSet = false;
             if ( policyConfig.isPwdMustChange() )
             {
-                EntryAttribute pwdMustChangeAt = new DefaultEntryAttribute( AT_PWD_RESET );
+                Attribute pwdMustChangeAt = new DefaultEntryAttribute( AT_PWD_RESET );
                 Modification pwdMustChangeMod = null;
 
                 if ( modifyContext.getSession().isAnAdministrator() )
@@ -708,13 +708,13 @@ public class AuthenticationInterceptor e
                 mods.add( pwdMustChangeMod );
             }
 
-            EntryAttribute pwdFailureTimeAt = entry.get( PWD_FAILURE_TIME_AT );
+            Attribute pwdFailureTimeAt = entry.get( PWD_FAILURE_TIME_AT );
             if ( pwdFailureTimeAt != null )
             {
                 mods.add( new DefaultModification( REMOVE_ATTRIBUTE, pwdFailureTimeAt ) );
             }
 
-            EntryAttribute pwdGraceUseTimeAt = entry.get( PWD_GRACE_USE_TIME_AT );
+            Attribute pwdGraceUseTimeAt = entry.get( PWD_GRACE_USE_TIME_AT );
             if ( pwdGraceUseTimeAt != null )
             {
                 mods.add( new DefaultModification( REMOVE_ATTRIBUTE, pwdGraceUseTimeAt ) );
@@ -962,7 +962,7 @@ public class AuthenticationInterceptor e
 
             if ( ( policyConfig != null ) && ( userEntry != null ) )
             {
-                EntryAttribute pwdFailTimeAt = userEntry.get( PWD_FAILURE_TIME_AT );
+                Attribute pwdFailTimeAt = userEntry.get( PWD_FAILURE_TIME_AT );
                 if ( pwdFailTimeAt == null )
                 {
                     pwdFailTimeAt = new DefaultEntryAttribute( AT_PWD_FAILURE_TIME );
@@ -983,7 +983,7 @@ public class AuthenticationInterceptor e
 
                 if ( policyConfig.isPwdLockout() && ( numFailures >= policyConfig.getPwdMaxFailure() ) )
                 {
-                    EntryAttribute pwdAccountLockedTimeAt = new DefaultEntryAttribute( AT_PWD_ACCOUNT_LOCKED_TIME );
+                    Attribute pwdAccountLockedTimeAt = new DefaultEntryAttribute( AT_PWD_ACCOUNT_LOCKED_TIME );
                     pwdAccountLockedTimeAt.add( failureTime );
                     Modification pwdAccountLockedMod = new DefaultModification( ADD_ATTRIBUTE, pwdAccountLockedTimeAt );
                     mods.add( pwdAccountLockedMod );
@@ -1028,20 +1028,20 @@ public class AuthenticationInterceptor e
 
             if ( policyConfig.getPwdMaxIdle() > 0 )
             {
-                EntryAttribute pwdLastSuccesTimeAt = new DefaultEntryAttribute( AT_PWD_LAST_SUCCESS );
+                Attribute pwdLastSuccesTimeAt = new DefaultEntryAttribute( AT_PWD_LAST_SUCCESS );
                 pwdLastSuccesTimeAt.add( DateUtils.getGeneralizedTime() );
                 Modification pwdLastSuccesTimeMod = new DefaultModification( REPLACE_ATTRIBUTE, pwdLastSuccesTimeAt );
                 mods.add( pwdLastSuccesTimeMod );
             }
 
-            EntryAttribute pwdFailTimeAt = userEntry.get( AT_PWD_FAILURE_TIME );
+            Attribute pwdFailTimeAt = userEntry.get( AT_PWD_FAILURE_TIME );
             if ( pwdFailTimeAt != null )
             {
                 Modification pwdFailTimeMod = new DefaultModification( REMOVE_ATTRIBUTE, pwdFailTimeAt );
                 mods.add( pwdFailTimeMod );
             }
 
-            EntryAttribute pwdAccLockedTimeAt = userEntry.get( AT_PWD_ACCOUNT_LOCKED_TIME );
+            Attribute pwdAccLockedTimeAt = userEntry.get( AT_PWD_ACCOUNT_LOCKED_TIME );
             if ( pwdAccLockedTimeAt != null )
             {
                 Modification pwdAccLockedTimeMod = new DefaultModification( REMOVE_ATTRIBUTE, pwdAccLockedTimeAt );
@@ -1051,14 +1051,14 @@ public class AuthenticationInterceptor e
             // checking the expiration time *after* performing authentication, do we need to care about millisecond precision?
             if ( ( policyConfig.getPwdMaxAge() > 0 ) && ( policyConfig.getPwdGraceAuthNLimit() > 0 ) )
             {
-                EntryAttribute pwdChangeTimeAttr = userEntry.get( PWD_CHANGED_TIME_AT );
+                Attribute pwdChangeTimeAttr = userEntry.get( PWD_CHANGED_TIME_AT );
                 if ( pwdChangeTimeAttr != null )
                 {
                     boolean expired = PasswordUtil.isPwdExpired( pwdChangeTimeAttr.getString(),
                         policyConfig.getPwdMaxAge() );
                     if ( expired )
                     {
-                        EntryAttribute pwdGraceUseAttr = userEntry.get( PWD_GRACE_USE_TIME_AT );
+                        Attribute pwdGraceUseAttr = userEntry.get( PWD_GRACE_USE_TIME_AT );
                         if ( pwdGraceUseAttr != null )
                         {
                             pwdRespCtrl.getResponse().setGraceAuthNsRemaining( policyConfig.getPwdGraceAuthNLimit()
@@ -1258,13 +1258,13 @@ public class AuthenticationInterceptor e
             return 0;
         }
 
-        EntryAttribute pwdExpireWarningAt = userEntry.get( PWD_EXPIRE_WARNING_AT );
+        Attribute pwdExpireWarningAt = userEntry.get( PWD_EXPIRE_WARNING_AT );
         if ( pwdExpireWarningAt == null )
         {
             return 0;
         }
 
-        EntryAttribute pwdChangedTimeAt = userEntry.get( PWD_CHANGED_TIME_AT );
+        Attribute pwdChangedTimeAt = userEntry.get( PWD_CHANGED_TIME_AT );
         long changedTime = DateUtils.getDate(pwdChangedTimeAt.getString()).getTime();
 
         int pwdAge = ( int ) ( System.currentTimeMillis() - changedTime ) / 1000;
@@ -1299,7 +1299,7 @@ public class AuthenticationInterceptor e
             return false;
         }
 
-        EntryAttribute pwdChangedTimeAt = userEntry.get( PWD_CHANGED_TIME_AT );
+        Attribute pwdChangedTimeAt = userEntry.get( PWD_CHANGED_TIME_AT );
         long changedTime = DateUtils.getDate( pwdChangedTimeAt.getString() ).getTime();
         changedTime += policyConfig.getPwdMinAge() * 1000;
 
@@ -1323,7 +1323,7 @@ public class AuthenticationInterceptor e
     {
         boolean mustChange = false;
 
-        EntryAttribute pwdResetAt = userEntry.get( PWD_RESET_AT );
+        Attribute pwdResetAt = userEntry.get( PWD_RESET_AT );
         if ( pwdResetAt != null )
         {
             mustChange = Boolean.parseBoolean( pwdResetAt.getString() );
@@ -1340,7 +1340,7 @@ public class AuthenticationInterceptor e
         List<Modification> mods = modifyContext.getModItems();
         for ( Modification m : mods )
         {
-            EntryAttribute at = m.getAttribute();
+            Attribute at = m.getAttribute();
 
             if ( at.getUpId().equalsIgnoreCase( policyConfig.getPwdAttribute() ) )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java Thu Mar 31 23:29:24 2011
@@ -33,7 +33,7 @@ import java.util.List;
 
 import org.apache.directory.server.core.PasswordPolicyConfiguration;
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
-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.util.Base64;
 import org.apache.directory.shared.util.DateUtils;
@@ -517,7 +517,7 @@ public class PasswordUtil
      * purges failure timestamps which are older than the configured interval
      * (section 7.6 in the draft)
      */
-    public static void purgeFailureTimes( PasswordPolicyConfiguration config, EntryAttribute pwdFailTimeAt )
+    public static void purgeFailureTimes( PasswordPolicyConfiguration config, Attribute pwdFailTimeAt )
     {
         long interval = config.getPwdFailureCountInterval();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Thu Mar 31 23:29:24 2011
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 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.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -289,7 +289,7 @@ public class SimpleAuthenticator extends
 
         Value<?> userPassword;
 
-        EntryAttribute userPasswordAttr = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute userPasswordAttr = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
 
         bindContext.setEntry( new ClonedServerEntry( userEntry ) );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Mar 31 23:29:24 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.constants.Loggers;
 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.Modification;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -350,7 +350,7 @@ public class AciAuthorizationInterceptor
             originalEntry = entry;
         }
 
-        EntryAttribute oc = originalEntry.get( OBJECT_CLASS_AT );
+        Attribute oc = originalEntry.get( OBJECT_CLASS_AT );
 
         /*
          * If the protected entry is a subentry, then the entry being evaluated
@@ -367,7 +367,7 @@ public class AciAuthorizationInterceptor
             originalEntry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
         }
 
-        EntryAttribute subentries = originalEntry.get( ACCESS_CONTROL_SUBENTRIES_AT );
+        Attribute subentries = originalEntry.get( ACCESS_CONTROL_SUBENTRIES_AT );
 
         if ( subentries == null )
         {
@@ -392,7 +392,7 @@ public class AciAuthorizationInterceptor
      */
     private void addEntryAciTuples( Collection<ACITuple> tuples, Entry entry ) throws LdapException
     {
-        EntryAttribute entryAci = entry.get( ENTRY_ACI_AT );
+        Attribute entryAci = entry.get( ENTRY_ACI_AT );
 
         if ( entryAci == null )
         {
@@ -445,7 +445,7 @@ public class AciAuthorizationInterceptor
         Entry administrativeEntry = ( ( ClonedServerEntry ) opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ) )
             .getOriginalEntry();
 
-        EntryAttribute subentryAci = administrativeEntry.get( SUBENTRY_ACI_AT );
+        Attribute subentryAci = administrativeEntry.get( SUBENTRY_ACI_AT );
 
         if ( subentryAci == null )
         {
@@ -530,7 +530,7 @@ public class AciAuthorizationInterceptor
             .getName() );
         Entry subentry = subentryInterceptor.getSubentryAttributes( dn, serverEntry );
 
-        for ( EntryAttribute attribute : serverEntry )
+        for ( Attribute attribute : serverEntry )
         {
             subentry.put( attribute );
         }
@@ -557,7 +557,7 @@ public class AciAuthorizationInterceptor
         engine.checkPermission( entryAciCtx );
 
         // now we must check if attribute type and value scope permission is granted
-        for ( EntryAttribute attribute : serverEntry )
+        for ( Attribute attribute : serverEntry )
         {
             for ( Value<?> value : attribute )
             {
@@ -703,7 +703,7 @@ public class AciAuthorizationInterceptor
 
         for ( Modification mod : mods )
         {
-            EntryAttribute attr = mod.getAttribute();
+            Attribute attr = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {
@@ -731,7 +731,7 @@ public class AciAuthorizationInterceptor
 
                 case REMOVE_ATTRIBUTE:
                     perms = REMOVE_PERMS;
-                    EntryAttribute entryAttr = entry.get( attr.getId() );
+                    Attribute entryAttr = entry.get( attr.getId() );
 
                     if ( entryAttr != null )
                     {
@@ -900,7 +900,7 @@ public class AciAuthorizationInterceptor
         engine.checkPermission( aciContext );
 
         // check that we have read access to every attribute type and value
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
 
             for ( Value<?> value : attribute )
@@ -1075,7 +1075,7 @@ public class AciAuthorizationInterceptor
             .getName() );
         Entry subentryAttrs = subentryInterceptor.getSubentryAttributes( newDn, importedEntry );
 
-        for ( EntryAttribute attribute : importedEntry )
+        for ( Attribute attribute : importedEntry )
         {
             subentryAttrs.put( attribute );
         }
@@ -1169,7 +1169,7 @@ public class AciAuthorizationInterceptor
             .getName() );
         Entry subentryAttrs = subentryInterceptor.getSubentryAttributes( newDn, importedEntry );
 
-        for ( EntryAttribute attribute : importedEntry )
+        for ( Attribute attribute : importedEntry )
         {
             subentryAttrs.put( attribute );
         }
@@ -1346,7 +1346,7 @@ public class AciAuthorizationInterceptor
         for ( AttributeType attributeType : clonedEntry.getAttributeTypes() )
         {
             // if attribute type scope access is not allowed then remove the attribute and continue
-            EntryAttribute attr = clonedEntry.get( attributeType );
+            Attribute attr = clonedEntry.get( attributeType );
 
             aciContext = new AciContext( schemaManager, opContext );
             aciContext.setUserGroupNames( userGroups );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Thu Mar 31 23:29:24 2011
@@ -51,7 +51,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException;
@@ -126,7 +126,7 @@ public class DefaultAuthorizationInterce
             return;
         }
 
-        EntryAttribute uniqueMember = adminGroup.get( UNIQUE_MEMBER_AT );
+        Attribute uniqueMember = adminGroup.get( UNIQUE_MEMBER_AT );
 
         for ( Value<?> value : uniqueMember )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Thu Mar 31 23:29:24 2011
@@ -39,7 +39,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.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -162,7 +162,7 @@ public class GroupCache
                 {
                     Entry result = results.get();
                     Dn groupDn = result.getDn().apply( schemaManager );
-                    EntryAttribute members = getMemberAttribute( result );
+                    Attribute members = getMemberAttribute( result );
     
                     if ( members != null )
                     {
@@ -202,16 +202,16 @@ public class GroupCache
      * @param entry the entry inspected for member attributes
      * @return the member attribute
      */
-    private EntryAttribute getMemberAttribute( Entry entry ) throws LdapException
+    private Attribute getMemberAttribute( Entry entry ) throws LdapException
     {
-        EntryAttribute member = entry.get( MEMBER_AT );
+        Attribute member = entry.get( MEMBER_AT );
 
         if ( member != null )
         {
             return member;
         }
 
-        EntryAttribute uniqueMember = entry.get( UNIQUE_MEMBER_AT );
+        Attribute uniqueMember = entry.get( UNIQUE_MEMBER_AT );
 
         if ( uniqueMember != null )
         {
@@ -229,7 +229,7 @@ public class GroupCache
      * @param members the member attribute values being added
      * @throws LdapException if there are problems accessing the attr values
      */
-    private void addMembers( Set<String> memberSet, EntryAttribute members ) throws LdapException
+    private void addMembers( Set<String> memberSet, Attribute members ) throws LdapException
     {
         for ( Value<?> value : members )
         {
@@ -258,7 +258,7 @@ public class GroupCache
      * @param members the set of member values
      * @throws LdapException if there are problems accessing the attr values
      */
-    private void removeMembers( Set<String> memberSet, EntryAttribute members ) throws LdapException
+    private void removeMembers( Set<String> memberSet, Attribute members ) throws LdapException
     {
         for ( Value<?> value : members )
         {
@@ -289,7 +289,7 @@ public class GroupCache
      */
     public void groupAdded( Dn name, Entry entry ) throws LdapException
     {
-        EntryAttribute members = getMemberAttribute( entry );
+        Attribute members = getMemberAttribute( entry );
 
         if ( members == null )
         {
@@ -318,7 +318,7 @@ public class GroupCache
      */
     public void groupDeleted( Dn name, Entry entry ) throws LdapException
     {
-        EntryAttribute members = getMemberAttribute( entry );
+        Attribute members = getMemberAttribute( entry );
 
         if ( members == null )
         {
@@ -343,7 +343,7 @@ public class GroupCache
      * @param members the members being added, removed or replaced
      * @throws LdapException if there are problems accessing attribute values
      */
-    private void modify( Set<String> memberSet, ModificationOperation modOp, EntryAttribute members )
+    private void modify( Set<String> memberSet, ModificationOperation modOp, Attribute members )
         throws LdapException
     {
 
@@ -384,9 +384,9 @@ public class GroupCache
     public void groupModified( Dn name, List<Modification> mods, Entry entry, SchemaManager schemaManager )
         throws LdapException
     {
-        EntryAttribute members = null;
+        Attribute members = null;
         AttributeType memberAttr = null;
-        EntryAttribute oc = entry.get( OBJECT_CLASS_AT );
+        Attribute oc = entry.get( OBJECT_CLASS_AT );
 
         if ( oc.contains( SchemaConstants.GROUP_OF_NAMES_OC ) )
         {
@@ -439,7 +439,7 @@ public class GroupCache
      */
     public void groupModified( Dn name, ModificationOperation modOp, Entry mods ) throws LdapException
     {
-        EntryAttribute members = getMemberAttribute( mods );
+        Attribute members = getMemberAttribute( mods );
 
         if ( members == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Thu Mar 31 23:29:24 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ACITuple;
 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.Modification;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -145,7 +145,7 @@ public class TupleCache
                 {
                     Entry result = results.get();
                     Dn subentryDn = result.getDn().apply( session.getDirectoryService().getSchemaManager() );
-                    EntryAttribute aci = result.get( PRESCRIPTIVE_ACI_AT );
+                    Attribute aci = result.get( PRESCRIPTIVE_ACI_AT );
 
                     if ( aci == null )
                     {
@@ -173,7 +173,7 @@ public class TupleCache
     private boolean hasPrescriptiveACI( Entry entry ) throws LdapException
     {
         // only do something if the entry contains prescriptiveACI
-        EntryAttribute aci = entry.get( PRESCRIPTIVE_ACI_AT );
+        Attribute aci = entry.get( PRESCRIPTIVE_ACI_AT );
 
         if ( aci == null )
         {
@@ -203,7 +203,7 @@ public class TupleCache
         }
 
         // Get the prescriptiveACI
-        EntryAttribute prescriptiveAci = entry.get( PRESCRIPTIVE_ACI_AT );
+        Attribute prescriptiveAci = entry.get( PRESCRIPTIVE_ACI_AT );
 
         List<ACITuple> entryTuples = new ArrayList<ACITuple>();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Thu Mar 31 23:29:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
 import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
 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.schema.AttributeType;
 
@@ -91,7 +91,7 @@ public class MaxValueCountFilter impleme
             
             if ( attributeType.equals( mvcItem.getAttributeType() ) )
             {
-                EntryAttribute attr = entryView.get( attributeType );
+                Attribute attr = entryView.get( attributeType );
                 int attrCount = attr == null ? 0 : attr.size();
                 
                 if ( attrCount > mvcItem.getMaxCount() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Thu Mar 31 23:29:24 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 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.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -177,9 +177,9 @@ public class RelatedProtectedItemFilter 
 
                 AttributeValueItem av = ( AttributeValueItem ) item;
                 
-                for ( Iterator<EntryAttribute> j = av.iterator(); j.hasNext(); )
+                for ( Iterator<Attribute> j = av.iterator(); j.hasNext(); )
                 {
-                    EntryAttribute entryAttribute = j.next();
+                    Attribute entryAttribute = j.next();
                     
                     AttributeType attr =  entryAttribute.getAttributeType();
                     String attrOid = null;
@@ -276,7 +276,7 @@ public class RelatedProtectedItemFilter 
                     
                     if ( oid.equals( attr.getOid() ) )
                     {
-                        EntryAttribute entryAttribute = entry.get( oid );
+                        Attribute entryAttribute = entry.get( oid );
                         
                         if ( ( entryAttribute != null ) && 
                              ( ( entryAttribute.contains( userName.getNormName() ) || 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Thu Mar 31 23:29:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
 import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -88,7 +88,7 @@ public class RestrictedByFilter implemen
                     // TODO Fix DIRSEVER-832 
                     if ( attributeType.equals( rbItem.getAttributeType() ) )
                     {
-                        EntryAttribute attr = entry.get( rbItem.getValuesIn() );
+                        Attribute attr = entry.get( rbItem.getValuesIn() );
                         
                         // TODO Fix DIRSEVER-832
                         if ( ( attr == null ) || !attr.contains( attrValue ) )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Thu Mar 31 23:29:24 2011
@@ -40,7 +40,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.entry.Modification;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.ldif.ChangeType;
@@ -167,7 +167,7 @@ public class ChangeLogInterceptor extend
         
         boolean isCollectiveSubentry = serverEntry.hasObjectClass( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC );
 
-        for ( EntryAttribute attribute : serverEntry )
+        for ( Attribute attribute : serverEntry )
         {
             // filter collective attributes, they can't be added by the revert operation
             AttributeType at = schemaService.getSchemaManager().getAttributeTypeRegistry().lookup( attribute.getId() );
@@ -271,7 +271,7 @@ public class ChangeLogInterceptor extend
         
         Entry clientEntry = new DefaultEntry( serverEntry.getDn() );
         
-        for ( EntryAttribute attribute:serverEntry )
+        for ( Attribute attribute:serverEntry )
         {
             clientEntry.add( attribute.clone() );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Thu Mar 31 23:29:24 2011
@@ -42,7 +42,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.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -188,7 +188,7 @@ public class CollectiveAttributeIntercep
         {
             // This is a collectiveAttribute subentry. It must have at least one collective
             // attribute
-            for ( EntryAttribute attribute : entry )
+            for ( Attribute attribute : entry )
             {
                 if ( attribute.getAttributeType().isCollective() )
                 {
@@ -250,7 +250,7 @@ public class CollectiveAttributeIntercep
         for ( Modification mod : mods )
         {
             // TODO: handle http://issues.apache.org/jira/browse/DIRSERVER-1198
-            EntryAttribute attr = mod.getAttribute();
+            Attribute attr = mod.getAttribute();
             AttributeType attrType = attr.getAttributeType();
 
             // Defensive programming. Very unlikely to happen here...
@@ -313,7 +313,7 @@ public class CollectiveAttributeIntercep
      */
     private void addCollectiveAttributes( OperationContext opContext, Entry entry, String[] retAttrs ) throws LdapException
     {
-        EntryAttribute collectiveAttributeSubentries = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get(
+        Attribute collectiveAttributeSubentries = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get(
             COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
 
         /*
@@ -331,7 +331,7 @@ public class CollectiveAttributeIntercep
          * in the exclusions set instead of regular names that may have case 
          * variance.
          */
-        EntryAttribute collectiveExclusions = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get(
+        Attribute collectiveExclusions = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get(
             COLLECTIVE_EXCLUSIONS_AT );
         Set<String> exclusions = new HashSet<String>();
 
@@ -450,8 +450,8 @@ public class CollectiveAttributeIntercep
                     continue;
                 }
 
-                EntryAttribute subentryColAttr = subentry.get( attrId );
-                EntryAttribute entryColAttr = entry.get( attrId );
+                Attribute subentryColAttr = subentry.get( attrId );
+                Attribute entryColAttr = entry.get( attrId );
 
                 /*
                  * If entry does not have attribute for collective attribute then create it.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Thu Mar 31 23:29:24 2011
@@ -24,7 +24,7 @@ import java.util.Comparator;
 
 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;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
@@ -162,7 +162,7 @@ public class LeafEvaluator implements Ev
         AttributeType attributeType = node.getAttributeType();
 
         // get the attribute associated with the node
-        EntryAttribute attr = entry.get( node.getAttribute() );
+        Attribute attr = entry.get( node.getAttribute() );
 
         // If we do not have the attribute just return false
         if ( null == attr )
@@ -249,7 +249,7 @@ public class LeafEvaluator implements Ev
         Comparator comparator = getComparator( node.getAttributeType() );
 
         // get the attribute associated with the node
-        EntryAttribute attr = entry.get( node.getAttribute() );
+        Attribute attr = entry.get( node.getAttribute() );
 
         // If we do not have the attribute just return false
         if ( null == attr )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Thu Mar 31 23:29:24 2011
@@ -25,7 +25,7 @@ import java.util.regex.PatternSyntaxExce
 
 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;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
@@ -71,7 +71,7 @@ public class SubstringEvaluator implemen
         
 
         // get the attribute
-        EntryAttribute attr = entry.get( snode.getAttribute() );
+        Attribute attr = entry.get( snode.getAttribute() );
 
         // if the attribute does not exist just return false
         if ( null == attr )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Thu Mar 31 23:29:24 2011
@@ -44,7 +44,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
 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.LdapAliasException;
 import org.apache.directory.shared.ldap.model.exception.LdapEntryAlreadyExistsException;
@@ -170,7 +170,7 @@ public class ExceptionInterceptor extend
                 throw e2;
             }
 
-            EntryAttribute objectClass = ( ( ClonedServerEntry ) attrs ).getOriginalEntry().get(
+            Attribute objectClass = ( ( ClonedServerEntry ) attrs ).getOriginalEntry().get(
                 OBJECT_CLASS_AT );
 
             if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.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.constants.SchemaConstants;
 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.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 
@@ -84,7 +84,7 @@ public class PasswordHashingInterceptor 
 
         Entry entry = addContext.getEntry();
 
-        EntryAttribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
+        Attribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
 
         includeHashedPassword( pwdAt );
 
@@ -124,7 +124,7 @@ public class PasswordHashingInterceptor 
      *
      * @param pwdAt the password attribute
      */
-    private void includeHashedPassword( EntryAttribute pwdAt ) throws LdapException
+    private void includeHashedPassword( Attribute pwdAt ) throws LdapException
     {
         if ( pwdAt == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Thu Mar 31 23:29:24 2011
@@ -49,7 +49,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.entry.Value;
@@ -300,7 +300,7 @@ public class OperationalAttributeInterce
         if ( !modifierAtPresent )
         {
             // Inject the ModifiersName AT if it's not present
-            EntryAttribute attribute = new DefaultEntryAttribute( MODIFIERS_NAME_AT, getPrincipal()
+            Attribute attribute = new DefaultEntryAttribute( MODIFIERS_NAME_AT, getPrincipal()
                 .getName() );
 
             Modification modifiersName = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -311,7 +311,7 @@ public class OperationalAttributeInterce
         if ( !modifiedTimeAtPresent )
         {
             // Inject the ModifyTimestamp AT if it's not present
-            EntryAttribute attribute = new DefaultEntryAttribute( MODIFY_TIMESTAMP_AT, DateUtils
+            Attribute attribute = new DefaultEntryAttribute( MODIFY_TIMESTAMP_AT, DateUtils
                 .getGeneralizedTime() );
 
             Modification timestamp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -322,7 +322,7 @@ public class OperationalAttributeInterce
         if ( !entryCsnAtPresent )
         {
             String csn = directoryService.getCSN().toString();
-            EntryAttribute attribute = new DefaultEntryAttribute( ENTRY_CSN_AT, csn );
+            Attribute attribute = new DefaultEntryAttribute( ENTRY_CSN_AT, csn );
             Modification updatedCsn = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
             mods.add( updatedCsn );
         }
@@ -492,7 +492,7 @@ public class OperationalAttributeInterce
     {
         if ( directoryService.isDenormalizeOpAttrsEnabled() )
         {
-            EntryAttribute attr = entry.get( SchemaConstants.CREATORS_NAME_AT );
+            Attribute attr = entry.get( SchemaConstants.CREATORS_NAME_AT );
 
             if ( attr != null )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.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.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.entry.Value;
@@ -335,7 +335,7 @@ public class DefaultPartitionNexus exten
         {
             partitions.put( key, system );
             partitionLookupTree.add( system.getSuffix(), system );
-            EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+            Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
 
             if ( namingContexts == null )
             {
@@ -433,11 +433,11 @@ public class DefaultPartitionNexus exten
             {
                 lastSyncedCtxCsn = directoryService.getContextCsn();
 
-                EntryAttribute contextCsnAt = mods.get( 0 ).getAttribute();
+                Attribute contextCsnAt = mods.get( 0 ).getAttribute();
                 contextCsnAt.clear();
                 contextCsnAt.add( lastSyncedCtxCsn );
 
-                EntryAttribute timeStampAt = mods.get( 1 ).getAttribute();
+                Attribute timeStampAt = mods.get( 1 ).getAttribute();
                 timeStampAt.clear();
                 timeStampAt.add( DateUtils.getGeneralizedTime() );
 
@@ -495,7 +495,7 @@ public class DefaultPartitionNexus exten
         Partition backend = getPartition( addContext.getDn() );
         backend.add( addContext );
 
-        EntryAttribute at = addContext.getEntry().get( SchemaConstants.ENTRY_CSN_AT );
+        Attribute at = addContext.getEntry().get( SchemaConstants.ENTRY_CSN_AT );
         directoryService.setContextCsn( at.getString() );
     }
 
@@ -515,7 +515,7 @@ public class DefaultPartitionNexus exten
      */
     public boolean compare( CompareOperationContext compareContext ) throws LdapException
     {
-        EntryAttribute attr = compareContext.getOriginalEntry().get( compareContext.getAttributeType() );
+        Attribute attr = compareContext.getOriginalEntry().get( compareContext.getAttributeType() );
 
         // complain if the attribute being compared does not exist in the entry
         if ( attr == null )
@@ -775,7 +775,7 @@ public class DefaultPartitionNexus exten
 
         Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchContext.getSession() ) );
 
-        for ( EntryAttribute attribute : rootDSE )
+        for ( Attribute attribute : rootDSE )
         {
             AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute.getUpId() );
 
@@ -945,7 +945,7 @@ public class DefaultPartitionNexus exten
             partitions.put( partitionSuffix.getNormName(), partition );
             partitionLookupTree.add( partition.getSuffix(), partition );
 
-            EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+            Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
 
             if ( namingContexts == null )
             {
@@ -984,7 +984,7 @@ public class DefaultPartitionNexus exten
 
         // Retrieve the namingContexts from the RootDSE : the partition
         // suffix must be present in those namingContexts
-        EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+        Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
 
         if ( namingContexts != null )
         {
@@ -1072,7 +1072,7 @@ public class DefaultPartitionNexus exten
      */
     public void registerSupportedExtensions( Set<String> extensionOids ) throws LdapException
     {
-        EntryAttribute supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT );
+        Attribute supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT );
 
         if ( supportedExtension == null )
         {
@@ -1092,7 +1092,7 @@ public class DefaultPartitionNexus exten
      */
     public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws LdapException
     {
-        EntryAttribute supportedSaslMechanismsAttribute = rootDSE.get( SchemaConstants.SUPPORTED_SASL_MECHANISMS_AT );
+        Attribute supportedSaslMechanismsAttribute = rootDSE.get( SchemaConstants.SUPPORTED_SASL_MECHANISMS_AT );
 
         if ( supportedSaslMechanismsAttribute == null )
         {
@@ -1122,7 +1122,7 @@ public class DefaultPartitionNexus exten
      */
     private void unregister( Partition partition ) throws Exception
     {
-        EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+        Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
 
         if ( namingContexts != null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Thu Mar 31 23:29:24 2011
@@ -36,7 +36,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.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -245,7 +245,7 @@ public class ServerSystemPreferences ext
         {
             Entry entry = directoryService.getAdminSession().lookup( dn );
 
-            for ( EntryAttribute attr : entry )
+            for ( Attribute attr : entry )
             {
                 String oid = attr.getAttributeType().getOid();
                 
@@ -272,7 +272,7 @@ public class ServerSystemPreferences ext
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
-            EntryAttribute attr = new DefaultEntryAttribute( at );
+            Attribute attr = new DefaultEntryAttribute( at );
             Modification mi = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
             addDelta( mi );
         }
@@ -307,7 +307,7 @@ public class ServerSystemPreferences ext
     {
         try
         {
-            EntryAttribute attr = directoryService.getAdminSession().lookup( dn ).get( key );
+            Attribute attr = directoryService.getAdminSession().lookup( dn ).get( key );
             
             if ( keyToChange.containsKey( key ) )
             {
@@ -346,7 +346,7 @@ public class ServerSystemPreferences ext
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
-            EntryAttribute attr = new DefaultEntryAttribute( at, value );
+            Attribute attr = new DefaultEntryAttribute( at, value );
             Modification mi = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
             addDelta( mi );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Thu Mar 31 23:29:24 2011
@@ -38,7 +38,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.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -146,7 +146,7 @@ public class ReferralInterceptor extends
             return false;
         }
 
-        EntryAttribute oc = entry.get( OBJECT_CLASS_AT );
+        Attribute oc = entry.get( OBJECT_CLASS_AT );
 
         if ( oc == null )
         {
@@ -164,7 +164,7 @@ public class ReferralInterceptor extends
             // valid, accordingly to the RFC
 
             // Get the 'ref' attributeType
-            EntryAttribute refAttr = entry.get( SchemaConstants.REF_AT );
+            Attribute refAttr = entry.get( SchemaConstants.REF_AT );
 
             if ( refAttr == null )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Thu Mar 31 23:29:24 2011
@@ -27,7 +27,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.DefaultEntryAttribute;
-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.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -112,7 +112,7 @@ public class AttributesFactory
         
         if ( dependencies != null && dependencies.length > 0 )
         {
-            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
+            Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
             
             for ( String dependency:dependencies )
             {
@@ -335,7 +335,7 @@ public class AttributesFactory
         // handle the superior objectClasses 
         if ( objectClass.getSuperiorOids() != null && objectClass.getSuperiorOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
+            Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
             
             for ( String superior:objectClass.getSuperiorOids() )
             {
@@ -348,7 +348,7 @@ public class AttributesFactory
         // add the must list
         if ( objectClass.getMustAttributeTypeOids() != null && objectClass.getMustAttributeTypeOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MUST_AT ) );
+            Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MUST_AT ) );
 
             for ( String mustOid :objectClass.getMustAttributeTypeOids() )
             {
@@ -361,7 +361,7 @@ public class AttributesFactory
         // add the may list
         if ( objectClass.getMayAttributeTypeOids() != null && objectClass.getMayAttributeTypeOids().size() != 0 )
         {
-            EntryAttribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MAY_AT ) );
+            Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MAY_AT ) );
 
             for ( String mayOid :objectClass.getMayAttributeTypeOids() )
             {
@@ -395,7 +395,7 @@ public class AttributesFactory
             return;
         }
         
-        EntryAttribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_NAME_AT ) );
+        Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_NAME_AT ) );
 
         for ( String name:names )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Thu Mar 31 23:29:24 2011
@@ -29,7 +29,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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -105,9 +105,9 @@ public class DefaultSchemaService implem
     /**
      * Generate the comparators attribute from the registry
      */
-    private EntryAttribute generateComparators() throws LdapException
+    private Attribute generateComparators() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.COMPARATORS_AT ) );
 
         for ( LdapComparator<?> comparator : getSchemaManager().getComparatorRegistry() )
@@ -119,9 +119,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateNormalizers() throws LdapException
+    private Attribute generateNormalizers() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.NORMALIZERS_AT ) );
 
         NormalizerRegistry nr = getSchemaManager().getNormalizerRegistry();
@@ -135,9 +135,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateSyntaxCheckers() throws LdapException
+    private Attribute generateSyntaxCheckers() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.SYNTAX_CHECKERS_AT ) );
 
         for ( SyntaxChecker syntaxChecker : getSchemaManager().getSyntaxCheckerRegistry() )
@@ -149,9 +149,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateObjectClasses() throws LdapException
+    private Attribute generateObjectClasses() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute(
+        Attribute attr = new DefaultEntryAttribute(
             getSchemaManager().getAttributeType( SchemaConstants.OBJECT_CLASSES_AT ) );
 
         for ( ObjectClass objectClass : getSchemaManager().getObjectClassRegistry() )
@@ -163,9 +163,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateAttributeTypes() throws LdapException
+    private Attribute generateAttributeTypes() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
 
         for ( AttributeType attributeType : getSchemaManager().getAttributeTypeRegistry() )
@@ -177,9 +177,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateMatchingRules() throws LdapException
+    private Attribute generateMatchingRules() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.MATCHING_RULES_AT ) );
 
         for ( MatchingRule matchingRule : getSchemaManager().getMatchingRuleRegistry() )
@@ -191,9 +191,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateMatchingRuleUses() throws LdapException
+    private Attribute generateMatchingRuleUses() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute(
+        Attribute attr = new DefaultEntryAttribute(
             getSchemaManager().getAttributeType( SchemaConstants.MATCHING_RULE_USE_AT ) );
 
         for ( MatchingRuleUse matchingRuleUse : getSchemaManager().getMatchingRuleUseRegistry() )
@@ -205,9 +205,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateSyntaxes() throws LdapException
+    private Attribute generateSyntaxes() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.LDAP_SYNTAXES_AT ) );
 
         for ( LdapSyntax syntax : getSchemaManager().getLdapSyntaxRegistry() )
@@ -219,9 +219,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateDitContextRules() throws LdapException
+    private Attribute generateDitContextRules() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.DIT_CONTENT_RULES_AT ) );
 
         for ( DITContentRule ditContentRule : getSchemaManager().getDITContentRuleRegistry() )
@@ -233,9 +233,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateDitStructureRules() throws LdapException
+    private Attribute generateDitStructureRules() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
 
         for ( DITStructureRule ditStructureRule : getSchemaManager().getDITStructureRuleRegistry() )
@@ -247,9 +247,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private EntryAttribute generateNameForms() throws LdapException
+    private Attribute generateNameForms() throws LdapException
     {
-        EntryAttribute attr = new DefaultEntryAttribute( 
+        Attribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.NAME_FORMS_AT ) );
 
         for ( NameForm nameForm : getSchemaManager().getNameFormRegistry() )
@@ -298,18 +298,18 @@ public class DefaultSchemaService implem
         // -------------------------------------------------------------------
 
         // Add the createTimestamp
-        EntryAttribute createTimestamp = mods.get( SchemaConstants.CREATE_TIMESTAMP_AT );
+        Attribute createTimestamp = mods.get( SchemaConstants.CREATE_TIMESTAMP_AT );
         attrs.put( SchemaConstants.CREATE_TIMESTAMP_AT, createTimestamp.get() );
 
         // Add the creatorsName
         attrs.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN );
 
         // Add the modifyTimestamp
-        EntryAttribute schemaModifyTimestamp = mods.get( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT );
+        Attribute schemaModifyTimestamp = mods.get( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT );
         attrs.put( SchemaConstants.MODIFY_TIMESTAMP_AT, schemaModifyTimestamp.get() );
 
         // Add the modifiersName
-        EntryAttribute schemaModifiersName = mods.get( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT );
+        Attribute schemaModifiersName = mods.get( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT );
         attrs.put( SchemaConstants.MODIFIERS_NAME_AT, schemaModifiersName.get() );
 
         // don't swap out if a request for the subentry is in progress or we
@@ -323,7 +323,7 @@ public class DefaultSchemaService implem
 
     private void addAttribute( Entry attrs, String id ) throws LdapException
     {
-        EntryAttribute attr = schemaSubentry.get( id );
+        Attribute attr = schemaSubentry.get( id );
 
         if ( attr != null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Thu Mar 31 23:29:24 2011
@@ -36,7 +36,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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.exception.LdapOtherException;
@@ -149,7 +149,7 @@ public class PartitionSchemaLoader exten
 
         for ( Entry sr : results )
         {
-            EntryAttribute cn = sr.get( cnAT );
+            Attribute cn = sr.get( cnAT );
             dependees.add( cn.getString() );
         }
 
@@ -177,7 +177,7 @@ public class PartitionSchemaLoader exten
 
         for ( Entry sr : results )
         {
-            EntryAttribute cn = sr.get( cnAT );
+            Attribute cn = sr.get( cnAT );
             dependees.add( cn.getString() );
         }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Mar 31 23:29:24 2011
@@ -58,7 +58,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.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -772,7 +772,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private boolean getObjectClasses( EntryAttribute objectClasses, List<ObjectClass> result ) throws LdapException
+    private boolean getObjectClasses( Attribute objectClasses, List<ObjectClass> result ) throws LdapException
     {
         Set<String> ocSeen = new HashSet<String>();
 
@@ -811,7 +811,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private Set<String> getAllMust( EntryAttribute objectClasses ) throws LdapException
+    private Set<String> getAllMust( Attribute objectClasses ) throws LdapException
     {
         Set<String> must = new HashSet<String>();
 
@@ -837,7 +837,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private Set<String> getAllAllowed( EntryAttribute objectClasses, Set<String> must ) throws LdapException
+    private Set<String> getAllAllowed( Attribute objectClasses, Set<String> must ) throws LdapException
     {
         Set<String> allowed = new HashSet<String>( must );
 
@@ -877,7 +877,7 @@ public class SchemaInterceptor extends B
      * @param objectClassAttr the objectClass attribute to modify
      * @throws Exception if there are problems
      */
-    private void alterObjectClasses( EntryAttribute objectClassAttr ) throws LdapException
+    private void alterObjectClasses( Attribute objectClassAttr ) throws LdapException
     {
         Set<String> objectClasses = new HashSet<String>();
         Set<String> objectClassesUP = new HashSet<String>();
@@ -989,12 +989,12 @@ public class SchemaInterceptor extends B
     /**
      * Create a new attribute using the given values
      */
-    private EntryAttribute createNewAttribute( EntryAttribute attribute ) throws LdapException
+    private Attribute createNewAttribute( Attribute attribute ) throws LdapException
     {
         AttributeType attributeType = attribute.getAttributeType();
 
         // Create the new Attribute
-        EntryAttribute newAttribute = new DefaultEntryAttribute( attribute.getUpId(), attributeType );
+        Attribute newAttribute = new DefaultEntryAttribute( attribute.getUpId(), attributeType );
 
         for ( Value<?> value : attribute )
         {
@@ -1020,7 +1020,7 @@ public class SchemaInterceptor extends B
         // Now, apply each mod one by one
         for ( Modification mod : mods )
         {
-            EntryAttribute attribute = mod.getAttribute();
+            Attribute attribute = mod.getAttribute();
             AttributeType attributeType = attribute.getAttributeType();
 
             // We don't allow modification of operational attributes
@@ -1039,7 +1039,7 @@ public class SchemaInterceptor extends B
             {
                 case ADD_ATTRIBUTE:
                     // Check the syntax here
-                    EntryAttribute currentAttribute = tempEntry.get( attributeType );
+                    Attribute currentAttribute = tempEntry.get( attributeType );
 
                     // First check if the added Attribute is already present in the entry
                     // If not, we have to create the entry
@@ -1066,7 +1066,7 @@ public class SchemaInterceptor extends B
                         // We don't check if the attribute is not in the MUST or MAY at this
                         // point, as one of the following modification can change the
                         // ObjectClasses.
-                        EntryAttribute newAttribute = createNewAttribute( attribute );
+                        Attribute newAttribute = createNewAttribute( attribute );
                         
                         // Check that the attribute allows null values if we don'y have any value
                         if ( ( newAttribute.size() == 0 ) && !newAttribute.isValid( attributeType.getSyntax().getSyntaxChecker() ) )
@@ -1141,7 +1141,7 @@ public class SchemaInterceptor extends B
                         else
                         {
                             // Create the new Attribute
-                            EntryAttribute newAttribute = createNewAttribute( attribute );
+                            Attribute newAttribute = createNewAttribute( attribute );
 
                             tempEntry.put( newAttribute );
                         }
@@ -1160,7 +1160,7 @@ public class SchemaInterceptor extends B
                             tempEntry.removeAttributes( attributeType );
 
                             // Create the new Attribute
-                            EntryAttribute newAttribute = createNewAttribute( attribute );
+                            Attribute newAttribute = createNewAttribute( attribute );
 
                             tempEntry.put( newAttribute );
                         }
@@ -1255,7 +1255,7 @@ public class SchemaInterceptor extends B
 
         for ( AttributeTypeOptions attrOptions : operation.getReturningAttributes() )
         {
-            EntryAttribute attribute = result.get( attrOptions.getAttributeType() );
+            Attribute attribute = result.get( attrOptions.getAttributeType() );
 
             if ( attrOptions.hasOption() )
             {
@@ -1292,7 +1292,7 @@ public class SchemaInterceptor extends B
          * start converting values of attributes to byte[]s which are not
          * human readable and those that are in the binaries set
          */
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             if ( !attribute.getAttributeType().getSyntax().isHumanReadable() )
             {
@@ -1371,7 +1371,7 @@ public class SchemaInterceptor extends B
         // 3-1) Except if the extensibleObject ObjectClass is used
         // 3-2) or if the AttributeType is COLLECTIVE
         // 4) We also check that for H-R attributes, we have a valid String in the values
-        EntryAttribute objectClassAttr = entry.get( OBJECT_CLASS_AT );
+        Attribute objectClassAttr = entry.get( OBJECT_CLASS_AT );
 
         // Protect the server against a null objectClassAttr
         // It can be the case if the user forgot to add it to the entry ...
@@ -1416,7 +1416,7 @@ public class SchemaInterceptor extends B
     private void checkOcSuperior( Entry entry ) throws LdapException
     {
         // handle the m-supObjectClass meta attribute
-        EntryAttribute supOC = entry.get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
+        Attribute supOC = entry.get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
 
         if ( supOC != null )
         {
@@ -1514,7 +1514,7 @@ public class SchemaInterceptor extends B
 
                 if ( ( schema != null ) && schema.isEnabled() )
                 {
-                    EntryAttribute oidAT = entry.get( MetaSchemaConstants.M_OID_AT );                    
+                    Attribute oidAT = entry.get( MetaSchemaConstants.M_OID_AT );                    
                     String ocOid = oidAT.getString();
                     
                     ObjectClass addedOC = schemaManager.getObjectClassRegistry().lookup( ocOid );
@@ -1565,14 +1565,14 @@ public class SchemaInterceptor extends B
     {
         // Never check the attributes if the extensibleObject objectClass is
         // declared for this entry
-        EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
+        Attribute objectClass = entry.get( OBJECT_CLASS_AT );
 
         if ( objectClass.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
         {
             return;
         }
 
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             String attrOid = attribute.getAttributeType().getOid();
 
@@ -1593,7 +1593,7 @@ public class SchemaInterceptor extends B
      */
     private void assertNumberOfAttributeValuesValid( Entry entry ) throws LdapInvalidAttributeValueException
     {
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             assertNumberOfAttributeValuesValid( attribute );
         }
@@ -1603,7 +1603,7 @@ public class SchemaInterceptor extends B
     /**
      * Checks to see numbers of values of attributes conforms to the schema
      */
-    private void assertNumberOfAttributeValuesValid( EntryAttribute attribute )
+    private void assertNumberOfAttributeValuesValid( Attribute attribute )
         throws LdapInvalidAttributeValueException
     {
         if ( attribute.size() > 1 && attribute.getAttributeType().isSingleValued() )
@@ -1619,7 +1619,7 @@ public class SchemaInterceptor extends B
      */
     private void assertRequiredAttributesPresent( Dn dn, Entry entry, Set<String> must ) throws LdapException
     {
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             must.remove( attribute.getAttributeType().getOid() );
         }
@@ -1729,7 +1729,7 @@ public class SchemaInterceptor extends B
     private void assertSyntaxes( Entry entry ) throws LdapException
     {
         // First, loop on all attributes
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             AttributeType attributeType = attribute.getAttributeType();
             SyntaxChecker syntaxChecker = attributeType.getSyntax().getSyntaxChecker();
@@ -1770,7 +1770,7 @@ public class SchemaInterceptor extends B
     {
         for ( Ava atav : dn.getRdn() )
         {
-            EntryAttribute attribute = entry.get( atav.getNormType() );
+            Attribute attribute = entry.get( atav.getNormType() );
 
             if ( ( attribute == null ) || ( !attribute.contains( atav.getNormValue() ) ) )
             {
@@ -1787,7 +1787,7 @@ public class SchemaInterceptor extends B
      *
      * If this is the case, try to change it to a String value.
      */
-    private boolean checkHumanReadable( EntryAttribute attribute ) throws LdapException
+    private boolean checkHumanReadable( Attribute attribute ) throws LdapException
     {
         boolean isModified = false;
 
@@ -1829,7 +1829,7 @@ public class SchemaInterceptor extends B
      *
      * If this is the case, try to change it to a binary value.
      */
-    private boolean checkNotHumanReadable( EntryAttribute attribute ) throws LdapException
+    private boolean checkNotHumanReadable( Attribute attribute ) throws LdapException
     {
         boolean isModified = false;
 
@@ -1883,7 +1883,7 @@ public class SchemaInterceptor extends B
         Entry clonedEntry = null;
 
         // Loops on all attributes
-        for ( EntryAttribute attribute : entry )
+        for ( Attribute attribute : entry )
         {
             AttributeType attributeType = attribute.getAttributeType();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Thu Mar 31 23:29:24 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-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.LdapUnwillingToPerformException;
@@ -162,7 +162,7 @@ public class SchemaSubentryManager
         {
             String opAttrOid = schemaManager.getAttributeTypeRegistry().getOidByName( mod.getAttribute().getId() );
             
-            EntryAttribute serverAttribute = mod.getAttribute();
+            Attribute serverAttribute = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {
@@ -201,7 +201,7 @@ public class SchemaSubentryManager
      * schema partition
      */
     private void modifyRemoveOperation( ModifyOperationContext modifyContext, String opAttrOid, 
-        EntryAttribute mods ) throws LdapException
+        Attribute mods ) throws LdapException
     {
         int index = opAttr2handlerIndex.get( opAttrOid );
         
@@ -332,7 +332,7 @@ public class SchemaSubentryManager
      * schema partition
      */
     private void modifyAddOperation( ModifyOperationContext modifyContext, String opAttrOid, 
-        EntryAttribute mods, boolean doCascadeModify ) throws LdapException
+        Attribute mods, boolean doCascadeModify ) throws LdapException
     {
         if ( doCascadeModify )
         {



Mime
View raw message