directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r927839 [2/3] - in /directory: apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-api/src...
Date Fri, 26 Mar 2010 13:25:12 GMT
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Fri Mar 26 13:25:10 2010
@@ -47,10 +47,10 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
@@ -240,7 +240,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            ClientAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+            EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
             Modification mod = new ClientModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -268,7 +268,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            ClientAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+            EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
             Modification mod = new ClientModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -376,7 +376,7 @@ public class ModifyReferralIT extends Ab
         
         try
         {
-            ClientAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+            EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
             Modification mod = new ClientModification(
                 ModificationOperation.ADD_ATTRIBUTE, attr );
             List<Modification> mods = new ArrayList<Modification>();
@@ -415,7 +415,7 @@ public class ModifyReferralIT extends Ab
     {
         CoreSession session = service.getAdminSession();
         
-        ClientAttribute attr = new DefaultClientAttribute( "Description", "This is a description" );
+        EntryAttribute attr = new DefaultClientAttribute( "Description", "This is a description" );
         Modification mod = new ClientModification(
             ModificationOperation.ADD_ATTRIBUTE, attr );
         List<Modification> mods = new ArrayList<Modification>();

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Fri Mar 26 13:25:10 2010
@@ -31,7 +31,7 @@ import javax.naming.NamingException;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -198,7 +198,7 @@ class JavaLdapSupport
         // Add all the class names this object can be cast to:
         Class<?>[] classes = obj.getClass().getClasses();
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
-        ServerAttribute javaClassNames = new DefaultServerAttribute( attributeType, JCLASSNAMES_ATTR );
+        EntryAttribute javaClassNames = new DefaultServerAttribute( attributeType, JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )
         {

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -68,7 +68,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
@@ -583,7 +582,7 @@ public class AciAuthorizationInterceptor
         
         for ( Modification mod : mods )
         {
-            ServerAttribute attr = (ServerAttribute)mod.getAttribute();
+            EntryAttribute attr = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
@@ -407,7 +406,7 @@ public class GroupCache
 
                 if ( memberSet != null )
                 {
-                    modify( memberSet, modification.getOperation(), ( ServerAttribute ) modification.getAttribute() );
+                    modify( memberSet, modification.getOperation(), modification.getAttribute() );
                 }
 
                 break;

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -42,7 +42,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
@@ -236,7 +235,7 @@ public class TupleCache
 
         for ( Modification mod : mods )
         {
-            if ( ( ( ServerAttribute ) mod.getAttribute() ).instanceOf( SchemaConstants.PRESCRIPTIVE_ACI_AT ) )
+            if ( mod.getAttribute().instanceOf( SchemaConstants.PRESCRIPTIVE_ACI_AT ) )
             {
                 subentryDeleted( normName, entry );
                 subentryAdded( normName, entry );

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -41,7 +41,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
@@ -129,7 +128,7 @@ public class ChangeLogInterceptor extend
         
         for ( AttributeType attributeType:list )
         {
-            forward.addAttribute( ((ServerAttribute)addEntry.get( attributeType) ).toClientAttribute() );
+            forward.addAttribute( addEntry.get( attributeType).toClientAttribute() );
         }
         
         LdifEntry reverse = LdifRevertor.reverseAdd( opContext.getDn() );
@@ -177,7 +176,7 @@ public class ChangeLogInterceptor extend
             AttributeType at = schemaService.getSchemaManager().getAttributeTypeRegistry().lookup( attribute.getId() );
             if ( !at.isCollective() )
             {
-                reverseEntry.add( ( ( ServerAttribute ) attribute ).toClientAttribute() );
+                reverseEntry.add( attribute.toClientAttribute() );
             }
         }
 
@@ -280,7 +279,7 @@ public class ChangeLogInterceptor extend
         
         for ( EntryAttribute attribute:serverEntry )
         {
-            clientEntry.add( ((ServerAttribute)attribute).toClientAttribute() );
+            clientEntry.add( attribute.toClientAttribute() );
         }
 
         LdifEntry reverse = LdifRevertor.reverseModify( 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Fri Mar 26 13:25:10 2010
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
@@ -106,7 +105,7 @@ public class CollectiveAttributesSchemaC
         for ( Modification mod:mods )
         {
             // TODO: handle http://issues.apache.org/jira/browse/DIRSERVER-1198
-            ServerAttribute attr = (ServerAttribute)mod.getAttribute();
+            EntryAttribute attr = mod.getAttribute();
             AttributeType attrType = attr.getAttributeType();
 
             if ( attrType == null )

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -50,7 +50,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAliasException;
@@ -322,7 +321,7 @@ public class ExceptionInterceptor extend
         {
             if ( item.getOperation() == ModificationOperation.ADD_ATTRIBUTE )
             {
-                EntryAttribute modAttr = (ServerAttribute)item.getAttribute();
+                EntryAttribute modAttr = item.getAttribute();
                 EntryAttribute entryAttr = entry.get( modAttr.getId() );
 
                 if ( entryAttr != null )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Fri Mar 26 13:25:10 2010
@@ -32,7 +32,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -118,7 +117,7 @@ public class JournalInterceptor extends 
             
             for ( AttributeType attributeType:list )
             {
-                ldif.addAttribute( ((ServerAttribute)addEntry.get( attributeType) ).toClientAttribute() );
+                ldif.addAttribute( addEntry.get( attributeType).toClientAttribute() );
             }
             
             log( opRevision, ldif );

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -51,7 +51,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -254,7 +253,7 @@ public class OperationalAttributeInterce
         
         for ( Modification modification: mods )
         {
-            AttributeType attributeType = ((ServerAttribute)modification.getAttribute()).getAttributeType();
+            AttributeType attributeType = modification.getAttribute().getAttributeType();
             
             if ( attributeType.equals( MODIFIERS_NAME_ATTRIBUTE_TYPE ) )
             {
@@ -272,7 +271,7 @@ public class OperationalAttributeInterce
         }
         
         // Inject the ModifiersName AT if it's not present
-        ServerAttribute attribute = new DefaultServerAttribute( 
+        EntryAttribute attribute = new DefaultServerAttribute( 
             MODIFIERS_NAME_ATTRIBUTE_TYPE, 
             getPrincipal().getName());
 

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -245,17 +244,17 @@ public class ServerSystemPreferences ext
         try
         {
             ServerEntry entry = directoryService.getAdminSession().lookup( dn );
+
             for ( EntryAttribute attr : entry )
             {
-                ServerAttribute sa = ( ServerAttribute ) attr;
-                String oid = sa.getAttributeType().getOid();
+                String oid = attr.getAttributeType().getOid();
                 
                 if ( oid.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
                 {
                     continue;
                 }
                 
-                keys.add( sa.getUpId() );
+                keys.add( attr.getUpId() );
             }
         }
         catch ( Exception e )
@@ -273,7 +272,7 @@ public class ServerSystemPreferences ext
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
-            ServerAttribute attr = new DefaultServerAttribute( at );
+            EntryAttribute attr = new DefaultServerAttribute( at );
             Modification mi = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
             addDelta( mi );
         }
@@ -347,7 +346,7 @@ public class ServerSystemPreferences ext
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
-            ServerAttribute attr = new DefaultServerAttribute( at, value );
+            EntryAttribute attr = new DefaultServerAttribute( at, value );
             Modification mi = new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
             addDelta( mi );
         }

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -123,9 +122,9 @@ public class DefaultSchemaService implem
     /**
      * Generate the comparators attribute from the registry
      */
-    private ServerAttribute generateComparators() throws LdapException
+    private EntryAttribute generateComparators() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.COMPARATORS_AT ) );
 
         for ( LdapComparator<?> comparator : getSchemaManager().getComparatorRegistry() )
@@ -137,9 +136,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateNormalizers() throws LdapException
+    private EntryAttribute generateNormalizers() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.NORMALIZERS_AT ) );
 
         NormalizerRegistry nr = getSchemaManager().getNormalizerRegistry();
@@ -153,9 +152,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateSyntaxCheckers() throws LdapException
+    private EntryAttribute generateSyntaxCheckers() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.SYNTAX_CHECKERS_AT ) );
 
         for ( SyntaxChecker syntaxChecker : getSchemaManager().getSyntaxCheckerRegistry() )
@@ -167,9 +166,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateObjectClasses() throws LdapException
+    private EntryAttribute generateObjectClasses() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASSES_AT ) );
 
         for ( ObjectClass objectClass : getSchemaManager().getObjectClassRegistry() )
@@ -181,9 +180,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateAttributeTypes() throws LdapException
+    private EntryAttribute generateAttributeTypes() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
 
         for ( AttributeType attributeType : getSchemaManager().getAttributeTypeRegistry() )
@@ -195,9 +194,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateMatchingRules() throws LdapException
+    private EntryAttribute generateMatchingRules() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.MATCHING_RULES_AT ) );
 
         for ( MatchingRule matchingRule : getSchemaManager().getMatchingRuleRegistry() )
@@ -209,9 +208,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateMatchingRuleUses() throws LdapException
+    private EntryAttribute generateMatchingRuleUses() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.MATCHING_RULE_USE_AT ) );
 
         for ( MatchingRuleUse matchingRuleUse : getSchemaManager().getMatchingRuleUseRegistry() )
@@ -223,9 +222,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateSyntaxes() throws LdapException
+    private EntryAttribute generateSyntaxes() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.LDAP_SYNTAXES_AT ) );
 
         for ( LdapSyntax syntax : getSchemaManager().getLdapSyntaxRegistry() )
@@ -237,9 +236,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateDitContextRules() throws LdapException
+    private EntryAttribute generateDitContextRules() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.DIT_CONTENT_RULES_AT ) );
 
         for ( DITContentRule ditContentRule : getSchemaManager().getDITContentRuleRegistry() )
@@ -251,9 +250,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateDitStructureRules() throws LdapException
+    private EntryAttribute generateDitStructureRules() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
 
         for ( DITStructureRule ditStructureRule : getSchemaManager().getDITStructureRuleRegistry() )
@@ -265,9 +264,9 @@ public class DefaultSchemaService implem
     }
 
 
-    private ServerAttribute generateNameForms() throws LdapException
+    private EntryAttribute generateNameForms() throws LdapException
     {
-        ServerAttribute attr = new DefaultServerAttribute( 
+        EntryAttribute attr = new DefaultServerAttribute( 
             getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.NAME_FORMS_AT ) );
 
         for ( NameForm nameForm : getSchemaManager().getNameFormRegistry() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Fri Mar 26 13:25:10 2010
@@ -29,7 +29,6 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -73,7 +72,7 @@ public class SchemaChecker
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyReplace( SchemaManager schemaManager, DN name, ModificationOperation mod,
-        ServerAttribute attribute ) throws LdapException
+        EntryAttribute attribute ) throws LdapException
     {
         if ( mod != ModificationOperation.REPLACE_ATTRIBUTE )
         {
@@ -205,7 +204,7 @@ public class SchemaChecker
             return;
         }
 
-        if ( !((ServerAttribute)attribute).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !attribute.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             return;
         }
@@ -247,7 +246,7 @@ public class SchemaChecker
         // we can analyze what remains in this attribute to make sure a structural
         // objectClass is present for the entry
 
-        ServerAttribute cloned = ( ServerAttribute ) entryObjectClasses.clone();
+        EntryAttribute cloned = entryObjectClasses.clone();
         
         for ( Value<?> value:attribute )
         {
@@ -381,7 +380,7 @@ public class SchemaChecker
      * @throws LdapException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyReplace( DN name, ModificationOperation mod, 
-        ServerAttribute attribute, SchemaManager schemaManager )
+        EntryAttribute attribute, SchemaManager schemaManager )
         throws LdapException
     {
         if ( mod != ModificationOperation.REPLACE_ATTRIBUTE )
@@ -531,7 +530,7 @@ public class SchemaChecker
      * @param attribute the attribute being modified
      * @throws LdapException if the modify operation is removing an Rdn attribute
      */
-    public static void preventRdnChangeOnModifyRemove( DN name, ModificationOperation mod, ServerAttribute attribute, 
+    public static void preventRdnChangeOnModifyRemove( DN name, ModificationOperation mod, EntryAttribute attribute, 
         SchemaManager schemaManager ) throws LdapException
     {
         if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -59,7 +59,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerBinaryValue;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
@@ -867,7 +866,7 @@ public class SchemaInterceptor extends B
      * @return
      * @throws Exception
      */
-    private boolean isCompleteRemoval( ServerAttribute change, ServerEntry entry ) throws Exception
+    private boolean isCompleteRemoval( EntryAttribute change, ServerEntry entry ) throws Exception
     {
         // if change size is 0 then all values are deleted then we're in trouble
         if ( change.size() == 0 )
@@ -879,7 +878,7 @@ public class SchemaInterceptor extends B
         // values in the modify request may not be in the entry.  we need to
         // remove the values from a cloned version of the attribute and see
         // if nothing is left.
-        ServerAttribute changedEntryAttr = ( ServerAttribute ) entry.get( change.getUpId() ).clone();
+        EntryAttribute changedEntryAttr = entry.get( change.getUpId() ).clone();
 
         for ( Value<?> value : change )
         {
@@ -931,7 +930,7 @@ public class SchemaInterceptor extends B
                 return existing;
 
             case REPLACE_ATTRIBUTE:
-                return ( ServerAttribute ) changes.clone();
+                return changes.clone();
 
             case REMOVE_ATTRIBUTE:
                 for ( Value<?> value : changes )
@@ -1165,7 +1164,7 @@ public class SchemaInterceptor extends B
     /**
      * Create a new attribute using the given values
      */
-    private EntryAttribute createNewAttribute( ServerAttribute attribute )
+    private EntryAttribute createNewAttribute( EntryAttribute attribute )
     {
         AttributeType attributeType = attribute.getAttributeType();
         
@@ -1196,7 +1195,7 @@ public class SchemaInterceptor extends B
         // Now, apply each mod one by one
         for ( Modification mod:mods )
         {
-            ServerAttribute attribute = (ServerAttribute)mod.getAttribute();
+            EntryAttribute attribute = mod.getAttribute();
             AttributeType attributeType = attribute.getAttributeType();
             
             // We don't allow modification of operational attributes
@@ -1393,7 +1392,7 @@ public class SchemaInterceptor extends B
             
             for ( Modification mod:mods )
             {
-                AttributeType at = ((ServerAttribute)( (ServerModification)mod).getAttribute()).getAttributeType();
+                AttributeType at = ( (ServerModification)mod).getAttribute().getAttributeType();
                 
                 if ( !MODIFIERS_NAME_ATTRIBUTE_TYPE.equals( at ) && !MODIFY_TIMESTAMP_ATTRIBUTE_TYPE.equals( at ) ) 
                 {
@@ -1472,7 +1471,7 @@ public class SchemaInterceptor extends B
 
             entry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT );
 
-            ServerAttribute newOc = new DefaultServerAttribute( ( ( ServerAttribute ) oc ).getAttributeType() );
+            EntryAttribute newOc = new DefaultServerAttribute( oc.getAttributeType() );
 
             for ( ObjectClass currentOC : objectClasses )
             {
@@ -1493,13 +1492,13 @@ public class SchemaInterceptor extends B
          */
         for ( EntryAttribute attribute : entry )
         {
-            if ( !( ( ServerAttribute ) attribute ).getAttributeType().getSyntax().isHumanReadable() )
+            if ( !attribute.getAttributeType().getSyntax().isHumanReadable() )
             {
                 List<Value<?>> binaries = new ArrayList<Value<?>>();
 
                 for ( Value<?> value : attribute )
                 {
-                    binaries.add( new ServerBinaryValue( ( ( ServerAttribute ) attribute ).getAttributeType(),
+                    binaries.add( new ServerBinaryValue( attribute.getAttributeType(),
                         value.getBytes() ) );
                 }
 
@@ -1766,9 +1765,9 @@ public class SchemaInterceptor extends B
 
         for ( EntryAttribute attribute : entry )
         {
-            String attrOid = ( ( ServerAttribute ) attribute ).getAttributeType().getOid();
+            String attrOid = attribute.getAttributeType().getOid();
 
-            AttributeType attributeType = ( ( ServerAttribute ) attribute ).getAttributeType();
+            AttributeType attributeType = attribute.getAttributeType();
 
             if ( !attributeType.isCollective() && ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS ) )
             {
@@ -1799,7 +1798,7 @@ public class SchemaInterceptor extends B
      */
     private void assertNumberOfAttributeValuesValid( EntryAttribute attribute ) throws LdapInvalidAttributeValueException
     {
-        if ( attribute.size() > 1 && ( ( ServerAttribute ) attribute ).getAttributeType().isSingleValued() )
+        if ( attribute.size() > 1 && attribute.getAttributeType().isSingleValued() )
         {
             throw new LdapInvalidAttributeValueException( ResultCodeEnum.CONSTRAINT_VIOLATION,
                 I18n.err( I18n.ERR_278, attribute.getUpId() ) );
@@ -1814,7 +1813,7 @@ public class SchemaInterceptor extends B
     {
         for ( EntryAttribute attribute : entry )
         {
-            must.remove( ( ( ServerAttribute ) attribute ).getAttributeType().getOid() );
+            must.remove( attribute.getAttributeType().getOid() );
         }
 
         if ( must.size() != 0 )
@@ -1907,7 +1906,7 @@ public class SchemaInterceptor extends B
         // First, loop on all attributes
         for ( EntryAttribute attribute : entry )
         {
-            AttributeType attributeType = ( ( ServerAttribute ) attribute ).getAttributeType();
+            AttributeType attributeType = attribute.getAttributeType();
             SyntaxChecker syntaxChecker = attributeType.getSyntax().getSyntaxChecker();
 
             if ( syntaxChecker instanceof OctetStringSyntaxChecker )
@@ -2061,7 +2060,7 @@ public class SchemaInterceptor extends B
         // Loops on all attributes
         for ( EntryAttribute attribute : entry )
         {
-            AttributeType attributeType = ( ( ServerAttribute ) attribute ).getAttributeType();
+            AttributeType attributeType = attribute.getAttributeType();
 
             // If the attributeType is H-R, check all of its values
             if ( attributeType.getSyntax().isHumanReadable() )

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=927839&r1=927838&r2=927839&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 Fri Mar 26 13:25:10 2010
@@ -32,7 +32,6 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -162,7 +161,7 @@ public class SchemaSubentryManager
         {
             String opAttrOid = schemaManager.getAttributeTypeRegistry().getOidByName( mod.getAttribute().getId() );
             
-            ServerAttribute serverAttribute = (ServerAttribute)mod.getAttribute();
+            EntryAttribute serverAttribute = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Fri Mar 26 13:25:10 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.core
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -67,7 +66,7 @@ public class RefinementEvaluator
             throw new IllegalArgumentException( I18n.err( I18n.ERR_296 ) );
         }
         
-        if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_297 ) );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Fri Mar 26 13:25:10 2010
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
@@ -89,7 +88,7 @@ public class RefinementLeafEvaluator
             throw new IllegalArgumentException( I18n.err( I18n.ERR_303 ) );
         }
         
-        if ( !((ServerAttribute)objectClasses).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_304 ) );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Fri Mar 26 13:25:10 2010
@@ -60,7 +60,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -721,7 +720,7 @@ public class SubentryInterceptor extends
 
                     if ( opAttr != null )
                     {
-                        opAttr = ( ServerAttribute ) opAttr.clone();
+                        opAttr = opAttr.clone();
                         opAttr.remove( subentryDn );
 
                         if ( opAttr.size() < 1 )
@@ -739,7 +738,7 @@ public class SubentryInterceptor extends
                 for ( String aSUBENTRY_OPATTRS : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
-                    ServerAttribute opAttr = new DefaultServerAttribute( aSUBENTRY_OPATTRS, schemaManager
+                    EntryAttribute opAttr = new DefaultServerAttribute( aSUBENTRY_OPATTRS, schemaManager
                         .lookupAttributeTypeRegistry( aSUBENTRY_OPATTRS ) );
                     opAttr.add( subentryDn );
                     modList.add( new ServerModification( op, opAttr ) );
@@ -991,7 +990,7 @@ public class SubentryInterceptor extends
 
     private int getSubentryTypes( ServerEntry entry, List<Modification> mods ) throws Exception
     {
-        ServerAttribute ocFinalState = ( ServerAttribute ) entry.get( SchemaConstants.OBJECT_CLASS_AT ).clone();
+        EntryAttribute ocFinalState = entry.get( SchemaConstants.OBJECT_CLASS_AT ).clone();
 
         for ( Modification mod : mods )
         {
@@ -1000,7 +999,7 @@ public class SubentryInterceptor extends
                 switch ( mod.getOperation() )
                 {
                     case ADD_ATTRIBUTE:
-                        for ( Value<?> value : ( ServerAttribute ) mod.getAttribute() )
+                        for ( Value<?> value : mod.getAttribute() )
                         {
                             ocFinalState.add( value.getString() );
                         }
@@ -1008,7 +1007,7 @@ public class SubentryInterceptor extends
                         break;
 
                     case REMOVE_ATTRIBUTE:
-                        for ( Value<?> value : ( ServerAttribute ) mod.getAttribute() )
+                        for ( Value<?> value : mod.getAttribute() )
                         {
                             ocFinalState.remove( value.getString() );
                         }
@@ -1016,7 +1015,7 @@ public class SubentryInterceptor extends
                         break;
 
                     case REPLACE_ATTRIBUTE:
-                        ocFinalState = ( ServerAttribute ) mod.getAttribute();
+                        ocFinalState = mod.getAttribute();
                         break;
                 }
             }
@@ -1056,7 +1055,7 @@ public class SubentryInterceptor extends
 
             try
             {
-                ssNew = ssParser.parse( ( ( ServerAttribute ) subtreeMod.getAttribute() ).getString() );
+                ssNew = ssParser.parse( subtreeMod.getAttribute().getString() );
             }
             catch ( Exception e )
             {
@@ -1151,11 +1150,11 @@ public class SubentryInterceptor extends
     {
         List<Modification> modList = new ArrayList<Modification>();
 
-        ServerAttribute operational;
+        EntryAttribute operational;
 
         if ( subentry.isAccessControlSubentry() )
         {
-            operational = ( ServerAttribute ) entry.get( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT ).clone();
+            operational = entry.get( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT ).clone();
 
             if ( operational == null )
             {
@@ -1174,7 +1173,7 @@ public class SubentryInterceptor extends
 
         if ( subentry.isSchemaSubentry() )
         {
-            operational = ( ServerAttribute ) entry.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).clone();
+            operational = entry.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).clone();
 
             if ( operational == null )
             {
@@ -1193,7 +1192,7 @@ public class SubentryInterceptor extends
 
         if ( subentry.isCollectiveSubentry() )
         {
-            operational = ( ServerAttribute ) entry.get( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT ).clone();
+            operational = entry.get( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT ).clone();
 
             if ( operational == null )
             {
@@ -1212,7 +1211,7 @@ public class SubentryInterceptor extends
 
         if ( subentry.isTriggerSubentry() )
         {
-            operational = ( ServerAttribute ) entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ).clone();
+            operational = entry.get( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ).clone();
 
             if ( operational == null )
             {
@@ -1320,7 +1319,7 @@ public class SubentryInterceptor extends
             if ( ( opAttr != null ) && opAttr.contains( dn ) )
             {
                 AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( opAttrId );
-                ServerAttribute attr = new DefaultServerAttribute( opAttrId, attributeType, dn );
+                EntryAttribute attr = new DefaultServerAttribute( opAttrId, attributeType, dn );
                 modList.add( new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) );
             }
         }
@@ -1473,7 +1472,7 @@ public class SubentryInterceptor extends
 
                     if ( opAttr != null )
                     {
-                        opAttr = ( ServerAttribute ) opAttr.clone();
+                        opAttr = opAttr.clone();
                         opAttr.remove( subentryDn );
 
                         if ( opAttr.size() < 1 )
@@ -1492,7 +1491,7 @@ public class SubentryInterceptor extends
                 {
                     ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
                     AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute );
-                    ServerAttribute opAttr = new DefaultServerAttribute( attribute, type );
+                    EntryAttribute opAttr = new DefaultServerAttribute( attribute, type );
                     opAttr.add( subentryDn );
                     modList.add( new ServerModification( op, opAttr ) );
                 }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Fri Mar 26 13:25:10 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.name.DN;
@@ -118,11 +118,11 @@ public class RelatedProtectedItemFilterT
     }
 
     
-    private Collection<Attribute> convert( Collection<ServerAttribute> attributes )
+    private Collection<Attribute> convert( Collection<EntryAttribute> attributes )
     {
         Set<Attribute> jndiAttributes = new HashSet<Attribute>();
         
-        for ( ServerAttribute attribute:attributes )
+        for ( EntryAttribute attribute:attributes )
         {
             jndiAttributes.add( ServerEntryUtils.toBasicAttribute( attribute ) );
         }
@@ -225,7 +225,7 @@ public class RelatedProtectedItemFilterT
     @Test 
     public void testAttributeValue() throws Exception
     {
-        Collection<ServerAttribute> attributes = new ArrayList<ServerAttribute>();
+        Collection<EntryAttribute> attributes = new ArrayList<EntryAttribute>();
         attributes.add( new DefaultServerAttribute( "cn", CN_AT, "valueA" ) );
         Collection<ACITuple> tuples = getTuples( new ProtectedItem.AttributeValue( convert( attributes ) ) );
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Fri Mar 26 13:25:10 2010
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -370,7 +369,7 @@ public class SchemaCheckerTest
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, new DefaultServerAttribute( "cn", CN_AT ) );
 
         // this should succeed since person is still in replaced set and is structural
-        ServerAttribute objectClassesReplaced = new DefaultServerAttribute( "objectClass", OBJECT_CLASS );
+        EntryAttribute objectClassesReplaced = new DefaultServerAttribute( "objectClass", OBJECT_CLASS );
         objectClassesReplaced.add( "top" );
         objectClassesReplaced.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, objectClassesReplaced );
@@ -414,7 +413,7 @@ public class SchemaCheckerTest
         ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
         AttributeType ocAt = schemaManager.lookupAttributeTypeRegistry( "objectClass" );
         
-        ServerAttribute entryObjectClasses = new DefaultServerAttribute( "objectClass", ocAt );
+        EntryAttribute entryObjectClasses = new DefaultServerAttribute( "objectClass", ocAt );
         entryObjectClasses.add( "top", "person", "organizationalPerson" );
 
         // this should pass
@@ -426,7 +425,7 @@ public class SchemaCheckerTest
             entryObjectClasses );
 
         // this should succeed since person is left and is structural
-        ServerAttribute objectClassesRemoved = new DefaultServerAttribute( 
+        EntryAttribute objectClassesRemoved = new DefaultServerAttribute( 
             "objectClass", ocAt );
         objectClassesRemoved.add( "person" );
         SchemaChecker.preventStructuralClassRemovalOnModifyRemove( schemaManager, name, mod, objectClassesRemoved,

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Fri Mar 26 13:25:10 2010
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -150,7 +150,7 @@ public class RefinementEvaluatorTest
     @Test 
     public void testMatchByName() throws Exception
     {
-        ServerAttribute objectClasses = null;
+        EntryAttribute objectClasses = null;
 
         // positive test
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
@@ -171,7 +171,7 @@ public class RefinementEvaluatorTest
     @Test 
     public void testMatchByOID() throws Exception
     {
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         
         // positive test
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );
@@ -192,7 +192,7 @@ public class RefinementEvaluatorTest
     public void testComplexOrRefinement() throws Exception
     {
         ExprNode refinement = null;
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         String refStr = "(|(objectClass=person)(objectClass=organizationalUnit))";
         
         refinement = FilterParser.parse( refStr );
@@ -211,7 +211,7 @@ public class RefinementEvaluatorTest
     public void testComplexAndRefinement() throws Exception
     {
         ExprNode refinement = null;
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         objectClasses.add( "organizationalUnit" );
         String refStr = "(&(objectClass=person)(objectClass=organizationalUnit))";
         
@@ -234,7 +234,7 @@ public class RefinementEvaluatorTest
     public void testComplexNotRefinement() throws Exception
     {
         ExprNode refinement = null;
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         String refStr = "(!(objectClass=person))";
 
         refinement = FilterParser.parse( refStr );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Fri Mar 26 13:25:10 2010
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -114,7 +114,7 @@ public class RefinementLeafEvaluatorTest
     @Test 
     public void testForBadArguments() throws Exception
     {
-        ServerAttribute objectClasses = null;
+        EntryAttribute objectClasses = null;
 
         try
         {
@@ -158,7 +158,7 @@ public class RefinementLeafEvaluatorTest
             assertFalse( evaluator.evaluate( new EqualityNode( "cn", new ClientStringValue( "" ) ), objectClasses ) );
             fail( "should never get here due to an IAE" );
         }
-        catch ( LdapException ne )
+        catch ( IllegalArgumentException iae )
         {
             assertTrue( true );
         }
@@ -169,7 +169,7 @@ public class RefinementLeafEvaluatorTest
     public void testMatchByName() throws Exception
     {
         // positive test
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "person" ) ), objectClasses ) );
 
         objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS );
@@ -189,7 +189,7 @@ public class RefinementLeafEvaluatorTest
     @Test 
     public void testMatchByOID() throws Exception
     {
-        ServerAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
+        EntryAttribute objectClasses = new DefaultServerAttribute( "objectClass", OBJECT_CLASS, "person" );
 
         // positive test
         assertTrue( evaluator.evaluate( new EqualityNode( "objectClass", new ClientStringValue( "2.5.6.6" ) ), objectClasses ) );

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Fri Mar 26 13:25:10 2010
@@ -64,7 +64,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerBinaryValue;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
@@ -237,7 +236,7 @@ public class KeyDerivationInterceptor ex
                 }
             }
 
-            ServerAttribute attr = (ServerAttribute)mod.getAttribute();
+            EntryAttribute attr = mod.getAttribute();
 
             if ( attr.instanceOf( SchemaConstants.USER_PASSWORD_AT ) )
             {
@@ -388,7 +387,7 @@ public class KeyDerivationInterceptor ex
                     schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT ),
                     Integer.toString( kvno ) ) ) );
         
-        ServerAttribute attribute = getKeyAttribute( modContext.getSession()
+        EntryAttribute attribute = getKeyAttribute( modContext.getSession()
             .getDirectoryService().getSchemaManager(), keys );
         newModsList.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute ) );
 
@@ -396,9 +395,9 @@ public class KeyDerivationInterceptor ex
     }
 
 
-    private ServerAttribute getKeyAttribute( SchemaManager schemaManager, Map<EncryptionType, EncryptionKey> keys ) throws Exception
+    private EntryAttribute getKeyAttribute( SchemaManager schemaManager, Map<EncryptionType, EncryptionKey> keys ) throws Exception
     {
-        ServerAttribute keyAttribute = 
+        EntryAttribute keyAttribute = 
             new DefaultServerAttribute( KerberosAttribute.KRB5_KEY_AT, 
                 schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_KEY_AT ) );
 

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Fri Mar 26 13:25:10 2010
@@ -26,8 +26,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerBinaryValue;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerStringValue;
@@ -137,7 +137,7 @@ public class PasswordPolicyInterceptor e
                 }
             }
 
-            ServerAttribute attr = (ServerAttribute)mod.getAttribute();
+            EntryAttribute attr = mod.getAttribute();
 
             if ( attr.instanceOf( SchemaConstants.USER_PASSWORD_AT ) )
             {

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Fri Mar 26 13:25:10 2010
@@ -48,7 +48,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAliasDereferencingException;
@@ -1300,7 +1299,7 @@ public class JdbmStore<E> implements Sto
         // Now work on the user defined userIndices
         for ( EntryAttribute attribute : entry )
         {
-            String attributeOid = ( ( ServerAttribute ) attribute ).getAttributeType().getOid();
+            String attributeOid = attribute.getAttributeType().getOid();
 
             if ( hasUserIndexOn( attributeOid ) )
             {
@@ -1373,7 +1372,7 @@ public class JdbmStore<E> implements Sto
 
         for ( EntryAttribute attribute : entry )
         {
-            String attributeOid = ( ( ServerAttribute ) attribute ).getAttributeType().getOid();
+            String attributeOid = attribute.getAttributeType().getOid();
 
             if ( hasUserIndexOn( attributeOid ) )
             {
@@ -1739,7 +1738,7 @@ public class JdbmStore<E> implements Sto
 
         for ( Modification mod : mods )
         {
-            ServerAttribute attrMods = ( ServerAttribute ) mod.getAttribute();
+            EntryAttribute attrMods = mod.getAttribute();
 
             switch ( mod.getOperation() )
             {

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Fri Mar 26 13:25:10 2010
@@ -50,9 +50,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
 import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
@@ -637,7 +637,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT, schemaManager
+        EntryAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
         attrib.add( "Engineering" );
 
@@ -739,7 +739,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SURNAME_AT, schemaManager
+        EntryAttribute attrib = new DefaultServerAttribute( SchemaConstants.SURNAME_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SURNAME_AT ) );
 
         String attribVal = "Walker";
@@ -771,7 +771,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT, schemaManager
+        EntryAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         String attribVal = "Johnny";
@@ -804,7 +804,7 @@ public class JdbmStoreTest
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
-        ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT, schemaManager
+        EntryAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
 
         Modification add = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
@@ -844,7 +844,7 @@ public class JdbmStoreTest
         store.add( entry );
 
         List<Modification> mods = new ArrayList<Modification>();
-        ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT, schemaManager
+        EntryAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT, schemaManager
             .lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
 
         String attribVal = "Marketing";

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Fri Mar 26 13:25:10 2010
@@ -30,9 +30,9 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.ServerModification;
 import org.apache.directory.shared.ldap.name.DN;
@@ -80,11 +80,11 @@ public class ChangePassword implements D
         
         List<Modification> mods = new ArrayList<Modification>(2);
         
-        ServerAttribute newPasswordAttribute = new DefaultServerAttribute( 
+        EntryAttribute newPasswordAttribute = new DefaultServerAttribute( 
             schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), StringTools.getBytesUtf8( newPassword ) );
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute ) );
         
-        ServerAttribute principalAttribute = new DefaultServerAttribute( 
+        EntryAttribute principalAttribute = new DefaultServerAttribute( 
             schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() );
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute ) );
         

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Fri Mar 26 13:25:10 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -187,7 +187,7 @@ public abstract class ReferralAwareReque
     {
         LOG.debug( "Inside getReferralOnAncestor()" );
         
-        ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
+        EntryAttribute refAttr =referralAncestor.getOriginalEntry()
             .get( SchemaConstants.REF_AT );
         InternalReferral referral = new ReferralImpl();
 
@@ -286,7 +286,7 @@ public abstract class ReferralAwareReque
     {
         LOG.debug( "Inside getReferralOnAncestor()" );
      
-        ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
+        EntryAttribute refAttr = referralAncestor.getOriginalEntry()
             .get( SchemaConstants.REF_AT );
         InternalReferral referral = new ReferralImpl();
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Fri Mar 26 13:25:10 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.ApproximateNode;
@@ -98,10 +98,10 @@ public class ApproximateEvaluator<T, ID>
     public boolean evaluateEntry( ServerEntry entry ) throws Exception
     {
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute does not exist just return false
-        if ( attr != null && evaluate( attr ) )
+        if ( ( attr != null ) && evaluate( attr ) )
         {
             return true;
         }
@@ -121,7 +121,7 @@ public class ApproximateEvaluator<T, ID>
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 if ( attr != null && evaluate( attr ) )
                 {
@@ -168,7 +168,7 @@ public class ApproximateEvaluator<T, ID>
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( ServerAttribute attribute ) throws Exception
+    private boolean evaluate( EntryAttribute attribute ) throws Exception
     {
         /*
          * Cycle through the attribute values testing normalized version

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Fri Mar 26 13:25:10 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -134,7 +134,7 @@ public class EqualityEvaluator<T, ID> im
     public boolean evaluateEntry( ServerEntry entry ) throws Exception
     {
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute does not exist just return false
         if ( attr != null && evaluate( attr ) )
@@ -157,7 +157,7 @@ public class EqualityEvaluator<T, ID> im
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 if ( attr != null && evaluate( attr ) )
                 {
@@ -184,7 +184,7 @@ public class EqualityEvaluator<T, ID> im
 
     // TODO - determine if comparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( ServerAttribute attribute ) throws Exception
+    private boolean evaluate( EntryAttribute attribute ) throws Exception
     {
         /*
          * Cycle through the attribute values testing normalized version

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Fri Mar 26 13:25:10 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
@@ -146,7 +146,7 @@ public class GreaterEqEvaluator<T, ID> i
          */
 
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute exists and has a greater than or equal value return true
         //noinspection unchecked
@@ -170,7 +170,7 @@ public class GreaterEqEvaluator<T, ID> i
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 //noinspection unchecked
                 if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
@@ -199,7 +199,7 @@ public class GreaterEqEvaluator<T, ID> i
     public boolean evaluateEntry( ServerEntry entry ) throws Exception
     {
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute exists and has a greater than or equal value return true
         if ( attr != null && evaluate( null, attr ) )
@@ -222,7 +222,7 @@ public class GreaterEqEvaluator<T, ID> i
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 if ( attr != null && evaluate( null, attr ) )
                 {
@@ -238,7 +238,7 @@ public class GreaterEqEvaluator<T, ID> i
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value 
-    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, ServerAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, EntryAttribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=927839&r1=927838&r2=927839&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Fri Mar 26 13:25:10 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
@@ -154,7 +154,7 @@ public class LessEqEvaluator<T, ID> impl
         }
 
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute does not exist just return false
         //noinspection unchecked
@@ -178,7 +178,7 @@ public class LessEqEvaluator<T, ID> impl
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 //noinspection unchecked
                 if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
@@ -196,7 +196,7 @@ public class LessEqEvaluator<T, ID> impl
     public boolean evaluateEntry( ServerEntry entry ) throws Exception
     {
         // get the attribute
-        ServerAttribute attr = ( ServerAttribute ) entry.get( type );
+        EntryAttribute attr = entry.get( type );
 
         // if the attribute does not exist just return false
         if ( attr != null && evaluate( null, attr ) )
@@ -219,7 +219,7 @@ public class LessEqEvaluator<T, ID> impl
             {
                 AttributeType descendant = descendants.next();
 
-                attr = ( ServerAttribute ) entry.get( descendant );
+                attr = entry.get( descendant );
 
                 if ( attr != null && evaluate( null, attr ) )
                 {
@@ -235,7 +235,7 @@ public class LessEqEvaluator<T, ID> impl
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, ServerAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, EntryAttribute attribute )
         throws Exception
     {
         /*



Mime
View raw message