directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087506 [1/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
Author: elecharny
Date: Thu Mar 31 23:29:24 2011
New Revision: 1087506

URL: http://svn.apache.org/viewvc?rev=1087506&view=rev
Log:
o Renamed the EntryAttribute interface to Attribute

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
    directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Thu Mar 31 23:29:24 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
 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;
@@ -648,7 +648,7 @@ public class LdapCoreSessionConnection i
         {
             iModReq.setName( entry.getDn() );
 
-            Iterator<EntryAttribute> itr = entry.iterator();
+            Iterator<Attribute> itr = entry.iterator();
             while ( itr.hasNext() )
             {
                 iModReq.addModification( new DefaultModification( modOp, itr.next() ) );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java Thu Mar 31 23:29:24 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.server.core.LdapPrincipal;
-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.LdifEntry;
 
 
@@ -138,7 +138,7 @@ public class ChangeLogEvent
     }
 
 
-    public EntryAttribute get( String attributeName )
+    public Attribute get( String attributeName )
     {
         return forwardLdif.get( attributeName );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java Thu Mar 31 23:29:24 2011
@@ -30,7 +30,7 @@ import java.util.Set;
 import org.apache.directory.server.i18n.I18n;
 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.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -151,7 +151,7 @@ public class ClonedServerEntry implement
     }
 
 
-    public EntryAttribute get( AttributeType attributeType )
+    public Attribute get( AttributeType attributeType )
     {
         return clonedEntry.get( attributeType );
     }
@@ -163,7 +163,7 @@ public class ClonedServerEntry implement
     }
 
 
-    public boolean hasObjectClass( EntryAttribute objectClass )
+    public boolean hasObjectClass( Attribute objectClass )
     {
         return clonedEntry.hasObjectClass( objectClass );
     }
@@ -181,43 +181,43 @@ public class ClonedServerEntry implement
     }
 
 
-    public boolean isValid( EntryAttribute objectClass )
+    public boolean isValid( Attribute objectClass )
     {
         return clonedEntry.isValid( objectClass );
     }
 
 
-    public EntryAttribute put( AttributeType attributeType, byte[]... values ) throws LdapException
+    public Attribute put( AttributeType attributeType, byte[]... values ) throws LdapException
     {
         return clonedEntry.put( attributeType, values );
     }
 
 
-    public EntryAttribute put( AttributeType attributeType, String... values ) throws LdapException
+    public Attribute put( AttributeType attributeType, String... values ) throws LdapException
     {
         return clonedEntry.put( attributeType, values );
     }
 
 
-    public EntryAttribute put( AttributeType attributeType, Value<?>... values ) throws LdapException
+    public Attribute put( AttributeType attributeType, Value<?>... values ) throws LdapException
     {
         return clonedEntry.put( attributeType, values );
     }
 
 
-    public EntryAttribute put( String upId, AttributeType attributeType, byte[]... values ) throws LdapException
+    public Attribute put( String upId, AttributeType attributeType, byte[]... values ) throws LdapException
     {
         return clonedEntry.put( attributeType, values );
     }
 
 
-    public EntryAttribute put( String upId, AttributeType attributeType, String... values ) throws LdapException
+    public Attribute put( String upId, AttributeType attributeType, String... values ) throws LdapException
     {
         return clonedEntry.put( upId, attributeType, values );
     }
 
 
-    public EntryAttribute put( String upId, AttributeType attributeType, Value<?>... values ) throws LdapException
+    public Attribute put( String upId, AttributeType attributeType, Value<?>... values ) throws LdapException
     {
         return clonedEntry.put( upId, attributeType, values );
     }
@@ -241,25 +241,25 @@ public class ClonedServerEntry implement
     }
 
 
-    public List<EntryAttribute> remove( EntryAttribute... attributes ) throws LdapException
+    public List<Attribute> remove( Attribute... attributes ) throws LdapException
     {
         return clonedEntry.remove( attributes );
     }
 
 
-    public List<EntryAttribute> removeAttributes( AttributeType... attributes )
+    public List<Attribute> removeAttributes( AttributeType... attributes )
     {
         return clonedEntry.removeAttributes( attributes );
     }
 
 
-    public List<EntryAttribute> set( AttributeType... attributeTypes )
+    public List<Attribute> set( AttributeType... attributeTypes )
     {
         return clonedEntry.set( attributeTypes );
     }
 
 
-    public void add( EntryAttribute... attributes ) throws LdapException
+    public void add( Attribute... attributes ) throws LdapException
     {
         clonedEntry.add( attributes );
     }
@@ -289,7 +289,7 @@ public class ClonedServerEntry implement
     }
 
 
-    public boolean contains( EntryAttribute... attributes ) throws LdapException
+    public boolean contains( Attribute... attributes ) throws LdapException
     {
         return clonedEntry.contains( attributes );
     }
@@ -319,7 +319,7 @@ public class ClonedServerEntry implement
     }
 
 
-    public EntryAttribute get( String alias )
+    public Attribute get( String alias )
     {
         return clonedEntry.get( alias );
     }
@@ -337,31 +337,31 @@ public class ClonedServerEntry implement
     }
 
 
-    public Iterator<EntryAttribute> iterator()
+    public Iterator<Attribute> iterator()
     {
         return clonedEntry.iterator();
     }
 
 
-    public List<EntryAttribute> put( EntryAttribute... attributes ) throws LdapException
+    public List<Attribute> put( Attribute... attributes ) throws LdapException
     {
         return clonedEntry.put( attributes );
     }
 
 
-    public EntryAttribute put( String upId, byte[]... values )
+    public Attribute put( String upId, byte[]... values )
     {
         return clonedEntry.put( upId, values );
     }
 
 
-    public EntryAttribute put( String upId, String... values )
+    public Attribute put( String upId, String... values )
     {
         return clonedEntry.put( upId, values );
     }
 
 
-    public EntryAttribute put( String upId, Value<?>... values )
+    public Attribute put( String upId, Value<?>... values )
     {
         return clonedEntry.put( upId, values );
     }
@@ -385,13 +385,13 @@ public class ClonedServerEntry implement
     }
 
 
-    public List<EntryAttribute> removeAttributes( String... attributes )
+    public List<Attribute> removeAttributes( String... attributes )
     {
         return clonedEntry.removeAttributes( attributes );
     }
 
 
-    public List<EntryAttribute> set( String... upIds )
+    public List<Attribute> set( String... upIds )
     {
         return clonedEntry.set( upIds );
     }
@@ -415,9 +415,9 @@ public class ClonedServerEntry implement
         Entry clientEntry = new DefaultEntry( clonedEntry.getDn() );
         
         // Convert each attribute 
-        for ( EntryAttribute clonedEntry:this )
+        for ( Attribute clonedEntry:this )
         {
-            EntryAttribute clientAttribute = clonedEntry.clone();
+            Attribute clientAttribute = clonedEntry.clone();
             clientEntry.add( clientAttribute );
         }
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Thu Mar 31 23:29:24 2011
@@ -26,7 +26,6 @@ import java.util.Set;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
@@ -37,11 +36,11 @@ import javax.naming.directory.SearchResu
 
 import org.apache.directory.server.i18n.I18n;
 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.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.entry.Value;
@@ -68,11 +67,11 @@ public class ServerEntryUtils
      *
      * @return An instance of a AttributesImpl() object
      */
-    public static Attribute toBasicAttribute( EntryAttribute entryAttribute )
+    public static javax.naming.directory.Attribute toBasicAttribute( Attribute entryAttribute )
     {
         AttributeType attributeType = entryAttribute.getAttributeType();
         
-        Attribute attribute = new BasicAttribute( attributeType.getName() );
+        javax.naming.directory.Attribute attribute = new BasicAttribute( attributeType.getName() );
         
         for ( Value<?> value: entryAttribute )
         {
@@ -101,7 +100,7 @@ public class ServerEntryUtils
 
         for ( AttributeType attributeType:entry.getAttributeTypes() )
         {
-            EntryAttribute attr = entry.get( attributeType );
+            Attribute attr = entry.get( attributeType );
             
             // Deal with a special case : an entry without any ObjectClass
             if ( attributeType.getOid().equals( SchemaConstants.OBJECT_CLASS_AT_OID ) && attr.size() == 0 )
@@ -126,7 +125,7 @@ public class ServerEntryUtils
      * 
      * @throws InvalidAttributeIdentifierException If we had an incorrect attribute
      */
-    public static EntryAttribute toServerAttribute( Attribute attribute, AttributeType attributeType ) throws LdapException
+    public static Attribute toServerAttribute( javax.naming.directory.Attribute attribute, AttributeType attributeType ) throws LdapException
     {
         if ( attribute == null )
         {
@@ -135,7 +134,7 @@ public class ServerEntryUtils
         
         try 
         {
-            EntryAttribute serverAttribute = new DefaultEntryAttribute( attributeType );
+            Attribute serverAttribute = new DefaultEntryAttribute( attributeType );
             
             for ( NamingEnumeration<?> values = attribute.getAll(); values.hasMoreElements(); )
             {
@@ -212,16 +211,16 @@ public class ServerEntryUtils
             {
                 Entry entry = new DefaultEntry( schemaManager, dn );
     
-                for ( NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMoreElements(); )
+                for ( NamingEnumeration<? extends javax.naming.directory.Attribute> attrs = attributes.getAll(); attrs.hasMoreElements(); )
                 {
-                    Attribute attr = attrs.nextElement();
+                    javax.naming.directory.Attribute attr = attrs.nextElement();
 
                     String attributeId = attr.getID();
                     String id = SchemaUtils.stripOptions( attributeId );
                     Set<String> options = SchemaUtils.getOptions( attributeId );
                     // TODO : handle options.
                     AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
-                    EntryAttribute serverAttribute = ServerEntryUtils.toServerAttribute( attr, attributeType );
+                    Attribute serverAttribute = ServerEntryUtils.toServerAttribute( attr, attributeType );
                     
                     if ( serverAttribute != null )
                     {
@@ -266,7 +265,7 @@ public class ServerEntryUtils
                 break;
                 
             case REMOVE_ATTRIBUTE :
-                EntryAttribute toBeRemoved = mod.getAttribute();
+                Attribute toBeRemoved = mod.getAttribute();
 
                 if ( toBeRemoved.size() == 0 )
                 {
@@ -274,7 +273,7 @@ public class ServerEntryUtils
                 }
                 else
                 {
-                    EntryAttribute existing = targetEntry.get( id );
+                    Attribute existing = targetEntry.get( id );
 
                     if ( existing != null )
                     {
@@ -287,9 +286,9 @@ public class ServerEntryUtils
                 break;
                 
             case ADD_ATTRIBUTE :
-                EntryAttribute combined = new DefaultEntryAttribute( id, attributeType );
-                EntryAttribute toBeAdded = mod.getAttribute();
-                EntryAttribute existing = entry.get( id );
+                Attribute combined = new DefaultEntryAttribute( id, attributeType );
+                Attribute toBeAdded = mod.getAttribute();
+                Attribute existing = entry.get( id );
 
                 if ( existing != null )
                 {
@@ -328,7 +327,7 @@ public class ServerEntryUtils
      *         arguments
      * @throws LdapException if there are problems accessing attribute values
      */
-    public static EntryAttribute getUnion( EntryAttribute attr0, EntryAttribute attr1 ) throws LdapException
+    public static Attribute getUnion( Attribute attr0, Attribute attr1 ) throws LdapException
     {
         if ( attr0 == null && attr1 == null )
         {
@@ -347,7 +346,7 @@ public class ServerEntryUtils
             throw new IllegalArgumentException( I18n.err( I18n.ERR_466 ) );
         }
 
-        EntryAttribute attr = attr0.clone();
+        Attribute attr = attr0.clone();
 
         for ( Value<?> value:attr1 )
         {
@@ -547,7 +546,7 @@ public class ServerEntryUtils
     {
         for ( Modification modification:mods )
         {
-            EntryAttribute attribute = modification.getAttribute();
+            Attribute attribute = modification.getAttribute();
             
             if ( attribute.getAttributeType() == type )
             {
@@ -566,7 +565,7 @@ public class ServerEntryUtils
      * @param type the attributeType spec of the Attribute to extract
      * @return the extract Attribute or null if no such attribute exists
      */
-    public static EntryAttribute getAttribute( List<Modification> mods, AttributeType type )
+    public static Attribute getAttribute( List<Modification> mods, AttributeType type )
     {
         Modification mod = getModificationItem( mods, type );
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Thu Mar 31 23:29:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 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;
@@ -121,7 +121,7 @@ public class ModifyOperationContext exte
     {
         List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
 
-        for ( EntryAttribute attribute : serverEntry )
+        for ( Attribute attribute : serverEntry )
         {
             items.add( new DefaultModification( modOp, attribute ) );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Thu Mar 31 23:29:24 2011
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 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.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -113,7 +113,7 @@ public class DescriptionParsers
      * @return The array of SyntaxCheckerDescription instances
      * @throws LdapInvalidAttributeValueException If something went wrong
      */
-    public SyntaxCheckerDescription[] parseSyntaxCheckers( EntryAttribute attr ) throws LdapInvalidAttributeValueException
+    public SyntaxCheckerDescription[] parseSyntaxCheckers( Attribute attr ) throws LdapInvalidAttributeValueException
     {
         if ( ( attr == null ) || ( attr.size() == 0 ) )
         {
@@ -144,7 +144,7 @@ public class DescriptionParsers
     }
 
 
-    public NormalizerDescription[] parseNormalizers( EntryAttribute attr ) throws LdapInvalidAttributeValueException
+    public NormalizerDescription[] parseNormalizers( Attribute attr ) throws LdapInvalidAttributeValueException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -174,7 +174,7 @@ public class DescriptionParsers
     }
 
 
-    public LdapComparatorDescription[] parseComparators( EntryAttribute attr ) throws LdapInvalidAttributeValueException
+    public LdapComparatorDescription[] parseComparators( Attribute attr ) throws LdapInvalidAttributeValueException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -212,7 +212,7 @@ public class DescriptionParsers
      * @return the set of attributeType objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public AttributeType[] parseAttributeTypes( EntryAttribute attr ) throws LdapException
+    public AttributeType[] parseAttributeTypes( Attribute attr ) throws LdapException
     {
         if ( ( attr == null ) || ( attr.size() == 0 ) )
         {
@@ -290,7 +290,7 @@ public class DescriptionParsers
      * @return the set of objectClass objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public ObjectClass[] parseObjectClasses( EntryAttribute attr ) throws LdapException
+    public ObjectClass[] parseObjectClasses( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -379,7 +379,7 @@ public class DescriptionParsers
      * @return the set of matchingRuleUse objects for the descriptions 
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException if there are problems parsing the descriptions
      */
-    public MatchingRuleUse[] parseMatchingRuleUses( EntryAttribute attr ) throws LdapException
+    public MatchingRuleUse[] parseMatchingRuleUses( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -422,7 +422,7 @@ public class DescriptionParsers
      * @return the set of Syntax objects for the descriptions 
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException if there are problems parsing the descriptions
      */
-    public LdapSyntax[] parseLdapSyntaxes( EntryAttribute attr ) throws LdapException
+    public LdapSyntax[] parseLdapSyntaxes( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -471,7 +471,7 @@ public class DescriptionParsers
      * @return the set of matchingRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public MatchingRule[] parseMatchingRules( EntryAttribute attr ) throws LdapException
+    public MatchingRule[] parseMatchingRules( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -520,7 +520,7 @@ public class DescriptionParsers
      * @return the set of DITStructureRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public DITStructureRule[] parseDitStructureRules( EntryAttribute attr ) throws LdapException
+    public DITStructureRule[] parseDitStructureRules( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -563,7 +563,7 @@ public class DescriptionParsers
      * @return the set of DITContentRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public DITContentRule[] parseDitContentRules( EntryAttribute attr ) throws LdapException
+    public DITContentRule[] parseDitContentRules( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
@@ -606,7 +606,7 @@ public class DescriptionParsers
      * @return the set of NameFormRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public NameForm[] parseNameForms( EntryAttribute attr ) throws LdapException
+    public NameForm[] parseNameForms( Attribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Thu Mar 31 23:29:24 2011
@@ -42,7 +42,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;
@@ -568,7 +568,7 @@ public class SchemaPartitionDaoImpl impl
     {
         Dn dn = new Dn( schemaManager, "cn=" + schemaName + ",ou=schema" );
         Entry entry = partition.lookup( new LookupOperationContext( null, dn ) );
-        EntryAttribute disabledAttr = entry.get( disabledAttributeType );
+        Attribute disabledAttr = entry.get( disabledAttributeType );
         List<Modification> mods = new ArrayList<Modification>( 3 );
 
         if ( disabledAttr == null )
@@ -872,7 +872,7 @@ public class SchemaPartitionDaoImpl impl
             while ( cursor.next() )
             {
                 Entry sr = cursor.get();
-                EntryAttribute disabled = sr.get( disabledAttributeType );
+                Attribute disabled = sr.get( disabledAttributeType );
 
                 if ( disabled == null )
                 {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.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.MetaSchemaConstants;
 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;
@@ -340,7 +340,7 @@ public abstract class AbstractRegistrySy
 
     protected String getOid( Entry entry ) throws LdapException
     {
-        EntryAttribute oid = entry.get( m_oidAT );
+        Attribute oid = entry.get( m_oidAT );
 
         if ( oid == null )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.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.MetaSchemaConstants;
 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.exception.LdapInvalidDnException;
@@ -154,7 +154,7 @@ public class RegistrySynchronizerAdaptor
      */
     public void add( AddOperationContext addContext ) throws LdapException
     {
-        EntryAttribute oc = addContext.getEntry().get( objectClassAT );
+        Attribute oc = addContext.getEntry().get( objectClassAT );
         
         // First check if we are adding a schemaObject
         for ( Value<?> value:oc )
@@ -222,7 +222,7 @@ public class RegistrySynchronizerAdaptor
     {
         Entry entry = deleteContext.getEntry();
         
-        EntryAttribute oc = entry.get( objectClassAT );
+        Attribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -276,7 +276,7 @@ public class RegistrySynchronizerAdaptor
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean doCascadeModify ) throws LdapException
     {
         Entry entry = modifyContext.getEntry();
-        EntryAttribute oc = entry.get( objectClassAT );
+        Attribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -318,7 +318,7 @@ public class RegistrySynchronizerAdaptor
         throws LdapException
     {
         Entry originalEntry = renameContext.getEntry().getOriginalEntry();
-        EntryAttribute oc = originalEntry.get( objectClassAT );
+        Attribute oc = originalEntry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -347,7 +347,7 @@ public class RegistrySynchronizerAdaptor
      */
     public void move( MoveOperationContext moveContext, Entry entry, boolean cascade ) throws LdapException
     {
-        EntryAttribute oc = entry.get( objectClassAT );
+        Attribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {
@@ -376,7 +376,7 @@ public class RegistrySynchronizerAdaptor
      */
     public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext, Entry entry, boolean cascade ) throws LdapException
     {
-        EntryAttribute oc = entry.get( objectClassAT );
+        Attribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1087506&r1=1087505&r2=1087506&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.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.MetaSchemaConstants;
 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.Value;
@@ -120,7 +120,7 @@ public class SchemaSynchronizer implemen
         boolean hasModification = SCHEMA_UNCHANGED;
 
         // Check if the entry has a m-disabled attribute
-        EntryAttribute disabledInEntry = entry.get( disabledAT );
+        Attribute disabledInEntry = entry.get( disabledAT );
         Modification disabledModification = ServerEntryUtils.getModificationItem( mods, disabledAT );
 
         // The attribute might be present, but that does not mean we will change it.
@@ -130,7 +130,7 @@ public class SchemaSynchronizer implemen
         {
             // We are trying to modify the m-disabled attribute.
             ModificationOperation modification = disabledModification.getOperation();
-            EntryAttribute attribute = disabledModification.getAttribute();
+            Attribute attribute = disabledModification.getAttribute();
 
             hasModification = modifyDisable( modifyContext, modification, attribute, disabledInEntry );
         }
@@ -169,7 +169,7 @@ public class SchemaSynchronizer implemen
 
         // check if the new schema is enabled or disabled
         boolean isEnabled = false;
-        EntryAttribute disabled = entry.get( disabledAT );
+        Attribute disabled = entry.get( disabledAT );
 
         if ( disabled == null )
         {
@@ -226,7 +226,7 @@ public class SchemaSynchronizer implemen
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        EntryAttribute cn = entry.get( cnAT );
+        Attribute cn = entry.get( cnAT );
         String schemaName = cn.getString();
 
         // Before allowing a schema object to be deleted we must check
@@ -388,7 +388,7 @@ public class SchemaSynchronizer implemen
      * </pre>
      */
     private boolean modifyDisable( ModifyOperationContext modifyContext, ModificationOperation modOp,
-        EntryAttribute disabledInMods, EntryAttribute disabledInEntry ) throws LdapException
+        Attribute disabledInMods, Attribute disabledInEntry ) throws LdapException
     {
         Dn name = modifyContext.getDn();
 
@@ -558,7 +558,7 @@ public class SchemaSynchronizer implemen
      */
     private void checkForDependencies( boolean isEnabled, Entry entry ) throws LdapException
     {
-        EntryAttribute dependencies = entry.get( this.dependenciesAT );
+        Attribute dependencies = entry.get( this.dependenciesAT );
 
         if ( dependencies == null )
         {



Mime
View raw message