directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [3/12] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/changelog/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/aka...
Date Sun, 20 Mar 2011 21:22:47 GMT
Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Sun Mar 20 21:22:39 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -251,7 +251,7 @@ public class CollectiveAttributeIntercep
         {
             // TODO: handle http://issues.apache.org/jira/browse/DIRSERVER-1198
             EntryAttribute attr = mod.getAttribute();
-            AttributeType attrType = attr.getAttributeType();
+            MutableAttributeTypeImpl attrType = attr.getAttributeType();
 
             // Defensive programming. Very unlikely to happen here...
             if ( attrType == null )
@@ -285,9 +285,9 @@ public class CollectiveAttributeIntercep
      */
     private boolean containsAnyCollectiveAttributes( Entry entry ) throws LdapException
     {
-        Set<AttributeType> attributeTypes = entry.getAttributeTypes();
+        Set<MutableAttributeTypeImpl> attributeTypes = entry.getAttributeTypes();
 
-        for ( AttributeType attributeType : attributeTypes )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypes )
         {
             if ( attributeType.isCollective() )
             {
@@ -351,7 +351,7 @@ public class CollectiveAttributeIntercep
 
             for ( Value<?> value : collectiveExclusions )
             {
-                AttributeType attrType = schemaManager.lookupAttributeTypeRegistry( value.getString() );
+                MutableAttributeTypeImpl attrType = schemaManager.lookupAttributeTypeRegistry( value.getString() );
                 exclusions.add( attrType.getOid() );
             }
         }
@@ -403,7 +403,7 @@ public class CollectiveAttributeIntercep
 
             Entry subentry = opContext.lookup( subentryDn, ByPassConstants.LOOKUP_COLLECTIVE_BYPASS );
 
-            for ( AttributeType attributeType : subentry.getAttributeTypes() )
+            for ( MutableAttributeTypeImpl attributeType : subentry.getAttributeTypes() )
             {
                 String attrId = attributeType.getName();
 
@@ -421,7 +421,7 @@ public class CollectiveAttributeIntercep
                     continue;
                 }
 
-                Set<AttributeType> allSuperTypes = getAllSuperTypes( attributeType );
+                Set<MutableAttributeTypeImpl> allSuperTypes = getAllSuperTypes( attributeType );
 
                 for ( String retId : retIdsSet )
                 {
@@ -431,7 +431,7 @@ public class CollectiveAttributeIntercep
                         continue;
                     }
 
-                    AttributeType retType = schemaManager.lookupAttributeTypeRegistry( retId );
+                    MutableAttributeTypeImpl retType = schemaManager.lookupAttributeTypeRegistry( retId );
 
                     if ( allSuperTypes.contains( retType ) )
                     {
@@ -476,10 +476,10 @@ public class CollectiveAttributeIntercep
     }
 
 
-    private Set<AttributeType> getAllSuperTypes( AttributeType id ) throws LdapException
+    private Set<MutableAttributeTypeImpl> getAllSuperTypes( MutableAttributeTypeImpl id ) throws LdapException
     {
-        Set<AttributeType> allSuperTypes = new HashSet<AttributeType>();
-        AttributeType superType = id;
+        Set<MutableAttributeTypeImpl> allSuperTypes = new HashSet<MutableAttributeTypeImpl>();
+        MutableAttributeTypeImpl superType = id;
 
         while ( superType != null )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SimpleNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -154,7 +154,7 @@ public class LeafEvaluator implements Ev
     private boolean evalGreaterOrLesser( SimpleNode<?> node, Entry entry, boolean isGreaterOrLesser )
         throws LdapException
     {
-        AttributeType attributeType = node.getAttributeType();
+        MutableAttributeTypeImpl attributeType = node.getAttributeType();
 
         // get the attribute associated with the node
         EntryAttribute attr = entry.get( node.getAttribute() );
@@ -217,7 +217,7 @@ public class LeafEvaluator implements Ev
      * @param entry the perspective candidate
      * @return the ava evaluation on the perspective candidate
      */
-    private boolean evalPresence( AttributeType attributeType, Entry entry ) throws LdapException
+    private boolean evalPresence( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         if ( entry == null )
         {
@@ -252,7 +252,7 @@ public class LeafEvaluator implements Ev
         }
 
         // check if Ava value exists in attribute
-        AttributeType attributeType = node.getAttributeType();
+        MutableAttributeTypeImpl attributeType = node.getAttributeType();
         Value<?> value = null;
         
         if ( attributeType.getSyntax().isHumanReadable() )
@@ -312,7 +312,7 @@ public class LeafEvaluator implements Ev
      * @return the comparator for equality matching
      * @throws LdapException if there is a failure
      */
-    private LdapComparator<Object> getComparator( AttributeType attributeType ) throws LdapException
+    private LdapComparator<Object> getComparator( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
         
@@ -327,7 +327,7 @@ public class LeafEvaluator implements Ev
      * @return the normalizer for equality matching
      * @throws LdapException if there is a failure
      */
-    private Normalizer getNormalizer( AttributeType attributeType ) throws LdapException
+    private Normalizer getNormalizer( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
         
@@ -342,7 +342,7 @@ public class LeafEvaluator implements Ev
      * @return the matching rule
      * @throws LdapException if there is a failure
      */
-    private MatchingRule getMatchingRule( AttributeType attributeType, int matchType ) throws LdapException
+    private MatchingRule getMatchingRule( MutableAttributeTypeImpl attributeType, int matchType ) throws LdapException
     {
         MatchingRule mrule = null;
 

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Sun Mar 20 21:22:39 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 
@@ -59,7 +59,7 @@ public class SubstringEvaluator implemen
     {
         Pattern regex = null;
         SubstringNode snode = (SubstringNode)node;
-        AttributeType attributeType = snode.getAttributeType();
+        MutableAttributeTypeImpl attributeType = snode.getAttributeType();
         MatchingRule matchingRule = attributeType.getSubstring();
         
         if ( matchingRule == null )

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Sun Mar 20 21:22:39 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.ldif.ChangeType;
 import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -114,9 +114,9 @@ public class JournalInterceptor extends 
             ldif.setChangeType( ChangeType.Add );
             ldif.setDn( addContext.getDn() );
 
-            Set<AttributeType> list = addEntry.getAttributeTypes();
+            Set<MutableAttributeTypeImpl> list = addEntry.getAttributeTypes();
             
-            for ( AttributeType attributeType:list )
+            for ( MutableAttributeTypeImpl attributeType:list )
             {
                 ldif.addAttribute( addEntry.get( attributeType).clone() );
             }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
@@ -112,12 +112,12 @@ public class ExpandingVisitor implements
                         children.set( childNumber++, orNode );
 
                         // iterate through descendants adding them to the orNode
-                        Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( leaf.getAttributeType() );
+                        Iterator<MutableAttributeTypeImpl> descendants = schemaManager.getAttributeTypeRegistry().descendants( leaf.getAttributeType() );
 
                         while ( descendants.hasNext() )
                         {
                             LeafNode newLeaf = null;
-                            AttributeType descendant = descendants.next();
+                            MutableAttributeTypeImpl descendant = descendants.next();
 
                             if ( leaf instanceof PresenceNode )
                             {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SimpleNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.name.NameComponentNormalizer;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -131,7 +131,7 @@ public class FilterNormalizingVisitor im
      * @param value The value to normalize
      * @return the normalized value
      */
-    private Value<?> normalizeValue( AttributeType attributeType, Value<?> value )
+    private Value<?> normalizeValue( MutableAttributeTypeImpl attributeType, Value<?> value )
     {
         try
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Sun Mar 20 21:22:39 2011
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -352,7 +352,7 @@ public class NormalizationInterceptor ex
         // Get the attributeType from the OID
         try
         {
-            AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( compareContext.getOid() );
+            MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( compareContext.getOid() );
 
             // Translate the value from binary to String if the AT is HR
             if ( attributeType.getSyntax().isHumanReadable() && ( compareContext.getValue().isBinary() ) )
@@ -420,7 +420,7 @@ public class NormalizationInterceptor ex
                 // 2) The attribute exists
                 else
                 {
-                    AttributeType at = schemaManager.lookupAttributeTypeRegistry( upId );
+                    MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( upId );
 
                     // 2.1 if the attribute is single valued, replace the value
                     if ( at.isSingleValued() )

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sun Mar 20 21:22:39 2011
@@ -60,7 +60,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
@@ -245,7 +245,7 @@ public class OperationalAttributeInterce
         
         for ( Modification modification : mods )
         {
-            AttributeType attributeType = modification.getAttribute().getAttributeType();
+            MutableAttributeTypeImpl attributeType = modification.getAttribute().getAttributeType();
 
             if ( attributeType.equals( MODIFIERS_NAME_AT ) )
             {
@@ -434,10 +434,10 @@ public class OperationalAttributeInterce
      */
     private boolean filterOperationalAttributes( Entry attributes ) throws LdapException
     {
-        Set<AttributeType> removedAttributes = new HashSet<AttributeType>();
+        Set<MutableAttributeTypeImpl> removedAttributes = new HashSet<MutableAttributeTypeImpl>();
 
         // Build a list of attributeType to remove
-        for ( AttributeType attributeType : attributes.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl attributeType : attributes.getAttributeTypes() )
         {
             if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
             {
@@ -446,7 +446,7 @@ public class OperationalAttributeInterce
         }
 
         // Now remove the attributes which are not USERs
-        for ( AttributeType attributeType : removedAttributes )
+        for ( MutableAttributeTypeImpl attributeType : removedAttributes )
         {
             attributes.removeAttributes( attributeType );
         }
@@ -467,11 +467,11 @@ public class OperationalAttributeInterce
             return;
         }
 
-        Set<AttributeType> attributeTypes = entry.getAttributeTypes();
+        Set<MutableAttributeTypeImpl> attributeTypes = entry.getAttributeTypes();
 
         if ( dn.size() == 0 )
         {
-            for ( AttributeType attributeType : attributeTypes )
+            for ( MutableAttributeTypeImpl attributeType : attributeTypes )
             {
                 if ( !ids.contains( attributeType.getOid() ) )
                 {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sun Mar 20 21:22:39 2011
@@ -89,7 +89,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.extended.NoticeOfDisconnect;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.DnUtils;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
@@ -138,10 +138,10 @@ public class DefaultPartitionNexus exten
     private boolean initialized;
 
     /** A reference to the EntryCSN attributeType */
-    private static AttributeType ENTRY_CSN_AT;
+    private static MutableAttributeTypeImpl ENTRY_CSN_AT;
 
     /** A reference to the ObjectClass attributeType */
-    private static AttributeType OBJECT_CLASS_AT;
+    private static MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
     final List<Modification> mods = new ArrayList<Modification>( 2 );
 
@@ -611,11 +611,11 @@ public class DefaultPartitionNexus exten
         if ( dn.size() == 0 )
         {
             ClonedServerEntry retval = new ClonedServerEntry( rootDSE );
-            Set<AttributeType> attributeTypes = rootDSE.getAttributeTypes();
+            Set<MutableAttributeTypeImpl> attributeTypes = rootDSE.getAttributeTypes();
 
             if ( lookupContext.getAttrsId() != null && !lookupContext.getAttrsId().isEmpty() )
             {
-                for ( AttributeType attributeType : attributeTypes )
+                for ( MutableAttributeTypeImpl attributeType : attributeTypes )
                 {
                     String oid = attributeType.getOid();
 
@@ -777,7 +777,7 @@ public class DefaultPartitionNexus exten
 
         for ( EntryAttribute attribute : rootDSE )
         {
-            AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute.getUpId() );
+            MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( attribute.getUpId() );
 
             if ( realIds.contains( type.getOid() ) )
             {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Sun Mar 20 21:22:39 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.util.PreferencesDictionary;
 
 
@@ -268,7 +268,7 @@ public class ServerSystemPreferences ext
 
     protected void removeSpi( String key ) 
     {
-        AttributeType at;
+        MutableAttributeTypeImpl at;
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
@@ -342,7 +342,7 @@ public class ServerSystemPreferences ext
 
     protected void putSpi( String key, String value )
     {
-        AttributeType at;
+        MutableAttributeTypeImpl at;
         try
         {
             at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
@@ -68,9 +68,9 @@ public class AttributesFactory
         {
             return getAttributes( ( MutableMatchingRuleImpl ) obj, schema, schemaManager );
         }
-        else if ( obj instanceof AttributeType )
+        else if ( obj instanceof MutableAttributeTypeImpl )
         {
-            return getAttributes( ( AttributeType ) obj, schema, schemaManager );
+            return getAttributes( ( MutableAttributeTypeImpl ) obj, schema, schemaManager );
         }
         else if ( obj instanceof ObjectClass )
         {
@@ -264,7 +264,7 @@ public class AttributesFactory
      * @return Attributes
      * @throws LdapException
      */
-    public Entry getAttributes( AttributeType attributeType, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( MutableAttributeTypeImpl attributeType, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
         Entry entry = new DefaultEntry( schemaManager );
 

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sun Mar 20 21:22:39 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
@@ -168,7 +168,7 @@ public class DefaultSchemaService implem
         EntryAttribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
 
-        for ( AttributeType attributeType : getSchemaManager().getAttributeTypeRegistry() )
+        for ( MutableAttributeTypeImpl attributeType : getSchemaManager().getAttributeTypeRegistry() )
         {
             attr.add( SchemaUtils.render( attributeType ).toString() );
         }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sun Mar 20 21:22:39 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.NameComponentNormalizer;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.apache.directory.shared.ldap.model.schema.registries.AbstractSchemaLoader;
@@ -71,7 +71,7 @@ public class PartitionSchemaLoader exten
     /** The attributeType registry */
     private SchemaManager schemaManager;
 
-    private final AttributeType cnAT;
+    private final MutableAttributeTypeImpl cnAT;
 
 
     public PartitionSchemaLoader( Partition partition, SchemaManager schemaManager ) throws Exception

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sun Mar 20 21:22:39 2011
@@ -86,7 +86,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -151,13 +151,13 @@ public class SchemaInterceptor extends B
     private Map<String, List<ObjectClass>> superiors;
 
     /** A map used to store all the objectClasses may attributes */
-    private Map<String, List<AttributeType>> allMay;
+    private Map<String, List<MutableAttributeTypeImpl>> allMay;
 
     /** A map used to store all the objectClasses must */
-    private Map<String, List<AttributeType>> allMust;
+    private Map<String, List<MutableAttributeTypeImpl>> allMust;
 
     /** A map used to store all the objectClasses allowed attributes (may + must) */
-    private Map<String, List<AttributeType>> allowed;
+    private Map<String, List<MutableAttributeTypeImpl>> allowed;
 
 
     /**
@@ -218,8 +218,8 @@ public class SchemaInterceptor extends B
     {
         List<ObjectClass> parents = superiors.get( objectClass.getOid() );
 
-        List<AttributeType> mustList = new ArrayList<AttributeType>();
-        List<AttributeType> allowedList = new ArrayList<AttributeType>();
+        List<MutableAttributeTypeImpl> mustList = new ArrayList<MutableAttributeTypeImpl>();
+        List<MutableAttributeTypeImpl> allowedList = new ArrayList<MutableAttributeTypeImpl>();
         Set<String> mustSeen = new HashSet<String>();
 
         allMust.put( objectClass.getOid(), mustList );
@@ -227,11 +227,11 @@ public class SchemaInterceptor extends B
 
         for ( ObjectClass parent : parents )
         {
-            List<AttributeType> mustParent = parent.getMustAttributeTypes();
+            List<MutableAttributeTypeImpl> mustParent = parent.getMustAttributeTypes();
 
             if ( ( mustParent != null ) && ( mustParent.size() != 0 ) )
             {
-                for ( AttributeType attributeType : mustParent )
+                for ( MutableAttributeTypeImpl attributeType : mustParent )
                 {
                     String oid = attributeType.getOid();
 
@@ -262,19 +262,19 @@ public class SchemaInterceptor extends B
     {
         List<ObjectClass> parents = superiors.get( objectClass.getOid() );
 
-        List<AttributeType> mayList = new ArrayList<AttributeType>();
+        List<MutableAttributeTypeImpl> mayList = new ArrayList<MutableAttributeTypeImpl>();
         Set<String> maySeen = new HashSet<String>();
-        List<AttributeType> allowedList = allowed.get( objectClass.getOid() );
+        List<MutableAttributeTypeImpl> allowedList = allowed.get( objectClass.getOid() );
 
         allMay.put( objectClass.getOid(), mayList );
 
         for ( ObjectClass parent : parents )
         {
-            List<AttributeType> mustParent = parent.getMustAttributeTypes();
+            List<MutableAttributeTypeImpl> mustParent = parent.getMustAttributeTypes();
 
             if ( ( mustParent != null ) && ( mustParent.size() != 0 ) )
             {
-                for ( AttributeType attributeType : mustParent )
+                for ( MutableAttributeTypeImpl attributeType : mustParent )
                 {
                     String oid = attributeType.getOid();
 
@@ -361,9 +361,9 @@ public class SchemaInterceptor extends B
     {
         Iterator<ObjectClass> objectClasses = schemaManager.getObjectClassRegistry().iterator();
         superiors = new ConcurrentHashMap<String, List<ObjectClass>>();
-        allMust = new ConcurrentHashMap<String, List<AttributeType>>();
-        allMay = new ConcurrentHashMap<String, List<AttributeType>>();
-        allowed = new ConcurrentHashMap<String, List<AttributeType>>();
+        allMust = new ConcurrentHashMap<String, List<MutableAttributeTypeImpl>>();
+        allMay = new ConcurrentHashMap<String, List<MutableAttributeTypeImpl>>();
+        allowed = new ConcurrentHashMap<String, List<MutableAttributeTypeImpl>>();
 
         while ( objectClasses.hasNext() )
         {
@@ -515,7 +515,7 @@ public class SchemaInterceptor extends B
     }
 
 
-    private Value<?> convert( AttributeType attributeType, Value<?> value ) throws LdapException
+    private Value<?> convert( MutableAttributeTypeImpl attributeType, Value<?> value ) throws LdapException
     {
         if ( attributeType.getSyntax().isHumanReadable() )
         {
@@ -698,7 +698,7 @@ public class SchemaInterceptor extends B
                     return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext );
                 }
 
-                AttributeType nodeAt = node.getAttributeType();
+                MutableAttributeTypeImpl nodeAt = node.getAttributeType();
 
                 // see if node attribute is objectClass
                 if ( nodeAt.equals( OBJECT_CLASS_AT )
@@ -821,12 +821,12 @@ public class SchemaInterceptor extends B
             String ocName = value.getString();
             ObjectClass oc = schemaManager.getObjectClassRegistry().lookup( ocName );
 
-            List<AttributeType> types = oc.getMustAttributeTypes();
+            List<MutableAttributeTypeImpl> types = oc.getMustAttributeTypes();
 
             // For each objectClass, loop on all MUST attributeTypes, if any
             if ( ( types != null ) && ( types.size() > 0 ) )
             {
-                for ( AttributeType type : types )
+                for ( MutableAttributeTypeImpl type : types )
                 {
                     must.add( type.getOid() );
                 }
@@ -850,12 +850,12 @@ public class SchemaInterceptor extends B
             String ocName = objectClass.getString();
             ObjectClass oc = schemaManager.getObjectClassRegistry().lookup( ocName );
 
-            List<AttributeType> types = oc.getMayAttributeTypes();
+            List<MutableAttributeTypeImpl> types = oc.getMayAttributeTypes();
 
             // For each objectClass, loop on all MAY attributeTypes, if any
             if ( ( types != null ) && ( types.size() > 0 ) )
             {
-                for ( AttributeType type : types )
+                for ( MutableAttributeTypeImpl type : types )
                 {
                     String oid = type.getOid();
 
@@ -951,14 +951,14 @@ public class SchemaInterceptor extends B
             // are still present in the entry.
             for ( Ava atav : oldRdn)
             {
-                AttributeType type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
+                MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
                 entry.remove( type, atav.getUpValue() );
             }
 
             // Check that no operational attributes are removed
             for ( Ava atav : oldRdn)
             {
-                AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
+                MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
 
                 if ( !attributeType.isUserModifiable() )
                 {
@@ -969,7 +969,7 @@ public class SchemaInterceptor extends B
 
         for ( Ava atav : newRdn )
         {
-            AttributeType type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
+            MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( atav.getUpType() );
 
             if ( !entry.contains( type, atav.getNormValue() ) )
             {
@@ -991,7 +991,7 @@ public class SchemaInterceptor extends B
      */
     private EntryAttribute createNewAttribute( EntryAttribute attribute )
     {
-        AttributeType attributeType = attribute.getAttributeType();
+        MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
 
         // Create the new Attribute
         EntryAttribute newAttribute = new DefaultEntryAttribute( attribute.getUpId(), attributeType );
@@ -1021,7 +1021,7 @@ public class SchemaInterceptor extends B
         for ( Modification mod : mods )
         {
             EntryAttribute attribute = mod.getAttribute();
-            AttributeType attributeType = attribute.getAttributeType();
+            MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
 
             // We don't allow modification of operational attributes
             if ( !attributeType.isUserModifiable()
@@ -1215,7 +1215,7 @@ public class SchemaInterceptor extends B
 
             for ( Modification mod : mods )
             {
-                AttributeType at = ( ( DefaultModification ) mod ).getAttribute().getAttributeType();
+                MutableAttributeTypeImpl at = ( ( DefaultModification ) mod ).getAttribute().getAttributeType();
 
                 if ( !MODIFIERS_NAME_AT.equals( at ) && !MODIFY_TIMESTAMP_AT.equals( at ) )
                 {
@@ -1355,7 +1355,7 @@ public class SchemaInterceptor extends B
         // First, make sure all attributes are valid schema defined attributes
         // ---------------------------------------------------------------
 
-        for ( AttributeType attributeType : entry.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl attributeType : entry.getAttributeTypes() )
         {
             if ( !schemaManager.getAttributeTypeRegistry().contains( attributeType.getName() ) )
             {
@@ -1572,7 +1572,7 @@ public class SchemaInterceptor extends B
         {
             String attrOid = attribute.getAttributeType().getOid();
 
-            AttributeType attributeType = attribute.getAttributeType();
+            MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
 
             if ( !attributeType.isCollective() && ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 && !allowed.contains( attrOid ) )
@@ -1727,7 +1727,7 @@ public class SchemaInterceptor extends B
         // First, loop on all attributes
         for ( EntryAttribute attribute : entry )
         {
-            AttributeType attributeType = attribute.getAttributeType();
+            MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
             SyntaxChecker syntaxChecker = attributeType.getSyntax().getSyntaxChecker();
 
             if ( syntaxChecker instanceof OctetStringSyntaxChecker )
@@ -1881,7 +1881,7 @@ public class SchemaInterceptor extends B
         // Loops on all attributes
         for ( EntryAttribute attribute : entry )
         {
-            AttributeType attributeType = attribute.getAttributeType();
+            MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
 
             // If the attributeType is H-R, check all of its values
             if ( attributeType.getSyntax().isHumanReadable() )

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Sun Mar 20 21:22:39 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
@@ -91,7 +91,7 @@ public class SchemaSubentryManager
     private static final String CASCADING_ERROR =
             "Cascading has not yet been implemented: standard operation is in effect.";
 
-    private static AttributeType ENTRY_CSN_ATTRIBUTE_TYPE;
+    private static MutableAttributeTypeImpl ENTRY_CSN_ATTRIBUTE_TYPE;
     
     static 
     {
@@ -256,9 +256,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( ATTRIBUTE_TYPE_INDEX ):
-                AttributeType[] ats = parsers.parseAttributeTypes( mods );
+                MutableAttributeTypeImpl[] ats = parsers.parseAttributeTypes( mods );
                 
-                for ( AttributeType at : ats )
+                for ( MutableAttributeTypeImpl at : ats )
                 {
                     subentryModifier.deleteSchemaObject( modifyContext, at );
                 }
@@ -394,9 +394,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( ATTRIBUTE_TYPE_INDEX ):
-                AttributeType[] ats = parsers.parseAttributeTypes( mods );
+                MutableAttributeTypeImpl[] ats = parsers.parseAttributeTypes( mods );
                 
-                for ( AttributeType at : ats )
+                for ( MutableAttributeTypeImpl at : ats )
                 {
                     subentryModifier.addSchemaObject( modifyContext, at );
                 }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sun Mar 20 21:22:39 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 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.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
@@ -113,7 +113,7 @@ public class SchemaSubentryModifier
         {
             buf.append( SchemaConstants.MATCHING_RULES_AT );
         }
-        else if ( obj instanceof AttributeType )
+        else if ( obj instanceof MutableAttributeTypeImpl )
         {
             buf.append( SchemaConstants.ATTRIBUTE_TYPES_AT );
         }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Sun Mar 20 21:22:39 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +67,7 @@ public class LdapClassLoader extends Cla
     private DirectoryService directoryService;
 
     /** A storage for the ObjectClass attributeType */
-    private AttributeType OBJECT_CLASS_AT;
+    private MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
     
     public LdapClassLoader( DirectoryService directoryService ) throws LdapException
@@ -84,7 +84,7 @@ public class LdapClassLoader extends Cla
     {
         // Set up the search filter
         BranchNode filter = new AndNode( );
-        AttributeType fqjcnAt = directoryService.getSchemaManager().getAttributeType( "fullyQualifiedJavaClassName" );
+        MutableAttributeTypeImpl fqjcnAt = directoryService.getSchemaManager().getAttributeType( "fullyQualifiedJavaClassName" );
         filter.addNode( new EqualityNode<String>( fqjcnAt, new StringValue( name ) ) );
         filter.addNode( new EqualityNode<String>( OBJECT_CLASS_AT,
             new StringValue( ApacheSchemaConstants.JAVA_CLASS_OC ) ) );

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
 
 
@@ -86,7 +86,7 @@ public class StoredProcExecutionManager
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         String spUnitName = StoredProcUtils.extractStoredProcUnitName( fullSPName );
         
-        AttributeType storeProcUnitNamAT = session.getDirectoryService()
+        MutableAttributeTypeImpl storeProcUnitNamAT = session.getDirectoryService()
             .getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" );
         ExprNode filter = new EqualityNode<String>( storeProcUnitNamAT, new StringValue( storeProcUnitNamAT, spUnitName ) );
         Dn dn = session.getDirectoryService().getDnFactory().create( storedProcContainer );

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.SimpleNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
@@ -45,7 +45,7 @@ public class RefinementLeafEvaluator
     private final SchemaManager schemaManager;
 
     /** A storage for the ObjectClass attributeType */
-    private AttributeType OBJECT_CLASS_AT;
+    private MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
 
     /**

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Mar 20 21:22:39 2011
@@ -78,7 +78,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole;
 import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecificationParser;
@@ -101,7 +101,7 @@ public class SubentryInterceptor extends
     private static final String SUBENTRY_CONTROL = Subentries.OID;
 
     /** The set of Subentry operational attributes */
-    public static AttributeType[] SUBENTRY_OPATTRS;
+    public static MutableAttributeTypeImpl[] SUBENTRY_OPATTRS;
 
     /** the hash mapping the Dn of a subentry to its SubtreeSpecification/types */
     private final SubentryCache subentryCache = new SubentryCache();
@@ -180,7 +180,7 @@ public class SubentryInterceptor extends
 
         nexus = directoryService.getPartitionNexus();
 
-        SUBENTRY_OPATTRS = new AttributeType[]
+        SUBENTRY_OPATTRS = new MutableAttributeTypeImpl[]
             {
                 ACCESS_CONTROL_SUBENTRIES_AT,
                 SUBSCHEMA_SUBENTRY_AT,
@@ -503,7 +503,7 @@ public class SubentryInterceptor extends
             // need to remove references to the subentry
             if ( isOldNameSelected && !isNewNameSelected )
             {
-                for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
+                for ( MutableAttributeTypeImpl operationalAttribute : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
                     EntryAttribute opAttr = entry.get( operationalAttribute );
@@ -525,7 +525,7 @@ public class SubentryInterceptor extends
             // need to add references to the subentry
             else if ( isNewNameSelected && !isOldNameSelected )
             {
-                for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
+                for ( MutableAttributeTypeImpl operationalAttribute : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
                     EntryAttribute opAttr = new DefaultEntryAttribute( operationalAttribute );
@@ -587,7 +587,7 @@ public class SubentryInterceptor extends
      * Update the list of modifications with a modification associated with a specific
      * role, if it's requested.
      */
-    private void getOperationalModForReplace( boolean hasRole, AttributeType attributeType, Entry entry, Dn oldDn, Dn newDn, List<Modification> modifications )
+    private void getOperationalModForReplace( boolean hasRole, MutableAttributeTypeImpl attributeType, Entry entry, Dn oldDn, Dn newDn, List<Modification> modifications )
     {
         String oldDnStr = oldDn.getNormName();
         String newDnStr = newDn.getNormName();
@@ -683,7 +683,7 @@ public class SubentryInterceptor extends
         List<Modification> modifications = new ArrayList<Modification>();
         String dn = subentryDn.getNormName();
 
-        for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
+        for ( MutableAttributeTypeImpl operationalAttribute : SUBENTRY_OPATTRS )
         {
             EntryAttribute opAttr = candidate.get( operationalAttribute );
 
@@ -758,7 +758,7 @@ public class SubentryInterceptor extends
             // need to remove references to the subentry
             if ( isOldEntrySelected && !isNewEntrySelected )
             {
-                for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
+                for ( MutableAttributeTypeImpl operationalAttribute : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
                     EntryAttribute opAttr = oldEntry.get( operationalAttribute );
@@ -780,7 +780,7 @@ public class SubentryInterceptor extends
             // need to add references to the subentry
             else if ( isNewEntrySelected && !isOldEntrySelected )
             {
-                for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
+                for ( MutableAttributeTypeImpl operationalAttribute : SUBENTRY_OPATTRS )
                 {
                     ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
                     EntryAttribute opAttr = new DefaultEntryAttribute( operationalAttribute );
@@ -797,7 +797,7 @@ public class SubentryInterceptor extends
     /**
      * Update the Operational Attribute with the reference to the subentry
      */
-    private void setOperationalAttribute( Entry entry, Dn subentryDn, AttributeType opAttr) throws LdapException
+    private void setOperationalAttribute( Entry entry, Dn subentryDn, MutableAttributeTypeImpl opAttr) throws LdapException
     {
         EntryAttribute operational = entry.get( opAttr );
 

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sun Mar 20 21:22:39 2011
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
@@ -118,7 +118,7 @@ public class TriggerSpecCache
         // add that subentry to the hash
         Set<String> suffixes = nexus.listSuffixes();
 
-        AttributeType objectClassAt = directoryService.getSchemaManager().
+        MutableAttributeTypeImpl objectClassAt = directoryService.getSchemaManager().
             getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
 
         for ( String suffix:suffixes )

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  *
  */
-public class DummyAttributeTypeRegistry extends DefaultSchemaObjectRegistry<AttributeType>
+public class DummyAttributeTypeRegistry extends DefaultSchemaObjectRegistry<MutableAttributeTypeImpl>
 {
     private final boolean returnOperational;
 
@@ -56,14 +56,14 @@ public class DummyAttributeTypeRegistry 
     }
 
 
-    public AttributeType lookup( final String id ) throws LdapException
+    public MutableAttributeTypeImpl lookup( final String id ) throws LdapException
     {
         AbstractNormalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
 
         MutableMatchingRuleImpl equality = new MutableMatchingRuleImpl( "1.1.1" );
         equality.setNormalizer( normalizer );
 
-        AttributeType attributeType = new AttributeType( id );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( id );
         attributeType.setEquality( equality );
         attributeType.setSingleValued( false );
         attributeType.setCollective( false );
@@ -98,9 +98,9 @@ public class DummyAttributeTypeRegistry 
     }
 
 
-    public Iterator<AttributeType> list()
+    public Iterator<MutableAttributeTypeImpl> list()
     {
-        return new ArrayList<AttributeType>().iterator();
+        return new ArrayList<MutableAttributeTypeImpl>().iterator();
     }
 
 
@@ -110,7 +110,7 @@ public class DummyAttributeTypeRegistry 
     }
 
 
-    public Iterator<AttributeType> descendants( String ancestorId ) throws LdapException
+    public Iterator<MutableAttributeTypeImpl> descendants( String ancestorId ) throws LdapException
     {
         return null;
     }
@@ -122,19 +122,19 @@ public class DummyAttributeTypeRegistry 
     }
 
 
-    public Iterator<AttributeType> iterator()
+    public Iterator<MutableAttributeTypeImpl> iterator()
     {
         return null;
     }
 
 
-    public AttributeType unregister( String numericOid ) throws LdapException
+    public MutableAttributeTypeImpl unregister( String numericOid ) throws LdapException
     {
         return null;
     }
 
 
-    public void register( AttributeType attributeType ) throws LdapException
+    public void register( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
     }
 
@@ -145,22 +145,22 @@ public class DummyAttributeTypeRegistry 
     }
 
 
-    public void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void unregisterDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
     }
 
 
-    public void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void registerDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
     }
 
 
-    public void addMappingFor( AttributeType attributeType ) throws LdapException
+    public void addMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
     }
 
 
-    public SchemaObjectRegistry<AttributeType> copy()
+    public SchemaObjectRegistry<MutableAttributeTypeImpl> copy()
     {
         return null;
     }

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Sun Mar 20 21:22:39 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 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.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
@@ -69,7 +69,7 @@ public class MaxValueCountFilterTest
     private static Entry FULL_ENTRY;
 
     /** The CN attribute Type */
-    private static AttributeType CN_AT;
+    private static MutableAttributeTypeImpl CN_AT;
 
     /** A reference to the schemaManager */
     private static SchemaManager schemaManager;
@@ -87,7 +87,7 @@ public class MaxValueCountFilterTest
         FULL_ENTRY.put( "cn", "1", "2", "3" );
 
         Set<MaxValueCountElem> mvcItems = new HashSet<MaxValueCountElem>();
-        AttributeType cn = schemaManager.lookupAttributeTypeRegistry( "cn" );
+        MutableAttributeTypeImpl cn = schemaManager.lookupAttributeTypeRegistry( "cn" );
         mvcItems.add( new MaxValueCountElem( cn, 2 ) );
         PROTECTED_ITEMS.add( new MaxValueCountItem( mvcItems ) );
         

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Sun Mar 20 21:22:39 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.filter.PresenceNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,7 +59,7 @@ import org.junit.runner.RunWith;
 @Concurrency()
 public class MostSpecificProtectedItemFilterTest
 {
-    private static final Set<AttributeType> EMPTY_STRING_COLLECTION = Collections.unmodifiableSet( new HashSet<AttributeType>() );
+    private static final Set<MutableAttributeTypeImpl> EMPTY_STRING_COLLECTION = Collections.unmodifiableSet( new HashSet<MutableAttributeTypeImpl>() );
 
     private static final Set<EntryAttribute> EMPTY_ATTRIBUTE_COLLECTION = Collections
         .unmodifiableSet( new HashSet<EntryAttribute>() );

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Sun Mar 20 21:22:39 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
@@ -86,13 +86,13 @@ public class RelatedProtectedItemFilterT
     private static RelatedProtectedItemFilter filterB;
     
     /** The CN attribute Type */
-    private static AttributeType CN_AT;
+    private static MutableAttributeTypeImpl CN_AT;
     
     /** The OU attribute Type */
-    private static AttributeType OU_AT;
+    private static MutableAttributeTypeImpl OU_AT;
     
     /** The SN attribute Type */
-    private static AttributeType SN_AT;
+    private static MutableAttributeTypeImpl SN_AT;
 
     
     @BeforeClass 
@@ -192,7 +192,7 @@ public class RelatedProtectedItemFilterT
     @Test 
     public void testAllAttributeValues() throws Exception
     {
-        Set<AttributeType> attrTypes = new HashSet<AttributeType>();
+        Set<MutableAttributeTypeImpl> attrTypes = new HashSet<MutableAttributeTypeImpl>();
         attrTypes.add( CN_AT );
         Collection<ACITuple> tuples = getTuples( new AllAttributeValuesItem( attrTypes ) );
 
@@ -225,7 +225,7 @@ public class RelatedProtectedItemFilterT
     @Test 
     public void testAttributeType() throws Exception
     {
-        Set<AttributeType> attrTypes = new HashSet<AttributeType>();
+        Set<MutableAttributeTypeImpl> attrTypes = new HashSet<MutableAttributeTypeImpl>();
         attrTypes.add( CN_AT );
         Collection<ACITuple> tuples = getTuples( new AttributeTypeItem( attrTypes ) );
 
@@ -434,7 +434,7 @@ public class RelatedProtectedItemFilterT
     @Test 
     public void testSelfValue() throws Exception
     {
-        Set<AttributeType> attrTypes = new HashSet<AttributeType>();
+        Set<MutableAttributeTypeImpl> attrTypes = new HashSet<MutableAttributeTypeImpl>();
         attrTypes.add( CN_AT );
         Collection<ACITuple> tuples = getTuples( new SelfValueItem( attrTypes ) );
 

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Sun Mar 20 21:22:39 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
@@ -72,10 +72,10 @@ public class RestrictedByFilterTest
     private static SchemaManager schemaManager;
     
     /** The CN attribute Type */
-    private static AttributeType CN_AT;
+    private static MutableAttributeTypeImpl CN_AT;
 
     /** The SN attribute Type */
-    private static AttributeType SN_AT;
+    private static MutableAttributeTypeImpl SN_AT;
 
     
     @BeforeClass 

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -89,12 +89,12 @@ public class SchemaServiceTest
     @Test
     public void testDescendants() throws Exception
     {
-        Iterator<AttributeType> list = schemaManager.getAttributeTypeRegistry().descendants( "name" );
+        Iterator<MutableAttributeTypeImpl> list = schemaManager.getAttributeTypeRegistry().descendants( "name" );
         Set<String> nameAttrs = new HashSet<String>();
 
         while ( list.hasNext() )
         {
-            AttributeType type = list.next();
+            MutableAttributeTypeImpl type = list.next();
             nameAttrs.add( type.getName() );
         }
 

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Sun Mar 20 21:22:39 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.model.filter.NotNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
@@ -59,10 +59,10 @@ public class RefinementEvaluatorTest
     private static RefinementEvaluator evaluator;
 
     /** The ObjectClass AttributeType */
-    private static AttributeType OBJECT_CLASS_AT;
+    private static MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
     /** The CN_AT AttributeType */
-    private static AttributeType CN_AT;
+    private static MutableAttributeTypeImpl CN_AT;
     
     
     /**

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Sun Mar 20 21:22:39 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
@@ -57,10 +57,10 @@ public class RefinementLeafEvaluatorTest
     private static SchemaManager schemaManager;
 
     /** The ObjectClass AttributeType */
-    private static AttributeType OBJECT_CLASS_AT;
+    private static MutableAttributeTypeImpl OBJECT_CLASS_AT;
     
     /** The CN AttributeType */
-    private static AttributeType CN_AT;
+    private static MutableAttributeTypeImpl CN_AT;
     
     /** the refinement leaf evaluator to test */
     private static RefinementLeafEvaluator evaluator;

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -153,7 +153,7 @@ public class JdbmIndex<K, O> extends Abs
      * @param attributeType The attributeType this index is created for
      * @throws IOException If the initialization failed
      */
-    public void init( SchemaManager schemaManager, AttributeType attributeType ) throws IOException
+    public void init( SchemaManager schemaManager, MutableAttributeTypeImpl attributeType ) throws IOException
     {
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
         

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Sun Mar 20 21:22:39 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
 import org.apache.directory.server.xdbm.ParentIdAndRdnComparator;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.SynchronizedLRUMap;
@@ -67,7 +67,7 @@ public class JdbmRdnIndex<E> extends Jdb
     }
 
 
-    public void init( SchemaManager schemaManager, AttributeType attributeType ) throws IOException
+    public void init( SchemaManager schemaManager, MutableAttributeTypeImpl attributeType ) throws IOException
     {
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
         

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sun Mar 20 21:22:39 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 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.Value;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.exception.MultiException;
 import org.slf4j.Logger;
@@ -387,7 +387,7 @@ public class JdbmStore<E> extends Abstra
      */
     public void buildUserIndex( Index userIdx ) throws Exception
     {
-        AttributeType atType = userIdx.getAttribute();
+        MutableAttributeTypeImpl atType = userIdx.getAttribute();
 
         LOG.info( "building the index for attribute type {}", atType );
         

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Sun Mar 20 21:22:39 2011
@@ -35,7 +35,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -150,7 +150,7 @@ public class JdbmIndexTest
             jdbmIdx = new JdbmIndex<String, Entry>();
         }
         
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT );
 
         jdbmIdx.init( schemaManager, attributeType );
         this.idx = jdbmIdx;
@@ -575,7 +575,7 @@ public class JdbmIndexTest
 
         try
         {
-            AttributeType noEqMatchAttribute = new AttributeType( "1.1" );
+            MutableAttributeTypeImpl noEqMatchAttribute = new MutableAttributeTypeImpl( "1.1" );
             jdbmIndex.setWkDirPath( dbFileDir.toURI() );
             jdbmIndex.init( schemaManager, noEqMatchAttribute );
             fail( "should not get here" );

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sun Mar 20 21:22:39 2011
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -89,16 +89,16 @@ public class JdbmStoreTest
     private static Dn EXAMPLE_COM;
 
     /** The OU AttributeType instance */
-    private static AttributeType OU_AT;
+    private static MutableAttributeTypeImpl OU_AT;
 
     /** The ApacheAlias AttributeType instance */
-    private static AttributeType APACHE_ALIAS_AT;
+    private static MutableAttributeTypeImpl APACHE_ALIAS_AT;
 
     /** The DC AttributeType instance */
-    private static AttributeType DC_AT;
+    private static MutableAttributeTypeImpl DC_AT;
 
     /** The SN AttributeType instance */
-    private static AttributeType SN_AT;
+    private static MutableAttributeTypeImpl SN_AT;
 
 
     @BeforeClass



Mime
View raw message