directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [2/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-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.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.message.ResultCodeEnum;
 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.model.schema.registries.Schema;
 import org.apache.directory.shared.util.Strings;
@@ -79,7 +79,7 @@ public class AttributeTypeSynchronizer e
         // Build the new AttributeType from the given entry
         String schemaName = getSchemaName( dn );
 
-        AttributeType attributeType = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl attributeType = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             schemaName );
 
         // At this point, the constructed AttributeType has not been checked against the 
@@ -118,7 +118,7 @@ public class AttributeTypeSynchronizer e
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
-        AttributeType at = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl at = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -164,7 +164,7 @@ public class AttributeTypeSynchronizer e
         }
         
         // Test that the Oid exists
-        AttributeType attributeType = ( AttributeType ) checkOidExists( entry );
+        MutableAttributeTypeImpl attributeType = ( MutableAttributeTypeImpl ) checkOidExists( entry );
 
         if ( schema.isEnabled() && attributeType.isEnabled() )
         {
@@ -194,7 +194,7 @@ public class AttributeTypeSynchronizer e
     public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
-        AttributeType oldAt = factory
+        MutableAttributeTypeImpl oldAt = factory
             .getAttributeType( schemaManager, entry, schemaManager.getRegistries(), schemaName );
 
         // Inject the new OID
@@ -208,7 +208,7 @@ public class AttributeTypeSynchronizer e
         newDn = newDn.add( newRdn );
         targetEntry.setDn( newDn );
 
-        AttributeType at = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl at = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -238,13 +238,13 @@ public class AttributeTypeSynchronizer e
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
-        AttributeType oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
         Entry targetEntry = ( Entry ) entry.clone();
         String newOid = newRn.getNormValue().getString();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
         checkOidIsUnique( newOid );
-        AttributeType newAt = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl newAt = factory.getAttributeType( schemaManager, targetEntry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( !isSchemaLoaded( oldSchemaName ) )
@@ -289,9 +289,9 @@ public class AttributeTypeSynchronizer e
         checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
-        AttributeType oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl oldAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
-        AttributeType newAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
+        MutableAttributeTypeImpl newAt = factory.getAttributeType( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( !isSchemaLoaded( oldSchemaName ) )

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Sun Mar 20 21:22:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.registries.ObjectClassRegistry;
@@ -97,7 +97,7 @@ public class RegistrySynchronizerAdaptor
     };
 
     private final Registries registries;
-    private final AttributeType objectClassAT;
+    private final MutableAttributeTypeImpl objectClassAT;
     private final RegistrySynchronizer[] registrySynchronizers = new RegistrySynchronizer[11];
     private final Map<String, RegistrySynchronizer> objectClass2synchronizerMap = new HashMap<String, RegistrySynchronizer>();
     private final SchemaSynchronizer schemaSynchronizer;

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Sun Mar 20 21:22:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 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.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.model.schema.registries.Registries;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
@@ -75,13 +75,13 @@ public class SchemaSynchronizer implemen
     private final Registries registries;
 
     /** The m-disable AttributeType */
-    private final AttributeType disabledAT;
+    private final MutableAttributeTypeImpl disabledAT;
 
     /** The CN attributeType */
-    private final AttributeType cnAT;
+    private final MutableAttributeTypeImpl cnAT;
 
     /** The m-dependencies AttributeType */
-    private final AttributeType dependenciesAT;
+    private final MutableAttributeTypeImpl dependenciesAT;
 
     /** A static Dn referencing ou=schema */
     private final Dn ouSchemaDn;

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.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.message.ResultCodeEnum;
 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.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -147,7 +147,7 @@ public class SyntaxSynchronizer extends 
     {
         List<SchemaObject> dependees = new ArrayList<SchemaObject>();
 
-        for ( AttributeType attributeType : schemaManager.getAttributeTypeRegistry() )
+        for ( MutableAttributeTypeImpl attributeType : schemaManager.getAttributeTypeRegistry() )
         {
             if ( oid.equals( attributeType.getSyntax().getOid() ) )
             {

Modified: directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java Sun Mar 20 21:22:39 2011
@@ -67,7 +67,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.UnbindRequest;
 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.util.Strings;
 
@@ -190,7 +190,7 @@ public class MockCoreSession implements 
     {
         Value<?> val = null;
 
-        AttributeType attributeType = directoryService.getSchemaManager().lookupAttributeTypeRegistry( oid );
+        MutableAttributeTypeImpl attributeType = directoryService.getSchemaManager().lookupAttributeTypeRegistry( oid );
 
         // make sure we add the request controls to operation
         if ( attributeType.getSyntax().isHumanReadable() )

Modified: directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.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.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
-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;
@@ -76,15 +76,15 @@ public class SchemaAwareEntryAttributeTe
 {
     private static LdifSchemaLoader loader;
 
-    private static AttributeType atCN;
-    private static AttributeType atDC;
-    private static AttributeType atSN;
+    private static MutableAttributeTypeImpl atCN;
+    private static MutableAttributeTypeImpl atDC;
+    private static MutableAttributeTypeImpl atSN;
 
     // A SINGLE-VALUE attribute
-    private static AttributeType atC;
+    private static MutableAttributeTypeImpl atC;
 
     // A Binary attribute
-    private static AttributeType atPwd;
+    private static MutableAttributeTypeImpl atPwd;
 
     private static final Value<String> NULL_STRING_VALUE = new StringValue( ( String ) null );
     private static final Value<byte[]> NULL_BINARY_VALUE = new BinaryValue( ( byte[] ) null );
@@ -190,7 +190,7 @@ public class SchemaAwareEntryAttributeTe
     /**
      * Deserialize a DefaultEntryAttribute
      */
-    private DefaultEntryAttribute deserializeValue( ByteArrayOutputStream out, AttributeType at ) throws IOException,
+    private DefaultEntryAttribute deserializeValue( ByteArrayOutputStream out, MutableAttributeTypeImpl at ) throws IOException,
         ClassNotFoundException
     {
         ObjectInputStream oIn = null;
@@ -229,7 +229,7 @@ public class SchemaAwareEntryAttributeTe
     @Test
     public void testAddOneValue() throws Exception
     {
-        AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at = TestServerEntryUtils.getIA5StringAttributeType();
 
         DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
 
@@ -279,7 +279,7 @@ public class SchemaAwareEntryAttributeTe
     @Test
     public void testAddTwoValue() throws Exception
     {
-        AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at = TestServerEntryUtils.getIA5StringAttributeType();
 
         DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
 
@@ -314,7 +314,7 @@ public class SchemaAwareEntryAttributeTe
     @Test
     public void testAddNullValue() throws Exception
     {
-        AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at = TestServerEntryUtils.getIA5StringAttributeType();
 
         DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
 
@@ -335,7 +335,7 @@ public class SchemaAwareEntryAttributeTe
     @Test
     public void testGetAttribute() throws Exception
     {
-        AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at = TestServerEntryUtils.getIA5StringAttributeType();
 
         DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
 
@@ -357,7 +357,7 @@ public class SchemaAwareEntryAttributeTe
     @Test
     public void testContains() throws Exception
     {
-        AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
+        MutableAttributeTypeImpl at = TestServerEntryUtils.getIA5StringAttributeType();
 
         DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
 

Modified: directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.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.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException;
 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.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -87,16 +87,16 @@ public class SchemaAwareEntryTest
     private static LdifSchemaLoader loader;
     private static SchemaManager schemaManager;
 
-    private static AttributeType atObjectClass;
-    private static AttributeType atCN;
-    private static AttributeType atDC;
-    private static AttributeType atSN;
-    private static AttributeType atC;
-    private static AttributeType atL;
-    private static AttributeType atOC;
+    private static MutableAttributeTypeImpl atObjectClass;
+    private static MutableAttributeTypeImpl atCN;
+    private static MutableAttributeTypeImpl atDC;
+    private static MutableAttributeTypeImpl atSN;
+    private static MutableAttributeTypeImpl atC;
+    private static MutableAttributeTypeImpl atL;
+    private static MutableAttributeTypeImpl atOC;
 
     // A Binary attribute
-    private static AttributeType atPwd;
+    private static MutableAttributeTypeImpl atPwd;
 
     private static Dn EXAMPLE_DN;
 
@@ -490,7 +490,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.add( ( AttributeType ) null, strValue1 );
+            entry.add( ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -606,7 +606,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.add( "cn", ( AttributeType ) null, strValue1 );
+            entry.add( "cn", ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -657,7 +657,7 @@ public class SchemaAwareEntryTest
         // Test that we can't inject a null AT
         try
         {
-            entry.add( ( AttributeType ) null, "test" );
+            entry.add( ( MutableAttributeTypeImpl ) null, "test" );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -715,8 +715,8 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
-        AttributeType atJpegPhoto = schemaManager.lookupAttributeTypeRegistry( "jpegPhoto" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atJpegPhoto = schemaManager.lookupAttributeTypeRegistry( "jpegPhoto" );
 
         byte[] test1 = Strings.getBytesUtf8("test1");
         byte[] test2 = Strings.getBytesUtf8("test2");
@@ -725,7 +725,7 @@ public class SchemaAwareEntryTest
         // Test that we can't inject a null AT
         try
         {
-            entry.add( ( AttributeType ) null, test1 );
+            entry.add( ( MutableAttributeTypeImpl ) null, test1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -796,7 +796,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] b1 = Strings.getBytesUtf8("test1");
         byte[] b2 = Strings.getBytesUtf8("test2");
@@ -813,7 +813,7 @@ public class SchemaAwareEntryTest
         // Test that we can't inject a null AT
         try
         {
-            entry.add( ( AttributeType ) null, test1 );
+            entry.add( ( MutableAttributeTypeImpl ) null, test1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -966,7 +966,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] test1 = Strings.getBytesUtf8("test1");
         byte[] test2 = Strings.getBytesUtf8("test2");
@@ -1024,7 +1024,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] b1 = Strings.getBytesUtf8("test1");
         byte[] b2 = Strings.getBytesUtf8("test2");
@@ -1186,7 +1186,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] test1 = Strings.getBytesUtf8("test1");
         byte[] test2 = Strings.getBytesUtf8("test2");
@@ -1244,7 +1244,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] b1 = Strings.getBytesUtf8("test1");
         byte[] b2 = Strings.getBytesUtf8("test2");
@@ -1416,7 +1416,7 @@ public class SchemaAwareEntryTest
     {
         Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
-        assertFalse( entry.contains( ( AttributeType ) null, BYTES1 ) );
+        assertFalse( entry.contains( ( MutableAttributeTypeImpl ) null, BYTES1 ) );
         assertFalse( entry.contains( atPwd, BYTES1 ) );
 
         EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
@@ -1439,7 +1439,7 @@ public class SchemaAwareEntryTest
     {
         Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
-        assertFalse( entry.contains( ( AttributeType ) null, "test" ) );
+        assertFalse( entry.contains( ( MutableAttributeTypeImpl ) null, "test" ) );
         assertFalse( entry.contains( atCN, "test" ) );
 
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1727,7 +1727,7 @@ public class SchemaAwareEntryTest
 
         entry.add( attrOC, attrCN, attrSN, attrPWD );
 
-        Set<AttributeType> attributeTypes = entry.getAttributeTypes();
+        Set<MutableAttributeTypeImpl> attributeTypes = entry.getAttributeTypes();
 
         assertEquals( 4, attributeTypes.size() );
         assertTrue( attributeTypes.contains( atOC ) );
@@ -1747,7 +1747,7 @@ public class SchemaAwareEntryTest
         Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
 
         assertNull( entry.get( atCN ) );
-        assertNull( entry.get( ( AttributeType ) null ) );
+        assertNull( entry.get( ( MutableAttributeTypeImpl ) null ) );
 
         EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
         EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
@@ -1947,7 +1947,7 @@ public class SchemaAwareEntryTest
 
         assertTrue( iterator.hasNext() );
 
-        Set<AttributeType> expectedIds = new HashSet<AttributeType>();
+        Set<MutableAttributeTypeImpl> expectedIds = new HashSet<MutableAttributeTypeImpl>();
         expectedIds.add( atOC );
         expectedIds.add( atCN );
         expectedIds.add( atSN );
@@ -1957,7 +1957,7 @@ public class SchemaAwareEntryTest
         {
             EntryAttribute attribute = iterator.next();
 
-            AttributeType attributeType = attribute.getAttributeType();
+            MutableAttributeTypeImpl attributeType = attribute.getAttributeType();
             assertTrue( expectedIds.contains( attributeType ) );
             expectedIds.remove( attributeType );
         }
@@ -1979,7 +1979,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( AttributeType ) null, BYTES1 );
+            entry.put( ( MutableAttributeTypeImpl ) null, BYTES1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2021,7 +2021,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( AttributeType ) null, "test" );
+            entry.put( ( MutableAttributeTypeImpl ) null, "test" );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2069,7 +2069,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( AttributeType ) null, strValue1 );
+            entry.put( ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2160,7 +2160,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( String ) null, ( AttributeType ) null, BYTES1 );
+            entry.put( ( String ) null, ( MutableAttributeTypeImpl ) null, BYTES1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2170,7 +2170,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( " ", ( AttributeType ) null, BYTES1 );
+            entry.put( " ", ( MutableAttributeTypeImpl ) null, BYTES1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2180,7 +2180,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( "badAttr", ( AttributeType ) null, BYTES1 );
+            entry.put( "badAttr", ( MutableAttributeTypeImpl ) null, BYTES1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2235,7 +2235,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( String ) null, ( AttributeType ) null, "test" );
+            entry.put( ( String ) null, ( MutableAttributeTypeImpl ) null, "test" );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2245,7 +2245,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( " ", ( AttributeType ) null, "test" );
+            entry.put( " ", ( MutableAttributeTypeImpl ) null, "test" );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2255,7 +2255,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( "badAttr", ( AttributeType ) null, "test" );
+            entry.put( "badAttr", ( MutableAttributeTypeImpl ) null, "test" );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2316,7 +2316,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( ( String ) null, ( AttributeType ) null, strValue1 );
+            entry.put( ( String ) null, ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2326,7 +2326,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( " ", ( AttributeType ) null, strValue1 );
+            entry.put( " ", ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2336,7 +2336,7 @@ public class SchemaAwareEntryTest
 
         try
         {
-            entry.put( "badAttr", ( AttributeType ) null, strValue1 );
+            entry.put( "badAttr", ( MutableAttributeTypeImpl ) null, strValue1 );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2620,8 +2620,8 @@ public class SchemaAwareEntryTest
 
         // Adding some serverAttributes
         //AttributeType atCo = registries.lookupAttributeTypeRegistry( "countryName" );
-        AttributeType atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
-        AttributeType atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
+        MutableAttributeTypeImpl atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
+        MutableAttributeTypeImpl atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
 
         EntryAttribute sa = new DefaultEntryAttribute( atL, "france" );
         entry.put( sa );
@@ -2660,7 +2660,7 @@ public class SchemaAwareEntryTest
         assertEquals( "testStreet", entry.get( atStreet ).get().getString() );
 
         // test an ObjectClass replacement
-        AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+        MutableAttributeTypeImpl OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
         EntryAttribute oc = new DefaultEntryAttribute( "OBJECTCLASS", OBJECT_CLASS_AT, "person", "inetorgperson" );
         List<EntryAttribute> oldOc = entry.put( oc );
 
@@ -2697,7 +2697,7 @@ public class SchemaAwareEntryTest
         // Check that we can't use invalid arguments
         try
         {
-            entry.put( ( AttributeType ) null, ( String ) null );
+            entry.put( ( MutableAttributeTypeImpl ) null, ( String ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2754,7 +2754,7 @@ public class SchemaAwareEntryTest
         // Check that we can't use invalid arguments
         try
         {
-            entry.put( ( AttributeType ) null, ( byte[] ) null );
+            entry.put( ( MutableAttributeTypeImpl ) null, ( byte[] ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2817,7 +2817,7 @@ public class SchemaAwareEntryTest
         // Check that we can't use invalid arguments
         try
         {
-            entry.put( ( AttributeType ) null, ( Value<?> ) null );
+            entry.put( ( MutableAttributeTypeImpl ) null, ( Value<?> ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -2931,7 +2931,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         // Adding a null value should be possible
         entry.put( "userPassword", ( byte[] ) null );
@@ -2998,7 +2998,7 @@ public class SchemaAwareEntryTest
         // Test that we get an error when the ID or AT are null
         try
         {
-            entry.put( null, ( AttributeType ) null, ( String ) null );
+            entry.put( null, ( MutableAttributeTypeImpl ) null, ( String ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -3014,7 +3014,7 @@ public class SchemaAwareEntryTest
         assertNull( entry.get( atDC ).get().get() );
 
         // Check that we can use a null AttributeType
-        entry.put( "domaincomponent", ( AttributeType ) null, ( String ) null );
+        entry.put( "domaincomponent", ( MutableAttributeTypeImpl ) null, ( String ) null );
         assertEquals( 1, entry.size() );
         assertEquals( "domaincomponent", entry.get( atDC ).getUpId() );
         assertTrue( entry.containsAttribute( "dc" ) );
@@ -3059,12 +3059,12 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         // Test that we get an error when the ID or AT are null
         try
         {
-            entry.put( null, ( AttributeType ) null, ( String ) null );
+            entry.put( null, ( MutableAttributeTypeImpl ) null, ( String ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -3080,7 +3080,7 @@ public class SchemaAwareEntryTest
         assertNull( entry.get( atPassword ).get().get() );
 
         // Check that we can use a null AttributeType
-        entry.put( "userPassword", ( AttributeType ) null, ( byte[] ) null );
+        entry.put( "userPassword", ( MutableAttributeTypeImpl ) null, ( byte[] ) null );
         assertEquals( 1, entry.size() );
         assertEquals( "userPassword", entry.get( atPassword ).getUpId() );
         assertTrue( entry.containsAttribute( "userPassword" ) );
@@ -3137,7 +3137,7 @@ public class SchemaAwareEntryTest
         // Test that we get an error when the ID or AT are null
         try
         {
-            entry.put( null, ( AttributeType ) null, ( Value<?> ) null );
+            entry.put( null, ( MutableAttributeTypeImpl ) null, ( Value<?> ) null );
             fail();
         }
         catch ( IllegalArgumentException iae )
@@ -3153,7 +3153,7 @@ public class SchemaAwareEntryTest
         assertNull( entry.get( atCN ).get().get() );
 
         // Check that we can use a null AttributeType
-        entry.put( "commonName", ( AttributeType ) null, ( Value<?> ) null );
+        entry.put( "commonName", ( MutableAttributeTypeImpl ) null, ( Value<?> ) null );
 
         assertEquals( 1, entry.size() );
         assertEquals( "commonName", entry.get( atCN ).getUpId() );
@@ -3390,7 +3390,7 @@ public class SchemaAwareEntryTest
         assertFalse( entry.containsAttribute( "cn", "sn" ) );
         assertTrue( entry.containsAttribute( "objectclass", "userpassword" ) );
 
-        List<EntryAttribute> removed = entry.removeAttributes( ( AttributeType ) null );
+        List<EntryAttribute> removed = entry.removeAttributes( ( MutableAttributeTypeImpl ) null );
         assertNull( removed );
 
         removed = entry.removeAttributes( atC );
@@ -3541,7 +3541,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
+        MutableAttributeTypeImpl atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
 
         byte[] b1 = Strings.getBytesUtf8("test1");
         byte[] b2 = Strings.getBytesUtf8("test2");
@@ -3571,7 +3571,7 @@ public class SchemaAwareEntryTest
         assertNotNull( entry.get( atCN ) );
         assertNotNull( entry.get( atPassword ) );
 
-        AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+        MutableAttributeTypeImpl OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
 
         entry.removeAttributes( "cN", "UsErPaSsWoRd" );
         assertEquals( 0, entry.size() );
@@ -3604,7 +3604,7 @@ public class SchemaAwareEntryTest
         List<EntryAttribute> result = null;
 
         // First check that this method fails if we pass an empty list of ATs
-        result = entry.set( ( AttributeType ) null );
+        result = entry.set( ( MutableAttributeTypeImpl ) null );
         assertNull( result );
 
         // Now, check what we get when adding one existing AT
@@ -3617,8 +3617,8 @@ public class SchemaAwareEntryTest
         assertEquals( "sn", sa.getAttributeType().getName() );
 
         // Add two AT now
-        AttributeType atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
-        AttributeType atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
+        MutableAttributeTypeImpl atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
+        MutableAttributeTypeImpl atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
         result = entry.set( atL, atC, atGN, atStreet );
 
         assertNull( result );
@@ -3652,14 +3652,14 @@ public class SchemaAwareEntryTest
         assertEquals( "test", entry.get( "sn" ).get().getString() );
 
         // Now add a new SN empty AT : it should replace the existing one.
-        AttributeType atSNEmpty = schemaManager.lookupAttributeTypeRegistry( "sn" );
+        MutableAttributeTypeImpl atSNEmpty = schemaManager.lookupAttributeTypeRegistry( "sn" );
         sa = entry.set( atSNEmpty ).get( 0 );
         assertEquals( "test", sa.get().getString() );
         assertNotNull( entry.get( "sn" ) );
         assertNull( entry.get( "sn" ).get() );
 
         // Last, not least, put an ObjectClass AT
-        AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+        MutableAttributeTypeImpl OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
 
         entry.set( OBJECT_CLASS_AT );
 
@@ -3710,8 +3710,8 @@ public class SchemaAwareEntryTest
         assertEquals( "sn", sa.getId() );
 
         // Add different upIds now
-        AttributeType atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
-        AttributeType atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
+        MutableAttributeTypeImpl atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
+        MutableAttributeTypeImpl atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
 
         entry.set( "L" );
         entry.set( "CountryName" );
@@ -3751,7 +3751,7 @@ public class SchemaAwareEntryTest
         assertEquals( "test", entry.get( "sn" ).get().getString() );
 
         // Now add a new SN empty AT : it should replace the existing one.
-        AttributeType atSNEmpty = schemaManager.lookupAttributeTypeRegistry( "sn" );
+        MutableAttributeTypeImpl atSNEmpty = schemaManager.lookupAttributeTypeRegistry( "sn" );
         sa = entry.set( atSNEmpty ).get( 0 );
         assertEquals( "test", sa.get().getString() );
         assertNotNull( entry.get( "sn" ) );
@@ -3863,7 +3863,7 @@ public class SchemaAwareEntryTest
         Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
-        AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+        MutableAttributeTypeImpl OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
 
         entry.put( "objectClass", OBJECT_CLASS_AT, "top", "person", "inetOrgPerson", "organizationalPerson" );
         entry.put( "cn", schemaManager.lookupAttributeTypeRegistry( "cn" ), "test" );

Modified: directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Sun Mar 20 21:22:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 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.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -65,10 +65,10 @@ public class SchemaAwareModificationTest
 {
     private static LdifSchemaLoader loader;
     private static SchemaManager schemaManager;
-    private static AttributeType atCN;
+    private static MutableAttributeTypeImpl atCN;
 
     // A SINGLE-VALUE attribute
-    private static AttributeType atC;
+    private static MutableAttributeTypeImpl atC;
 
 
     /**

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.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.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -89,7 +89,7 @@ public class PasswordHashingInterceptorT
         byte[] plainPwd = "newsecret".getBytes();
         Dn dn = new Dn( "cn=test,ou=system" );
 
-        AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+        MutableAttributeTypeImpl pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
         EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( plainPwd );
@@ -139,7 +139,7 @@ public class PasswordHashingInterceptorT
 
         Dn dn = new Dn( "cn=test,ou=system" );
 
-        AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+        MutableAttributeTypeImpl pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
         EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( hashedPwd );

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Sun Mar 20 21:22:39 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 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.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1812,7 +1812,7 @@ public class SearchIT extends AbstractLd
         throws Exception
     {
         Value<String> val = new StringValue( filterCsnVal );
-        AttributeType entryCsnAt = getService().getSchemaManager().getAttributeType( SchemaConstants.ENTRY_CSN_AT );
+        MutableAttributeTypeImpl entryCsnAt = getService().getSchemaManager().getAttributeType( SchemaConstants.ENTRY_CSN_AT );
         ExprNode filter = null;
 
         if ( useCaseNum == 1 )

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.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.ldif.LdifUtils;
 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.util.JndiUtils;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -337,7 +337,7 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        AttributeType at = getService().getSchemaManager().lookupAttributeTypeRegistry( OID );
+        MutableAttributeTypeImpl at = getService().getSchemaManager().lookupAttributeTypeRegistry( OID );
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
@@ -369,7 +369,7 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        AttributeType at = getService().getSchemaManager().lookupAttributeTypeRegistry( OID );
+        MutableAttributeTypeImpl at = getService().getSchemaManager().lookupAttributeTypeRegistry( OID );
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Sun Mar 20 21:22:39 2011
@@ -47,7 +47,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.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.parsers.AttributeTypeDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Test;
@@ -212,7 +212,7 @@ public class SchemaPersistenceIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "attributeTypes" );
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sun Mar 20 21:22:39 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 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.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -1114,7 +1114,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "attributeTypes" );
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
@@ -1404,7 +1404,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "attributeTypes" );
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
@@ -1426,7 +1426,7 @@ public class SubschemaSubentryIT extends
 
         Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, getService().getSchemaManager() );
 
-        AttributeType at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
+        MutableAttributeTypeImpl at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
             .getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
         assertEquals( "name", at.getSuperiorOid() );
@@ -1459,7 +1459,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "attributeTypes" );
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
@@ -1489,7 +1489,7 @@ public class SubschemaSubentryIT extends
 
         Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, getService().getSchemaManager() );
 
-        AttributeType at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
+        MutableAttributeTypeImpl at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
             .getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
         assertEquals( "name", at.getSuperiorOid() );
@@ -1522,7 +1522,7 @@ public class SubschemaSubentryIT extends
         // Get back the list of attributes, and find the one we just added
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "attributeTypes" );
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
@@ -1553,7 +1553,7 @@ public class SubschemaSubentryIT extends
 
         Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, getService().getSchemaManager() );
 
-        AttributeType at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
+        MutableAttributeTypeImpl at = factory.getAttributeType( getService().getSchemaManager(), serverEntry, getService()
             .getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
         assertEquals( "name", at.getSuperiorOid() );

Modified: directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Sun Mar 20 21:22:39 2011
@@ -35,7 +35,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.exception.LdapInvalidAttributeValueException;
-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;
 
 
@@ -197,7 +197,7 @@ class JavaLdapSupport
 
         // Add all the class names this object can be cast to:
         Class<?>[] classes = obj.getClass().getClasses();
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
         EntryAttribute javaClassNames = new DefaultEntryAttribute( attributeType, JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )

Modified: directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Mar 20 21:22:39 2011
@@ -121,7 +121,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.SchemaManager;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.apache.directory.shared.util.Strings;
@@ -147,7 +147,7 @@ public abstract class ServerContext impl
     protected SchemaManager schemaManager;
 
     /** A reference to the ObjectClass AT */
-    protected AttributeType OBJECT_CLASS_AT;
+    protected MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
     /** The cloned environment used by this Context */
     private final Hashtable<String, Object> env;

Modified: directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/akarasulu/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Sun Mar 20 21:22:39 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -190,7 +190,7 @@ public class ServerLdapContext extends S
     {
         Value<?> val = null;
 
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         try
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Sun Mar 20 21:22:39 2011
@@ -67,7 +67,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.UnbindRequest;
 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.util.Strings;
 
@@ -198,7 +198,7 @@ public class DefaultCoreSession implemen
     {
         Value<?> val = null;
 
-        AttributeType attributeType = directoryService.getSchemaManager().lookupAttributeTypeRegistry( oid );
+        MutableAttributeTypeImpl attributeType = directoryService.getSchemaManager().lookupAttributeTypeRegistry( oid );
 
         // make sure we add the request controls to operation
         if ( attributeType.getSyntax().isHumanReadable() )

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Mar 20 21:22:39 2011
@@ -100,7 +100,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.ldif.LdifReader;
 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.util.tree.DnNode;
 import org.apache.directory.shared.util.DateUtils;
@@ -270,7 +270,7 @@ public class DefaultDirectoryService imp
     private PpolicyConfigContainer pwdPolicyContainer;
 
     /** the pwdPolicySubentry AT */
-    private AttributeType pwdPolicySubentryAT;
+    private MutableAttributeTypeImpl pwdPolicySubentryAT;
 
     /** The Dn factory */
     private DnFactory dnFactory;

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.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.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.util.tree.DnNode;
 
 
@@ -58,7 +58,7 @@ public class ReferralManagerImpl impleme
     private ReentrantReadWriteLock mutex = new ReentrantReadWriteLock();
 
     /** 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/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sun Mar 20 21:22:39 2011
@@ -104,7 +104,7 @@ import org.apache.directory.shared.ldap.
 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.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.DateUtils;
 import org.apache.directory.shared.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
@@ -137,19 +137,19 @@ public class AuthenticationInterceptor e
     private Set<Dn> pwdResetSet = new HashSet<Dn>();
 
     // pwdpolicy state attribute types
-    private AttributeType AT_PWD_RESET;
+    private MutableAttributeTypeImpl AT_PWD_RESET;
 
-    private AttributeType AT_PWD_CHANGED_TIME;
+    private MutableAttributeTypeImpl AT_PWD_CHANGED_TIME;
 
-    private AttributeType AT_PWD_HISTORY;
+    private MutableAttributeTypeImpl AT_PWD_HISTORY;
 
-    private AttributeType AT_PWD_FAILURE_TIME;
+    private MutableAttributeTypeImpl AT_PWD_FAILURE_TIME;
 
-    private AttributeType AT_PWD_ACCOUNT_LOCKED_TIME;
+    private MutableAttributeTypeImpl AT_PWD_ACCOUNT_LOCKED_TIME;
 
-    private AttributeType AT_PWD_LAST_SUCCESS;
+    private MutableAttributeTypeImpl AT_PWD_LAST_SUCCESS;
 
-    private AttributeType AT_PWD_GRACE_USE_TIME;
+    private MutableAttributeTypeImpl AT_PWD_GRACE_USE_TIME;
 
 
     /**

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sun Mar 20 21:22:39 2011
@@ -82,7 +82,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 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.normalizers.ConcreteNameComponentNormalizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1280,7 +1280,7 @@ public class AciAuthorizationInterceptor
 
         engine.checkPermission( aciContext );
 
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
 
         aciContext = new AciContext( schemaManager, compareContext );
         aciContext.setUserGroupNames( userGroups );
@@ -1341,9 +1341,9 @@ public class AciAuthorizationInterceptor
          * not allowed are removed from the attribute.  If the attribute has no more
          * values remaining then the entire attribute is removed.
          */
-        List<AttributeType> attributeToRemove = new ArrayList<AttributeType>();
+        List<MutableAttributeTypeImpl> attributeToRemove = new ArrayList<MutableAttributeTypeImpl>();
 
-        for ( AttributeType attributeType : clonedEntry.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl attributeType : clonedEntry.getAttributeTypes() )
         {
             // if attribute type scope access is not allowed then remove the attribute and continue
             EntryAttribute attr = clonedEntry.get( attributeType );
@@ -1398,7 +1398,7 @@ public class AciAuthorizationInterceptor
             }
         }
 
-        for ( AttributeType attributeType : attributeToRemove )
+        for ( MutableAttributeTypeImpl attributeType : attributeToRemove )
         {
             clonedEntry.removeAttributes( attributeType );
         }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.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.filter.OrNode;
 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.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,13 +74,13 @@ public class GroupCache
     private final PartitionNexus nexus;
 
     /** A storage for the ObjectClass attributeType */
-    private AttributeType OBJECT_CLASS_AT;
+    private MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
     /** A storage for the member attributeType */
-    private AttributeType MEMBER_AT;
+    private MutableAttributeTypeImpl MEMBER_AT;
 
     /** A storage for the uniqueMember attributeType */
-    private AttributeType UNIQUE_MEMBER_AT;
+    private MutableAttributeTypeImpl UNIQUE_MEMBER_AT;
 
     /**
      * the schema manager

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Sun Mar 20 21:22:39 2011
@@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap.
 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.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.slf4j.Logger;
@@ -86,10 +86,10 @@ public class TupleCache
     private final ACIItemParser aciParser;
 
     /** A storage for the PrescriptiveACI attributeType */
-    private AttributeType PRESCRIPTIVE_ACI_AT;
+    private MutableAttributeTypeImpl PRESCRIPTIVE_ACI_AT;
 
     /** A storage for the ObjectClass attributeType */
-    private static AttributeType OBJECT_CLASS_AT;
+    private static MutableAttributeTypeImpl OBJECT_CLASS_AT;
 
 
     /**

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/AciContext.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.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
 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;
 
 /**
@@ -58,7 +58,7 @@ public class AciContext
     private Dn entryDn;
     
     /** The AttributeType */
-    private AttributeType attributeType;
+    private MutableAttributeTypeImpl attributeType;
     
     /** The attribute's values */
     private Value<?> attrValue;
@@ -187,7 +187,7 @@ public class AciContext
     /**
      * @return the attributeType
      */
-    public AttributeType getAttributeType()
+    public MutableAttributeTypeImpl getAttributeType()
     {
         return attributeType;
     }
@@ -195,7 +195,7 @@ public class AciContext
     /**
      * @param attributeType the attributeType to set
      */
-    public void setAttributeType( AttributeType attributeType )
+    public void setAttributeType( MutableAttributeTypeImpl attributeType )
     {
         this.attributeType = attributeType;
     }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.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.filter.PresenceNode;
 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.SchemaManager;
 
 
@@ -70,7 +70,7 @@ public class MaxImmSubFilter implements 
 
     public MaxImmSubFilter( SchemaManager schemaManager )
     {
-        AttributeType objectClassAt = null;
+        MutableAttributeTypeImpl objectClassAt = null;
 
         try
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.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.Entry;
 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.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 
 
 /**
@@ -83,7 +83,7 @@ public class MaxValueCountFilter impleme
     }
 
 
-    private boolean isRemovable( MaxValueCountItem mvc, AttributeType attributeType, Entry entryView ) throws LdapException
+    private boolean isRemovable( MaxValueCountItem mvc, MutableAttributeTypeImpl attributeType, Entry entryView ) throws LdapException
     {
         for ( Iterator<MaxValueCountElem> k = mvc.iterator(); k.hasNext(); )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.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.entry.Value;
 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.SchemaManager;
 
 
@@ -91,7 +91,7 @@ public class RelatedProtectedItemFilter 
     }
 
 
-    private boolean isRelated( ACITuple tuple, OperationScope scope, Dn userName, Dn entryName, AttributeType attributeType,
+    private boolean isRelated( ACITuple tuple, OperationScope scope, Dn userName, Dn entryName, MutableAttributeTypeImpl attributeType,
                                Value<?> attrValue, Entry entry ) throws LdapException, InternalError
     {
         String oid = null;
@@ -139,9 +139,9 @@ public class RelatedProtectedItemFilter 
 
                 AllAttributeValuesItem aav = ( AllAttributeValuesItem ) item;
 
-                for ( Iterator<AttributeType> iterator = aav.iterator(); iterator.hasNext(); )
+                for ( Iterator<MutableAttributeTypeImpl> iterator = aav.iterator(); iterator.hasNext(); )
                 {
-                    AttributeType attr = iterator.next();
+                    MutableAttributeTypeImpl attr = iterator.next();
                     
                     if ( oid.equals( attr.getOid() ) )
                     {
@@ -158,9 +158,9 @@ public class RelatedProtectedItemFilter 
 
                 AttributeTypeItem at = ( AttributeTypeItem ) item;
                 
-                for ( Iterator<AttributeType> iterator = at.iterator(); iterator.hasNext(); )
+                for ( Iterator<MutableAttributeTypeImpl> iterator = at.iterator(); iterator.hasNext(); )
                 {
-                    AttributeType attr = iterator.next();
+                    MutableAttributeTypeImpl attr = iterator.next();
                     
                     if ( oid.equals( attr.getOid() ) )
                     {
@@ -181,7 +181,7 @@ public class RelatedProtectedItemFilter 
                 {
                     EntryAttribute entryAttribute = j.next();
                     
-                    AttributeType attr =  entryAttribute.getAttributeType();
+                    MutableAttributeTypeImpl attr =  entryAttribute.getAttributeType();
                     String attrOid = null;
                     
                     if ( attr != null )
@@ -270,9 +270,9 @@ public class RelatedProtectedItemFilter 
 
                 SelfValueItem sv = ( SelfValueItem ) item;
                 
-                for ( Iterator<AttributeType> iterator = sv.iterator(); iterator.hasNext(); )
+                for ( Iterator<MutableAttributeTypeImpl> iterator = sv.iterator(); iterator.hasNext(); )
                 {
-                    AttributeType attr = iterator.next();
+                    MutableAttributeTypeImpl attr = iterator.next();
                     
                     if ( oid.equals( attr.getOid() ) )
                     {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 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.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 
 
 /**
@@ -73,7 +73,7 @@ public class RestrictedByFilter implemen
     }
 
 
-    public boolean isRemovable( ACITuple tuple, AttributeType attributeType, Value<?> attrValue, Entry entry ) throws LdapException
+    public boolean isRemovable( ACITuple tuple, MutableAttributeTypeImpl attributeType, Value<?> attrValue, Entry entry ) throws LdapException
     {
         for ( ProtectedItem item : tuple.getProtectedItems() )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sun Mar 20 21:22:39 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.ldif.LdifRevertor;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl;
 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;
 
@@ -64,7 +64,7 @@ public class ChangeLogInterceptor extend
     private static final Logger LOG = LoggerFactory.getLogger( ChangeLogInterceptor.class );
     
     /** used to ignore modify operations to tombstone entries */
-    private AttributeType entryDeleted;
+    private MutableAttributeTypeImpl entryDeleted;
     
     /** the changelog service to log changes to */
     private ChangeLog changeLog;
@@ -119,9 +119,9 @@ public class ChangeLogInterceptor extend
         forward.setChangeType( ChangeType.Add );
         forward.setDn( addContext.getDn() );
 
-        Set<AttributeType> list = addEntry.getAttributeTypes();
+        Set<MutableAttributeTypeImpl> list = addEntry.getAttributeTypes();
         
-        for ( AttributeType attributeType:list )
+        for ( MutableAttributeTypeImpl attributeType:list )
         {
             forward.addAttribute( addEntry.get( attributeType).clone() );
         }
@@ -170,7 +170,7 @@ public class ChangeLogInterceptor extend
         for ( EntryAttribute attribute : serverEntry )
         {
             // filter collective attributes, they can't be added by the revert operation
-            AttributeType at = schemaService.getSchemaManager().getAttributeTypeRegistry().lookup( attribute.getId() );
+            MutableAttributeTypeImpl at = schemaService.getSchemaManager().getAttributeTypeRegistry().lookup( attribute.getId() );
             
             if ( !at.isCollective() || isCollectiveSubentry )
             {



Mime
View raw message