directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [7/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
Copied: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableAttributeTypeImpl.java (from r1083422, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableAttributeTypeImpl.java?p2=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableAttributeTypeImpl.java&p1=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java&r1=1083422&r2=1083574&rev=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableAttributeTypeImpl.java Sun Mar 20 21:22:39 2011
@@ -136,15 +136,15 @@ import org.slf4j.LoggerFactory;
  * @see <a
  *      href="http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-11.txt">
  *      ldapbis [MODELS]</a>
- * @see DescriptionUtils#getDescription(AttributeType)
+ * @see DescriptionUtils#getDescription(MutableAttributeTypeImpl)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AttributeType extends AbstractMutableSchemaObject implements Cloneable
+public class MutableAttributeTypeImpl extends AbstractMutableSchemaObject implements Cloneable
 {
     private static final long serialVersionUID = 1L;
 
     /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( AttributeType.class );
+    private static final Logger LOG = LoggerFactory.getLogger( MutableAttributeTypeImpl.class );
 
     /** The syntax OID associated with this AttributeType */
     private String syntaxOid;
@@ -174,7 +174,7 @@ public class AttributeType extends Abstr
     private String superiorOid;
 
     /** The superior AttributeType */
-    private AttributeType superior;
+    private MutableAttributeTypeImpl superior;
 
     /** whether or not this type is single valued */
     private boolean isSingleValued = false;
@@ -197,7 +197,7 @@ public class AttributeType extends Abstr
      *
      * @param oid the OID for this AttributeType
      */
-    public AttributeType( String oid )
+    public MutableAttributeTypeImpl( String oid )
     {
         super( SchemaObjectType.ATTRIBUTE_TYPE, oid );
     }
@@ -208,7 +208,7 @@ public class AttributeType extends Abstr
      */
     private boolean buildSuperior( List<Throwable> errors, Registries registries )
     {
-        AttributeType currentSuperior = null;
+        MutableAttributeTypeImpl currentSuperior = null;
         AttributeTypeRegistry attributeTypeRegistry = registries.getAttributeTypeRegistry();
 
         if ( superiorOid != null )
@@ -274,7 +274,7 @@ public class AttributeType extends Abstr
                 // Check for cycles now
                 Set<String> superiors = new HashSet<String>();
                 superiors.add( oid );
-                AttributeType tmp = currentSuperior;
+                MutableAttributeTypeImpl tmp = currentSuperior;
                 boolean isOk = true;
 
                 while ( tmp != null )
@@ -973,7 +973,7 @@ public class AttributeType extends Abstr
      *
      * @return the superior AttributeType for this AttributeType
      */
-    public AttributeType getSuperior()
+    public MutableAttributeTypeImpl getSuperior()
     {
         return superior;
     }
@@ -1032,7 +1032,7 @@ public class AttributeType extends Abstr
      *
      * @param superior The superior for this AttributeType
      */
-    public void setSuperior( AttributeType superior )
+    public void setSuperior( MutableAttributeTypeImpl superior )
     {
         if ( locked )
         {
@@ -1071,7 +1071,7 @@ public class AttributeType extends Abstr
      *
      * @param newSuperior The superior for this AttributeType
      */
-    public void updateSuperior( AttributeType newSuperior )
+    public void updateSuperior( MutableAttributeTypeImpl newSuperior )
     {
         if ( locked )
         {
@@ -1474,7 +1474,7 @@ public class AttributeType extends Abstr
      * @param descendant the perspective descendant to check
      * @return true if the descendant is truly a derived from this AttributeType
      */
-    public boolean isAncestorOf( AttributeType descendant )
+    public boolean isAncestorOf( MutableAttributeTypeImpl descendant )
     {
         if ( ( descendant == null ) || this.equals( descendant ) )
         {
@@ -1492,7 +1492,7 @@ public class AttributeType extends Abstr
      * @param ancestor the perspective ancestor to check
      * @return true if this AttributeType truly descends from the ancestor
      */
-    public boolean isDescendantOf( AttributeType ancestor )
+    public boolean isDescendantOf( MutableAttributeTypeImpl ancestor )
     {
         if ( ( ancestor == null ) || equals( ancestor ) )
         {
@@ -1512,7 +1512,7 @@ public class AttributeType extends Abstr
      * @return true if the ancestor equals the descendant or if the descendant is really
      * a subtype of the ancestor. otherwise false
      */
-    private boolean isAncestorOrEqual( AttributeType ancestor, AttributeType descendant )
+    private boolean isAncestorOrEqual( MutableAttributeTypeImpl ancestor, MutableAttributeTypeImpl descendant )
     {
         if ( ( ancestor == null ) || ( descendant == null ) )
         {
@@ -1540,9 +1540,9 @@ public class AttributeType extends Abstr
     /**
      * {@inheritDoc}
      */
-    public AttributeType copy()
+    public MutableAttributeTypeImpl copy()
     {
-        AttributeType copy = new AttributeType( oid );
+        MutableAttributeTypeImpl copy = new MutableAttributeTypeImpl( oid );
 
         // Copy the SchemaObject common data
         copy.copy( this );
@@ -1589,7 +1589,7 @@ public class AttributeType extends Abstr
     /**
      * {@inheritDoc}
      */
-    public AttributeType copyMutable()
+    public MutableAttributeTypeImpl copyMutable()
     {
         return copy();
     }
@@ -1622,12 +1622,12 @@ public class AttributeType extends Abstr
             return false;
         }
 
-        if ( !( o instanceof AttributeType ) )
+        if ( !( o instanceof MutableAttributeTypeImpl ) )
         {
             return false;
         }
 
-        AttributeType that = ( AttributeType ) o;
+        MutableAttributeTypeImpl that = ( MutableAttributeTypeImpl ) o;
 
         // The COLLECTIVE
         if ( isCollective != that.isCollective )

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java Sun Mar 20 21:22:39 2011
@@ -108,13 +108,13 @@ public class NameForm extends AbstractMu
     private List<String> mustAttributeTypeOids;
 
     /** The set of required AttributeTypes for this name form */
-    private List<AttributeType> mustAttributeTypes;
+    private List<MutableAttributeTypeImpl> mustAttributeTypes;
 
     /** The set of allowed attribute OIDs for this name form */
     private List<String> mayAttributeTypeOids;
 
     /** The set of allowed AttributeTypes for this name form */
-    private List<AttributeType> mayAttributeTypes;
+    private List<MutableAttributeTypeImpl> mayAttributeTypes;
 
 
     /**
@@ -129,8 +129,8 @@ public class NameForm extends AbstractMu
         mustAttributeTypeOids = new ArrayList<String>();
         mayAttributeTypeOids = new ArrayList<String>();
 
-        mustAttributeTypes = new ArrayList<AttributeType>();
-        mayAttributeTypes = new ArrayList<AttributeType>();
+        mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
+        mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
     }
 
 
@@ -150,7 +150,7 @@ public class NameForm extends AbstractMu
 
             if ( mayAttributeTypeOids != null )
             {
-                mayAttributeTypes = new ArrayList<AttributeType>( mayAttributeTypeOids.size() );
+                mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>( mayAttributeTypeOids.size() );
 
                 for ( String oid : mayAttributeTypeOids )
                 {
@@ -160,7 +160,7 @@ public class NameForm extends AbstractMu
 
             if ( mustAttributeTypeOids != null )
             {
-                mustAttributeTypes = new ArrayList<AttributeType>( mustAttributeTypeOids.size() );
+                mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>( mustAttributeTypeOids.size() );
 
                 for ( String oid : mustAttributeTypeOids )
                 {
@@ -256,7 +256,7 @@ public class NameForm extends AbstractMu
      * 
      * @return the AttributeTypes of the must use attributes
      */
-    public List<AttributeType> getMustAttributeTypes()
+    public List<MutableAttributeTypeImpl> getMustAttributeTypes()
     {
         return Collections.unmodifiableList( mustAttributeTypes );
     }
@@ -286,7 +286,7 @@ public class NameForm extends AbstractMu
      *
      * @param mustAttributeTypes the list of required AttributeTypes
      */
-    public void setMustAttributeTypes( List<AttributeType> mustAttributeTypes )
+    public void setMustAttributeTypes( List<MutableAttributeTypeImpl> mustAttributeTypes )
     {
         if ( locked )
         {
@@ -300,7 +300,7 @@ public class NameForm extends AbstractMu
             // update the OIDS now
             mustAttributeTypeOids.clear();
 
-            for ( AttributeType may : mustAttributeTypes )
+            for ( MutableAttributeTypeImpl may : mustAttributeTypes )
             {
                 mustAttributeTypeOids.add( may.getOid() );
             }
@@ -332,7 +332,7 @@ public class NameForm extends AbstractMu
      *
      * @param attributeType The attributeType
      */
-    public void addMustAttributeTypes( AttributeType attributeType )
+    public void addMustAttributeTypes( MutableAttributeTypeImpl attributeType )
     {
         if ( locked )
         {
@@ -368,7 +368,7 @@ public class NameForm extends AbstractMu
      * 
      * @return the AttributeTypes of the may use attributes
      */
-    public List<AttributeType> getMayAttributeTypes()
+    public List<MutableAttributeTypeImpl> getMayAttributeTypes()
     {
         return Collections.unmodifiableList( mayAttributeTypes );
     }
@@ -398,7 +398,7 @@ public class NameForm extends AbstractMu
      *
      * @param mayAttributeTypes the list of allowed AttributeTypes
      */
-    public void setMayAttributeTypes( List<AttributeType> mayAttributeTypes )
+    public void setMayAttributeTypes( List<MutableAttributeTypeImpl> mayAttributeTypes )
     {
         if ( locked )
         {
@@ -412,7 +412,7 @@ public class NameForm extends AbstractMu
             // update the OIDS now
             mayAttributeTypeOids.clear();
 
-            for ( AttributeType may : mayAttributeTypes )
+            for ( MutableAttributeTypeImpl may : mayAttributeTypes )
             {
                 mayAttributeTypeOids.add( may.getOid() );
             }
@@ -444,7 +444,7 @@ public class NameForm extends AbstractMu
      *
      * @param attributeType The attributeType
      */
-    public void addMayAttributeTypes( AttributeType attributeType )
+    public void addMayAttributeTypes( MutableAttributeTypeImpl attributeType )
     {
         if ( locked )
         {
@@ -496,7 +496,7 @@ public class NameForm extends AbstractMu
         }
 
         // Copy the MAY AttributeTypes (will be empty)
-        copy.mayAttributeTypes = new ArrayList<AttributeType>();
+        copy.mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
 
         // Copy the MUST AttributeTypes OIDs
         copy.mustAttributeTypeOids = new ArrayList<String>();
@@ -507,7 +507,7 @@ public class NameForm extends AbstractMu
         }
 
         // Copy the MUST AttributeTypes ( will be empty )
-        copy.mustAttributeTypes = new ArrayList<AttributeType>();
+        copy.mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
 
         // Copy the Structural ObjectClass OID
         copy.structuralObjectClassOid = structuralObjectClassOid;

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java Sun Mar 20 21:22:39 2011
@@ -92,13 +92,13 @@ public class ObjectClass extends Abstrac
     private List<String> mayAttributeTypeOids;
 
     /** The list of allowed AttributeTypes */
-    private List<AttributeType> mayAttributeTypes;
+    private List<MutableAttributeTypeImpl> mayAttributeTypes;
 
     /** The list of required AttributeType OIDs */
     private List<String> mustAttributeTypeOids;
 
     /** The list of required AttributeTypes */
-    private List<AttributeType> mustAttributeTypes;
+    private List<MutableAttributeTypeImpl> mustAttributeTypes;
 
 
     /**
@@ -113,8 +113,8 @@ public class ObjectClass extends Abstrac
         mustAttributeTypeOids = new ArrayList<String>();
         superiorOids = new ArrayList<String>();
 
-        mayAttributeTypes = new ArrayList<AttributeType>();
-        mustAttributeTypes = new ArrayList<AttributeType>();
+        mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
+        mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
         superiors = new ArrayList<ObjectClass>();
         objectClassType = ObjectClassTypeEnum.STRUCTURAL;
     }
@@ -208,13 +208,13 @@ public class ObjectClass extends Abstrac
 
         if ( mayAttributeTypeOids != null )
         {
-            mayAttributeTypes = new ArrayList<AttributeType>( mayAttributeTypeOids.size() );
+            mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>( mayAttributeTypeOids.size() );
 
             for ( String mayAttributeTypeName : mayAttributeTypeOids )
             {
                 try
                 {
-                    AttributeType attributeType = atRegistry.lookup( mayAttributeTypeName );
+                    MutableAttributeTypeImpl attributeType = atRegistry.lookup( mayAttributeTypeName );
 
                     if ( attributeType.isCollective() )
                     {
@@ -267,13 +267,13 @@ public class ObjectClass extends Abstrac
 
         if ( mustAttributeTypeOids != null )
         {
-            mustAttributeTypes = new ArrayList<AttributeType>( mustAttributeTypeOids.size() );
+            mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>( mustAttributeTypeOids.size() );
 
             for ( String mustAttributeTypeName : mustAttributeTypeOids )
             {
                 try
                 {
-                    AttributeType attributeType = atRegistry.lookup( mustAttributeTypeName );
+                    MutableAttributeTypeImpl attributeType = atRegistry.lookup( mustAttributeTypeName );
 
                     if ( attributeType.isCollective() )
                     {
@@ -363,12 +363,12 @@ public class ObjectClass extends Abstrac
              * OC -> AT (MAY and MUST)
              * OC -> OC (SUPERIORS)
              */
-            for ( AttributeType mayAttributeType : mayAttributeTypes )
+            for ( MutableAttributeTypeImpl mayAttributeType : mayAttributeTypes )
             {
                 registries.addReference( this, mayAttributeType );
             }
 
-            for ( AttributeType mustAttributeType : mustAttributeTypes )
+            for ( MutableAttributeTypeImpl mustAttributeType : mustAttributeTypes )
             {
                 registries.addReference( this, mustAttributeType );
             }
@@ -408,7 +408,7 @@ public class ObjectClass extends Abstrac
              */
             if ( mayAttributeTypes != null )
             {
-                for ( AttributeType may : mayAttributeTypes )
+                for ( MutableAttributeTypeImpl may : mayAttributeTypes )
                 {
                     registries.delReference( this, may );
                 }
@@ -416,7 +416,7 @@ public class ObjectClass extends Abstrac
 
             if ( mustAttributeTypes != null )
             {
-                for ( AttributeType must : mustAttributeTypes )
+                for ( MutableAttributeTypeImpl must : mustAttributeTypes )
                 {
                     registries.delReference( this, must );
                 }
@@ -445,7 +445,7 @@ public class ObjectClass extends Abstrac
     /**
      * @return the mayAttributeTypes
      */
-    public List<AttributeType> getMayAttributeTypes()
+    public List<MutableAttributeTypeImpl> getMayAttributeTypes()
     {
         return mayAttributeTypes;
     }
@@ -478,7 +478,7 @@ public class ObjectClass extends Abstrac
      *
      * @param attributeTypes The attributeTypes
      */
-    public void addMayAttributeTypes( AttributeType... attributeTypes )
+    public void addMayAttributeTypes( MutableAttributeTypeImpl... attributeTypes )
     {
         if ( locked )
         {
@@ -487,7 +487,7 @@ public class ObjectClass extends Abstrac
 
         if ( !isReadOnly )
         {
-            for ( AttributeType attributeType : attributeTypes )
+            for ( MutableAttributeTypeImpl attributeType : attributeTypes )
             {
                 if ( !mayAttributeTypeOids.contains( attributeType.getOid() ) )
                 {
@@ -521,7 +521,7 @@ public class ObjectClass extends Abstrac
      *
      * @param mayAttributeTypes the list of allowed AttributeTypes
      */
-    public void setMayAttributeTypes( List<AttributeType> mayAttributeTypes )
+    public void setMayAttributeTypes( List<MutableAttributeTypeImpl> mayAttributeTypes )
     {
         if ( locked )
         {
@@ -535,7 +535,7 @@ public class ObjectClass extends Abstrac
             // update the OIDS now
             mayAttributeTypeOids.clear();
 
-            for ( AttributeType may : mayAttributeTypes )
+            for ( MutableAttributeTypeImpl may : mayAttributeTypes )
             {
                 mayAttributeTypeOids.add( may.getOid() );
             }
@@ -548,7 +548,7 @@ public class ObjectClass extends Abstrac
      *
      * @param mayAttributeTypes the list of allowed AttributeTypes
      */
-    public void updateMayAttributeTypes( List<AttributeType> mayAttributeTypes )
+    public void updateMayAttributeTypes( List<MutableAttributeTypeImpl> mayAttributeTypes )
     {
         this.mayAttributeTypes.clear();
         this.mayAttributeTypes.addAll( mayAttributeTypes );
@@ -556,7 +556,7 @@ public class ObjectClass extends Abstrac
         // update the OIDS now
         mayAttributeTypeOids.clear();
 
-        for ( AttributeType may : mayAttributeTypes )
+        for ( MutableAttributeTypeImpl may : mayAttributeTypes )
         {
             mayAttributeTypeOids.add( may.getOid() );
         }
@@ -575,7 +575,7 @@ public class ObjectClass extends Abstrac
     /**
      * @return the mustAttributeTypes
      */
-    public List<AttributeType> getMustAttributeTypes()
+    public List<MutableAttributeTypeImpl> getMustAttributeTypes()
     {
         return mustAttributeTypes;
     }
@@ -608,7 +608,7 @@ public class ObjectClass extends Abstrac
      *
      * @param attributeTypes The attributeTypse
      */
-    public void addMustAttributeTypes( AttributeType... attributeTypes )
+    public void addMustAttributeTypes( MutableAttributeTypeImpl... attributeTypes )
     {
         if ( locked )
         {
@@ -617,7 +617,7 @@ public class ObjectClass extends Abstrac
 
         if ( !isReadOnly )
         {
-            for ( AttributeType attributeType : attributeTypes )
+            for ( MutableAttributeTypeImpl attributeType : attributeTypes )
             {
                 if ( !mustAttributeTypeOids.contains( attributeType.getOid() ) )
                 {
@@ -651,7 +651,7 @@ public class ObjectClass extends Abstrac
      *
      * @param mustAttributeTypes the list of required AttributeTypes
      */
-    public void setMustAttributeTypes( List<AttributeType> mustAttributeTypes )
+    public void setMustAttributeTypes( List<MutableAttributeTypeImpl> mustAttributeTypes )
     {
         if ( locked )
         {
@@ -665,7 +665,7 @@ public class ObjectClass extends Abstrac
             // update the OIDS now
             mustAttributeTypeOids.clear();
 
-            for ( AttributeType may : mustAttributeTypes )
+            for ( MutableAttributeTypeImpl may : mustAttributeTypes )
             {
                 mustAttributeTypeOids.add( may.getOid() );
             }
@@ -678,7 +678,7 @@ public class ObjectClass extends Abstrac
      *
      * @param mustAttributeTypes the list of allowed AttributeTypes
      */
-    public void updateMustAttributeTypes( List<AttributeType> mustAttributeTypes )
+    public void updateMustAttributeTypes( List<MutableAttributeTypeImpl> mustAttributeTypes )
     {
         this.mustAttributeTypes.clear();
         this.mustAttributeTypes.addAll( mustAttributeTypes );
@@ -686,7 +686,7 @@ public class ObjectClass extends Abstrac
         // update the OIDS now
         mustAttributeTypeOids.clear();
 
-        for ( AttributeType must : mustAttributeTypes )
+        for ( MutableAttributeTypeImpl must : mustAttributeTypes )
         {
             mustAttributeTypeOids.add( must.getOid() );
         }
@@ -947,7 +947,7 @@ public class ObjectClass extends Abstrac
         }
 
         // Copy the MAY AttributeTypes ( will be empty )
-        copy.mayAttributeTypes = new ArrayList<AttributeType>();
+        copy.mayAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
 
         // Copy the MUST AttributeTypes OIDs
         copy.mustAttributeTypeOids = new ArrayList<String>();
@@ -958,7 +958,7 @@ public class ObjectClass extends Abstrac
         }
 
         // Copy the MUST AttributeTypes ( will be empty )
-        copy.mustAttributeTypes = new ArrayList<AttributeType>();
+        copy.mustAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
 
         return copy;
     }
@@ -1067,7 +1067,7 @@ public class ObjectClass extends Abstrac
         }
 
         // One way
-        for ( AttributeType oid : mayAttributeTypes )
+        for ( MutableAttributeTypeImpl oid : mayAttributeTypes )
         {
             if ( !that.mayAttributeTypes.contains( oid ) )
             {
@@ -1076,7 +1076,7 @@ public class ObjectClass extends Abstrac
         }
 
         // The other way
-        for ( AttributeType oid : that.mayAttributeTypes )
+        for ( MutableAttributeTypeImpl oid : that.mayAttributeTypes )
         {
             if ( !mayAttributeTypes.contains( oid ) )
             {
@@ -1115,7 +1115,7 @@ public class ObjectClass extends Abstrac
         }
 
         // One way
-        for ( AttributeType oid : mustAttributeTypes )
+        for ( MutableAttributeTypeImpl oid : mustAttributeTypes )
         {
             if ( !that.mustAttributeTypes.contains( oid ) )
             {
@@ -1124,7 +1124,7 @@ public class ObjectClass extends Abstrac
         }
 
         // The other way
-        for ( AttributeType oid : that.mustAttributeTypes )
+        for ( MutableAttributeTypeImpl oid : that.mustAttributeTypes )
         {
             if ( !mustAttributeTypes.contains( oid ) )
             {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Sun Mar 20 21:22:39 2011
@@ -439,7 +439,7 @@ public interface SchemaManager
      * @return The found AttributeType 
      * @throws LdapException if the OID is not found in the AttributeType registry
      */
-    AttributeType lookupAttributeTypeRegistry( String oid ) throws LdapException;
+    MutableAttributeTypeImpl lookupAttributeTypeRegistry( String oid ) throws LdapException;
 
 
     /**
@@ -450,7 +450,7 @@ public interface SchemaManager
      * @param oid the OID we are looking for
      * @return The found AttributeType, or null if not found
      */
-    AttributeType getAttributeType( String oid );
+    MutableAttributeTypeImpl getAttributeType( String oid );
 
 
     /**

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java Sun Mar 20 21:22:39 2011
@@ -354,7 +354,7 @@ public final class SchemaUtils
      *            the attributeTypes to list
      * @return a buffer which contains the rendered list
      */
-    public static StringBuffer render( AttributeType[] ats )
+    public static StringBuffer render( MutableAttributeTypeImpl[] ats )
     {
         StringBuffer buf = new StringBuffer();
         return render( buf, ats );
@@ -371,7 +371,7 @@ public final class SchemaUtils
      *            the attributeTypes to list
      * @return a buffer which contains the rendered list
      */
-    public static StringBuffer render( StringBuffer buf, AttributeType[] ats )
+    public static StringBuffer render( StringBuffer buf, MutableAttributeTypeImpl[] ats )
     {
         if ( ats == null || ats.length == 0 )
         {
@@ -573,7 +573,7 @@ public final class SchemaUtils
      * @throws LdapException if there are problems accessing the objects
      * associated with the attribute type.
      */
-    public static StringBuffer render( AttributeType at ) throws LdapException
+    public static StringBuffer render( MutableAttributeTypeImpl at ) throws LdapException
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( at.getOid() );

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 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.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -109,7 +109,7 @@ public class ConcreteNameComponentNormal
      */
     public Object normalizeByName( String name, String value ) throws LdapException
     {
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( name );
         
         if ( attributeType.getSyntax().isHumanReadable() )
         {
@@ -140,7 +140,7 @@ public class ConcreteNameComponentNormal
      */
     public Object normalizeByName( String name, byte[] value ) throws LdapException
     {
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( name );
         
         if ( !attributeType.getSyntax().isHumanReadable() )
         {
@@ -194,7 +194,7 @@ public class ConcreteNameComponentNormal
      */
     private Normalizer lookup( String id ) throws LdapException
     {
-        AttributeType type = schemaManager.lookupAttributeTypeRegistry( id );
+        MutableAttributeTypeImpl type = schemaManager.lookupAttributeTypeRegistry( id );
         MatchingRule mrule = type.getEquality();
         
         if ( mrule == null )

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.text.ParseException;
 
 import org.apache.directory.shared.i18n.I18n;
-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;
 
@@ -83,7 +83,7 @@ public class AttributeTypeDescriptionSch
      * @return the parsed AttributeTypeDescription bean
      * @throws ParseException if there are any recognition errors (bad syntax)
      */
-    public synchronized AttributeType parseAttributeTypeDescription( String attributeTypeDescription )
+    public synchronized MutableAttributeTypeImpl parseAttributeTypeDescription( String attributeTypeDescription )
         throws ParseException
     {
 
@@ -99,7 +99,7 @@ public class AttributeTypeDescriptionSch
 
         try
         {
-            AttributeType attributeType = parser.attributeTypeDescription();
+            MutableAttributeTypeImpl attributeType = parser.attributeTypeDescription();
             
             // Update the schemaName
             updateSchemaName( attributeType );
@@ -135,7 +135,7 @@ public class AttributeTypeDescriptionSch
      * @return An instance of AttributeType
      * @throws ParseException {@inheritDoc}
      */
-    public AttributeType parse( String schemaDescription ) throws ParseException
+    public MutableAttributeTypeImpl parse( String schemaDescription ) throws ParseException
     {
         return parseAttributeTypeDescription( schemaDescription );
     }

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java Sun Mar 20 21:22:39 2011
@@ -33,7 +33,7 @@ import java.util.Map;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.directory.shared.i18n.I18n;
-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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
@@ -54,7 +54,7 @@ public class OpenLdapSchemaParser extend
     private List<Object> schemaDescriptions;
 
     /** The list of attribute type, initialized by splitParsedSchemaDescriptions() */
-    private List<AttributeType> attributeTypes;
+    private List<MutableAttributeTypeImpl> attributeTypes;
 
     /** The list of object classes, initialized by splitParsedSchemaDescriptions()*/
     private List<ObjectClass> objectClasses;
@@ -91,7 +91,7 @@ public class OpenLdapSchemaParser extend
      * 
      * @return the attribute types
      */
-    public List<AttributeType> getAttributeTypes()
+    public List<MutableAttributeTypeImpl> getAttributeTypes()
     {
         return attributeTypes;
     }
@@ -128,7 +128,7 @@ public class OpenLdapSchemaParser extend
     private void afterParse() throws ParseException
     {
         objectClasses = new ArrayList<ObjectClass>();
-        attributeTypes = new ArrayList<AttributeType>();
+        attributeTypes = new ArrayList<MutableAttributeTypeImpl>();
         objectIdentifierMacros = new HashMap<String, OpenLdapObjectIdentifierMacro>();
 
         // split parsed schema descriptions
@@ -139,9 +139,9 @@ public class OpenLdapSchemaParser extend
                 OpenLdapObjectIdentifierMacro oid = (OpenLdapObjectIdentifierMacro) obj;
                 objectIdentifierMacros.put( oid.getName(), oid );
             }
-            else if ( obj instanceof AttributeType )
+            else if ( obj instanceof MutableAttributeTypeImpl )
             {
-                AttributeType attributeType = ( AttributeType ) obj;
+                MutableAttributeTypeImpl attributeType = ( MutableAttributeTypeImpl ) obj;
 
                 attributeTypes.add( attributeType );
             }
@@ -168,7 +168,7 @@ public class OpenLdapSchemaParser extend
             }
 
             // apply object identifier macros to attribute types
-            for ( AttributeType attributeType : attributeTypes )
+            for ( MutableAttributeTypeImpl attributeType : attributeTypes )
             {
                 attributeType.setOid( getResolveOid( attributeType.getOid() ) );
                 attributeType.setSyntaxOid( getResolveOid( attributeType.getSyntaxOid() ) );

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.List;
 
-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.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
@@ -111,7 +111,7 @@ public final class ParserDescriptionUtil
      * @param at1 the second attributeType to compare
      * @return true if both attributeTypes match exactly, false otherwise
      */
-    public static boolean attributeTypesMatch( AttributeType at0, AttributeType at1 )
+    public static boolean attributeTypesMatch( MutableAttributeTypeImpl at0, MutableAttributeTypeImpl at1 )
     {
         // compare all common description parameters
         if ( ! descriptionsMatch( at0, at1 ) )

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistry.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistry.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 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.normalizers.OidNormalizer;
 
 
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface AttributeTypeRegistry extends SchemaObjectRegistry<AttributeType>, Iterable<AttributeType>
+public interface AttributeTypeRegistry extends SchemaObjectRegistry<MutableAttributeTypeImpl>, Iterable<MutableAttributeTypeImpl>
 {
     /**
      * Gets an oid/name to normalizer mapping used to normalize distinguished 
@@ -65,7 +65,7 @@ public interface AttributeTypeRegistry e
      * @throws LdapException if the ancestor attributeType cannot be 
      * discerned from the ancestorId supplied
      */
-    boolean hasDescendants( AttributeType ancestor ) throws LdapException;
+    boolean hasDescendants( MutableAttributeTypeImpl ancestor ) throws LdapException;
 
 
     /**
@@ -78,7 +78,7 @@ public interface AttributeTypeRegistry e
      * @throws LdapException if the ancestor attributeType cannot be 
      * discerned from the ancestorId supplied
      */
-    Iterator<AttributeType> descendants( String ancestorId ) throws LdapException;
+    Iterator<MutableAttributeTypeImpl> descendants( String ancestorId ) throws LdapException;
 
 
     /**
@@ -91,7 +91,7 @@ public interface AttributeTypeRegistry e
      * @throws LdapException if the ancestor attributeType cannot be 
      * discerned from the ancestorId supplied
      */
-    Iterator<AttributeType> descendants( AttributeType ancestor ) throws LdapException;
+    Iterator<MutableAttributeTypeImpl> descendants( MutableAttributeTypeImpl ancestor ) throws LdapException;
 
 
     /**
@@ -101,7 +101,7 @@ public interface AttributeTypeRegistry e
      * @param attributeType The attributeType to register
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException If something went wrong
      */
-    void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException;
+    void registerDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException;
 
 
     /**
@@ -112,19 +112,19 @@ public interface AttributeTypeRegistry e
      * @param ancestor its ancestor 
      * @throws LdapException If something went wrong
      */
-    void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException;
+    void unregisterDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException;
 
 
     /**
      * Add a new Oid/Normalizer couple in the OidNormalizer map
      */
-    void addMappingFor( AttributeType attributeType ) throws LdapException;
+    void addMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException;
 
 
     /**
      * Remove a new Oid/Normalizer couple in the OidNormalizer map
      */
-    void removeMappingFor( AttributeType attributeType ) throws LdapException;
+    void removeMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException;
 
 
     /**

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Set;
 
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException;
-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.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DefaultAttributeTypeRegistry extends DefaultSchemaObjectRegistry<AttributeType> implements
+public class DefaultAttributeTypeRegistry extends DefaultSchemaObjectRegistry<MutableAttributeTypeImpl> implements
     AttributeTypeRegistry
 {
     /** static class logger */
@@ -53,7 +53,7 @@ public class DefaultAttributeTypeRegistr
     private Map<String, OidNormalizer> oidNormalizerMap;
 
     /** maps OIDs to a Set of descendants for that OID */
-    private Map<String, Set<AttributeType>> oidToDescendantSet;
+    private Map<String, Set<MutableAttributeTypeImpl>> oidToDescendantSet;
 
 
     /**
@@ -61,9 +61,9 @@ public class DefaultAttributeTypeRegistr
      */
     public DefaultAttributeTypeRegistry()
     {
-        super( SchemaObjectType.ATTRIBUTE_TYPE, new OidRegistry<AttributeType>() );
+        super( SchemaObjectType.ATTRIBUTE_TYPE, new OidRegistry<MutableAttributeTypeImpl>() );
         oidNormalizerMap = new HashMap<String, OidNormalizer>();
-        oidToDescendantSet = new HashMap<String, Set<AttributeType>>();
+        oidToDescendantSet = new HashMap<String, Set<MutableAttributeTypeImpl>>();
     }
 
 
@@ -84,7 +84,7 @@ public class DefaultAttributeTypeRegistr
         try
         {
             String oid = getOidByName( ancestorId );
-            Set<AttributeType> descendants = oidToDescendantSet.get( oid );
+            Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( oid );
             return ( descendants != null ) && !descendants.isEmpty();
         }
         catch ( LdapException ne )
@@ -97,10 +97,10 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public boolean hasDescendants( AttributeType ancestor ) throws LdapException
+    public boolean hasDescendants( MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         String oid = ancestor.getOid();
-        Set<AttributeType> descendants = oidToDescendantSet.get( oid );
+        Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( oid );
         return ( descendants != null ) && !descendants.isEmpty();
     }
 
@@ -109,12 +109,12 @@ public class DefaultAttributeTypeRegistr
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Iterator<AttributeType> descendants( String ancestorId ) throws LdapException
+    public Iterator<MutableAttributeTypeImpl> descendants( String ancestorId ) throws LdapException
     {
         try
         {
             String oid = getOidByName( ancestorId );
-            Set<AttributeType> descendants = oidToDescendantSet.get( oid );
+            Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( oid );
 
             if ( descendants == null )
             {
@@ -134,10 +134,10 @@ public class DefaultAttributeTypeRegistr
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public Iterator<AttributeType> descendants( AttributeType ancestor ) throws LdapException
+    public Iterator<MutableAttributeTypeImpl> descendants( MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         String oid = ancestor.getOid();
-        Set<AttributeType> descendants = oidToDescendantSet.get( oid );
+        Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( oid );
 
         if ( descendants == null )
         {
@@ -151,7 +151,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void registerDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
         if ( ancestor == null )
@@ -160,12 +160,12 @@ public class DefaultAttributeTypeRegistr
         }
 
         // Get the ancestor's descendant, if any
-        Set<AttributeType> descendants = oidToDescendantSet.get( ancestor.getOid() );
+        Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( ancestor.getOid() );
 
         // Initialize the descendant Set to store the descendants for the attributeType
         if ( descendants == null )
         {
-            descendants = new HashSet<AttributeType>( 1 );
+            descendants = new HashSet<MutableAttributeTypeImpl>( 1 );
             oidToDescendantSet.put( ancestor.getOid(), descendants );
         }
 
@@ -189,7 +189,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void unregisterDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
         if ( ancestor == null )
@@ -198,7 +198,7 @@ public class DefaultAttributeTypeRegistr
         }
 
         // Get the ancestor's descendant, if any
-        Set<AttributeType> descendants = oidToDescendantSet.get( ancestor.getOid() );
+        Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( ancestor.getOid() );
 
         if ( descendants != null )
         {
@@ -227,11 +227,11 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public AttributeType unregister( String numericOid ) throws LdapException
+    public MutableAttributeTypeImpl unregister( String numericOid ) throws LdapException
     {
         try
         {
-            AttributeType removed = super.unregister( numericOid );
+            MutableAttributeTypeImpl removed = super.unregister( numericOid );
 
             removeMappingFor( removed );
 
@@ -255,7 +255,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public void addMappingFor( AttributeType attributeType ) throws LdapException
+    public void addMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         MatchingRule equality = attributeType.getEquality();
         OidNormalizer oidNormalizer;
@@ -285,7 +285,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * Remove the AttributeType normalizer from the OidNormalizer map 
      */
-    public void removeMappingFor( AttributeType attributeType ) throws LdapException
+    public void removeMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         if ( attributeType == null )
         {
@@ -305,7 +305,7 @@ public class DefaultAttributeTypeRegistr
     /**
      * {@inheritDoc}
      */
-    public AttributeType lookup( String oid ) throws LdapException
+    public MutableAttributeTypeImpl lookup( String oid ) throws LdapException
     {
         try
         {
@@ -346,7 +346,7 @@ public class DefaultAttributeTypeRegistr
         // and clear the descendant
         for ( String oid : oidToDescendantSet.keySet() )
         {
-            Set<AttributeType> descendants = oidToDescendantSet.get( oid );
+            Set<MutableAttributeTypeImpl> descendants = oidToDescendantSet.get( oid );
 
             if ( descendants != null )
             {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.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.LdapNoSuchAttributeException;
 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.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
 
@@ -76,7 +76,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public boolean hasDescendants( AttributeType ancestor ) throws LdapException
+    public boolean hasDescendants( MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         return immutableAttributeTypeRegistry.hasDescendants( ancestor );
     }
@@ -85,7 +85,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public Iterator<AttributeType> descendants( String ancestorId ) throws LdapException
+    public Iterator<MutableAttributeTypeImpl> descendants( String ancestorId ) throws LdapException
     {
         return immutableAttributeTypeRegistry.descendants( ancestorId );
     }
@@ -94,7 +94,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public Iterator<AttributeType> descendants( AttributeType ancestor ) throws LdapException
+    public Iterator<MutableAttributeTypeImpl> descendants( MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         return immutableAttributeTypeRegistry.descendants( ancestor );
     }
@@ -103,7 +103,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public void register( AttributeType attributeType ) throws LdapException
+    public void register( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }
@@ -112,7 +112,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public void registerDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void registerDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }
@@ -121,7 +121,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public void unregisterDescendants( AttributeType attributeType, AttributeType ancestor ) throws LdapException
+    public void unregisterDescendants( MutableAttributeTypeImpl attributeType, MutableAttributeTypeImpl ancestor ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }
@@ -130,7 +130,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public AttributeType unregister( String numericOid ) throws LdapException
+    public MutableAttributeTypeImpl unregister( String numericOid ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION,
             "Cannot modify the AttributeTypeRegistry copy" );
@@ -140,7 +140,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public void addMappingFor( AttributeType attributeType ) throws LdapException
+    public void addMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }
@@ -149,7 +149,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public void removeMappingFor( AttributeType attributeType ) throws LdapException
+    public void removeMappingFor( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }
@@ -158,7 +158,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public AttributeType lookup( String oid ) throws LdapException
+    public MutableAttributeTypeImpl lookup( String oid ) throws LdapException
     {
         return immutableAttributeTypeRegistry.lookup( oid );
     }
@@ -194,7 +194,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public Iterator<AttributeType> iterator()
+    public Iterator<MutableAttributeTypeImpl> iterator()
     {
         return immutableAttributeTypeRegistry.iterator();
     }
@@ -273,7 +273,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public AttributeType get( String oid )
+    public MutableAttributeTypeImpl get( String oid )
     {
         return immutableAttributeTypeRegistry.get( oid );
     }
@@ -291,7 +291,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public AttributeType unregister( AttributeType schemaObject ) throws LdapException
+    public MutableAttributeTypeImpl unregister( MutableAttributeTypeImpl schemaObject ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04275 ) );
     }

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.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.exception.LdapSchemaViolationException;
 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.AbstractLdapComparator;
@@ -292,7 +292,7 @@ public class Registries implements Schem
         // AttributeType
         try
         {
-            AttributeType attributeType = attributeTypeRegistry.lookup( name );
+            MutableAttributeTypeImpl attributeType = attributeTypeRegistry.lookup( name );
 
             if ( attributeType != null )
             {
@@ -500,7 +500,7 @@ public class Registries implements Schem
 
         // Step 4 :
         // Check the AttributeTypes
-        for ( AttributeType attributeType : attributeTypeRegistry )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypeRegistry )
         {
             resolve( attributeType, errors );
         }
@@ -534,7 +534,7 @@ public class Registries implements Schem
      * AT -> S
      * AT -> AT
      */
-    public void delCrossReferences( AttributeType attributeType )
+    public void delCrossReferences( MutableAttributeTypeImpl attributeType )
     {
         if ( attributeType.getEquality() != null )
         {
@@ -644,7 +644,7 @@ public class Registries implements Schem
      */
     private void buildAttributeTypeReferences( List<Throwable> errors )
     {
-        for ( AttributeType attributeType : attributeTypeRegistry )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypeRegistry )
         {
             if ( ( getUsing( attributeType ) == null ) || getUsing( attributeType ).isEmpty() )
             {
@@ -1041,12 +1041,12 @@ public class Registries implements Schem
     /**
      * Check AttributeType referential integrity
      */
-    private void resolveRecursive( AttributeType attributeType, Set<String> processed, List<Throwable> errors )
+    private void resolveRecursive( MutableAttributeTypeImpl attributeType, Set<String> processed, List<Throwable> errors )
     {
         // Process the Superior, if any
         String superiorOid = attributeType.getSuperiorOid();
 
-        AttributeType superior = null;
+        MutableAttributeTypeImpl superior = null;
 
         if ( superiorOid != null )
         {
@@ -1174,7 +1174,7 @@ public class Registries implements Schem
      * Check the inheritance, and the existence of MatchingRules and LdapSyntax
      * for an attribute 
      */
-    private void resolve( AttributeType attributeType, List<Throwable> errors )
+    private void resolve( MutableAttributeTypeImpl attributeType, List<Throwable> errors )
     {
         // This set is used to avoid having more than one error
         // for an AttributeType. It's mandatory when processing
@@ -1189,7 +1189,7 @@ public class Registries implements Schem
     }
 
 
-    private List<AttributeType> getMustRecursive( List<AttributeType> musts, Set<ObjectClass> processed,
+    private List<MutableAttributeTypeImpl> getMustRecursive( List<MutableAttributeTypeImpl> musts, Set<ObjectClass> processed,
         ObjectClass objectClass )
     {
         if ( objectClass != null )
@@ -1203,7 +1203,7 @@ public class Registries implements Schem
 
             processed.add( objectClass );
 
-            for ( AttributeType must : objectClass.getMustAttributeTypes() )
+            for ( MutableAttributeTypeImpl must : objectClass.getMustAttributeTypes() )
             {
                 musts.add( must );
             }
@@ -1233,12 +1233,12 @@ public class Registries implements Schem
 
         // Check that the MAY and MUST AT are consistent (no AT in MAY and in MUST
         // in one of its superior
-        List<AttributeType> musts = getMustRecursive( new ArrayList<AttributeType>(), new HashSet<ObjectClass>(),
+        List<MutableAttributeTypeImpl> musts = getMustRecursive( new ArrayList<MutableAttributeTypeImpl>(), new HashSet<ObjectClass>(),
             objectClass );
 
         if ( musts != null )
         {
-            for ( AttributeType may : objectClass.getMayAttributeTypes() )
+            for ( MutableAttributeTypeImpl may : objectClass.getMayAttributeTypes() )
             {
                 if ( musts.contains( may ) )
                 {
@@ -1552,7 +1552,7 @@ public class Registries implements Schem
             switch ( schemaObject.getObjectType() )
             {
                 case ATTRIBUTE_TYPE:
-                    attributeTypeRegistry.register( ( AttributeType ) schemaObject );
+                    attributeTypeRegistry.register( ( MutableAttributeTypeImpl ) schemaObject );
                     break;
 
                 case COMPARATOR:
@@ -1767,7 +1767,7 @@ public class Registries implements Schem
         switch ( schemaObject.getObjectType() )
         {
             case ATTRIBUTE_TYPE:
-                unregistered = attributeTypeRegistry.unregister( ( AttributeType ) schemaObject );
+                unregistered = attributeTypeRegistry.unregister( ( MutableAttributeTypeImpl ) schemaObject );
                 break;
 
             case COMPARATOR:
@@ -2332,7 +2332,7 @@ public class Registries implements Schem
             // Check that each ObjectClass has all the MAY AttributeTypes
             if ( objectClass.getMayAttributeTypes() != null )
             {
-                for ( AttributeType may : objectClass.getMayAttributeTypes() )
+                for ( MutableAttributeTypeImpl may : objectClass.getMayAttributeTypes() )
                 {
                     if ( !attributeTypeRegistry.contains( may.getOid() ) )
                     {
@@ -2352,7 +2352,7 @@ public class Registries implements Schem
             // Check that each ObjectClass has all the MUST AttributeTypes
             if ( objectClass.getMustAttributeTypes() != null )
             {
-                for ( AttributeType must : objectClass.getMustAttributeTypes() )
+                for ( MutableAttributeTypeImpl must : objectClass.getMustAttributeTypes() )
                 {
                     if ( !attributeTypeRegistry.contains( must.getOid() ) )
                     {
@@ -2394,7 +2394,7 @@ public class Registries implements Schem
         // Check the AttributeTypes : check for MatchingRules, Syntaxes
         LOG.debug( "Checking AttributeTypes..." );
 
-        for ( AttributeType attributeType : attributeTypeRegistry )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypeRegistry )
         {
             // Check that each AttributeType has a SYNTAX 
             if ( attributeType.getSyntax() == null )
@@ -2475,7 +2475,7 @@ public class Registries implements Schem
             // Check the SUP
             if ( attributeType.getSuperior() != null )
             {
-                AttributeType superior = attributeType.getSuperior();
+                MutableAttributeTypeImpl superior = attributeType.getSuperior();
 
                 if ( !attributeTypeRegistry.contains( superior.getOid() ) )
                 {
@@ -2524,7 +2524,7 @@ public class Registries implements Schem
         clone.syntaxCheckerRegistry = syntaxCheckerRegistry.copy();
 
         // Store all the SchemaObjects into the globalOid registry
-        for ( AttributeType attributeType : clone.attributeTypeRegistry )
+        for ( MutableAttributeTypeImpl attributeType : clone.attributeTypeRegistry )
         {
             clone.globalOidRegistry.put( attributeType );
         }

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java Sun Mar 20 21:22:39 2011
@@ -35,7 +35,7 @@ import java.io.ObjectOutputStream;
 import java.util.Arrays;
 
 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;
@@ -68,7 +68,7 @@ import com.mycila.junit.concurrent.Concu
 public class BinaryValueAttributeTypeTest
 {
     private MutableLdapSyntaxImpl s;
-    private AttributeType at;
+    private MutableAttributeTypeImpl at;
     private MutableMatchingRuleImpl mr;
     
     private static final byte[] BYTES1 = new byte[]{0x01, 0x02, 0x03, 0x04};
@@ -117,7 +117,7 @@ public class BinaryValueAttributeTypeTes
             }
         });
         
-        at = new AttributeType( "1.1.3.1" );
+        at = new MutableAttributeTypeImpl( "1.1.3.1" );
         at.setEquality( mr );
         at.setOrdering( mr );
         at.setSubstring( mr );
@@ -165,7 +165,7 @@ public class BinaryValueAttributeTypeTes
     /**
      * Deserialize a BinaryValue
      */
-    private BinaryValue deserializeValue( ByteArrayOutputStream out, AttributeType at ) throws IOException, ClassNotFoundException
+    private BinaryValue deserializeValue( ByteArrayOutputStream out, MutableAttributeTypeImpl at ) throws IOException, ClassNotFoundException
     {
         ObjectInputStream oIn = null;
         ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
@@ -215,7 +215,7 @@ public class BinaryValueAttributeTypeTes
         }
         
         // create a AT without any syntax
-        AttributeType attribute = new AttributeType( "1.1.3.1" );
+        MutableAttributeTypeImpl attribute = new MutableAttributeTypeImpl( "1.1.3.1" );
         
         try
         {
@@ -234,7 +234,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testServerBinaryValueNullValue()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, null );
         
@@ -248,7 +248,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testServerBinaryValueEmptyValue()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
         
@@ -262,7 +262,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testServerBinaryValueNoValue()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         byte[] val = new byte[]{0x01};
         BinaryValue bv = new BinaryValue( attribute );
         
@@ -278,7 +278,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testServerBinaryValue()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         byte[] val = new byte[]{0x01};
         BinaryValue value = new BinaryValue( attribute, val );
         
@@ -294,7 +294,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testClone() throws LdapException
     {
-        AttributeType at1 = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getBytesAttributeType();
         BinaryValue bv = new BinaryValue( at1, null );
         BinaryValue bv1 = bv.clone();
         
@@ -323,7 +323,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testEquals()
     {
-        AttributeType at1 = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getBytesAttributeType();
         
         BinaryValue value1 = new BinaryValue( at1, new byte[]{0x01, (byte)0x02} );
         BinaryValue value2 = new BinaryValue( at1, new byte[]{0x01, (byte)0x02} );
@@ -352,7 +352,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testGetNormalizedValue()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValue() );
@@ -370,7 +370,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testGetNormalizedValueCopy()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValue() );
@@ -388,7 +388,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testGetNormalizedValueReference()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValueReference() );
@@ -407,7 +407,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testgetAttributeType()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         BinaryValue sbv = new BinaryValue( attribute );
         
         assertEquals( attribute, sbv.getAttributeType() );
@@ -421,7 +421,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testIsValid()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         
         BinaryValue value = new BinaryValue( attribute, null );
         assertTrue( value.isValid() );
@@ -450,7 +450,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testHashCode()
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         BinaryValue v0 = new BinaryValue( attribute, new byte[]{0x01, 0x02} );
         BinaryValue v1 = new BinaryValue( attribute, new byte[]{(byte)0x81, (byte)0x82} );
         BinaryValue v2 = new BinaryValue( attribute, new byte[]{0x01, 0x02} );
@@ -478,7 +478,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testSame() throws LdapException
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         BinaryValue bv = new BinaryValue( attribute );
 
         bv.normalize();
@@ -504,7 +504,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testInstanceOf() throws LdapException
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         BinaryValue sbv = new BinaryValue( attribute );
         
         assertTrue( sbv.instanceOf( attribute ) );
@@ -521,7 +521,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testNormalize() throws LdapException
     {
-        AttributeType attribute = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getBytesAttributeType();
         BinaryValue bv = new BinaryValue( attribute );
 
         bv.normalize();
@@ -543,7 +543,7 @@ public class BinaryValueAttributeTypeTes
     @Test
     public void testCompareTo()
     {
-        AttributeType at1 = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getBytesAttributeType();
         BinaryValue v0 = new BinaryValue( at1, BYTES1 );
         BinaryValue v1 = new BinaryValue( at1, BYTES2 );
         

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import java.util.HashSet;
 import java.util.List;
 
 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.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
@@ -175,7 +175,7 @@ public class StringValueAttributeTypeTes
     @Test 
     public void testClientStringValueNullValue()
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         
         StringValue value = new StringValue( attribute, null );
         
@@ -189,7 +189,7 @@ public class StringValueAttributeTypeTes
      */
     @Test public void testGetNormalizedValue()
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         
         StringValue sv = new StringValue( attribute, null );
         
@@ -216,7 +216,7 @@ public class StringValueAttributeTypeTes
      */
     @Test public void testIsValid()
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         
         StringValue sv = new StringValue( attribute, null );
         assertTrue( sv.isValid() );
@@ -238,7 +238,7 @@ public class StringValueAttributeTypeTes
     @Test
     public void testNormalize() throws LdapException
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         StringValue sv = new StringValue( attribute );
 
         sv.normalize();
@@ -260,7 +260,7 @@ public class StringValueAttributeTypeTes
     @Test
     public void testInstanceOf() throws LdapException
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         StringValue ssv = new StringValue( attribute );
         
         assertTrue( ssv.instanceOf( attribute ) );
@@ -277,7 +277,7 @@ public class StringValueAttributeTypeTes
     @Test
     public void testgetAttributeType()
     {
-        AttributeType attribute = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl attribute = EntryUtils.getIA5StringAttributeType();
         StringValue ssv = new StringValue( attribute );
         
         assertEquals( attribute, ssv.getAttributeType() );
@@ -289,8 +289,8 @@ public class StringValueAttributeTypeTes
      */
     @Test public void testEquals()
     {
-        AttributeType at1 = EntryUtils.getIA5StringAttributeType();
-        AttributeType at2 = EntryUtils.getBytesAttributeType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at2 = EntryUtils.getBytesAttributeType();
         
         StringValue value1 = new StringValue( at1, "test" );
         StringValue value2 = new StringValue( at1, "test" );
@@ -337,7 +337,7 @@ public class StringValueAttributeTypeTes
         }
         
         // create a AT without any syntax
-        AttributeType attribute = new EntryUtils.AT( "1.1.3.1" );
+        MutableAttributeTypeImpl attribute = new EntryUtils.AT( "1.1.3.1" );
         
         try
         {
@@ -357,7 +357,7 @@ public class StringValueAttributeTypeTes
      */
     @Test public void testHashCode()
     {
-        AttributeType at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
         StringValue v0 = new StringValue( at1, "Alex" );
         StringValue v1 = new StringValue( at1, "ALEX" );
         StringValue v2 = new StringValue( at1, "alex" );
@@ -391,7 +391,7 @@ public class StringValueAttributeTypeTes
     @Test
     public void testCompareTo()
     {
-        AttributeType at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
         StringValue v0 = new StringValue( at1, "Alex" );
         StringValue v1 = new StringValue( at1, "ALEX" );
         
@@ -411,7 +411,7 @@ public class StringValueAttributeTypeTes
     @Test
     public void testClone() throws LdapException
     {
-        AttributeType at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
+        MutableAttributeTypeImpl at1 = EntryUtils.getCaseIgnoringAttributeNoNumbersType();
         StringValue sv = new StringValue( at1, "Test" );
         
         StringValue sv1 = sv.clone();

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java Sun Mar 20 21:22:39 2011
@@ -27,7 +27,7 @@ import java.util.List;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
@@ -77,11 +77,11 @@ public class SchemaUtilsTest
     }
 
 
-    public AttributeType[] getAttributeTypes()
+    public MutableAttributeTypeImpl[] getAttributeTypes()
     {
-        AttributeType[] ats = new AttributeType[5];
+        MutableAttributeTypeImpl[] ats = new MutableAttributeTypeImpl[5];
 
-        ats[0] = new AttributeType( "2.5.4.41" );
+        ats[0] = new MutableAttributeTypeImpl( "2.5.4.41" );
         ats[0].addName( "name" );
         ats[0].setSyntax(  getSyntaxes()[1] );
         ats[0].setSyntaxLength( 32768 );
@@ -89,24 +89,24 @@ public class SchemaUtilsTest
         ats[0].setSubstring( getMatchingRules()[1] );
 
         // ( 2.5.4.3 NAME 'cn' SUP name )
-        ats[1] = new AttributeType( "2.5.4.3" );
+        ats[1] = new MutableAttributeTypeImpl( "2.5.4.3" );
         ats[1].addName( "cn", "commonName" );
 
-        ats[2] = new AttributeType( "2.5.4.41" );
+        ats[2] = new MutableAttributeTypeImpl( "2.5.4.41" );
         ats[2].addName( "name" );
         ats[2].setSyntax( getSyntaxes()[1] );
         ats[2].setSyntaxLength( 32768 );
         ats[2].setEquality( getMatchingRules()[0] );
         ats[2].setSubstring( getMatchingRules()[1] );
 
-        ats[3] = new AttributeType( "2.5.4.41" );
+        ats[3] = new MutableAttributeTypeImpl( "2.5.4.41" );
         ats[3].addName( "name" );
         ats[3].setSyntax( getSyntaxes()[1] );
         ats[3].setSyntaxLength( 32768 );
         ats[3].setEquality( getMatchingRules()[0] );
         ats[3].setSubstring( getMatchingRules()[1] );
 
-        ats[4] = new AttributeType( "2.5.4.41" );
+        ats[4] = new MutableAttributeTypeImpl( "2.5.4.41" );
         ats[4].addName( "name" );
         ats[4].setSyntax( getSyntaxes()[1] );
         ats[4].setSyntaxLength( 32768 );



Mime
View raw message