directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [8/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/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.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/parsers/OpenLdapSchemaParserTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java Sun Mar 20 21:22:39 2011
@@ -32,7 +32,7 @@ import java.util.Map;
 
 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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.parsers.ConsoleParserMonitor;
@@ -78,9 +78,9 @@ public class OpenLdapSchemaParserTest
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )";
 
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
-        Map<String, AttributeType> mapAttributeTypes = mapAttributeTypes( attributeTypes );
-        AttributeType attributeType = mapAttributeTypes.get( "2.5.4.14" );
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> mapAttributeTypes = mapAttributeTypes( attributeTypes );
+        MutableAttributeTypeImpl attributeType = mapAttributeTypes.get( "2.5.4.14" );
 
         assertNotNull( attributeType );
         assertEquals( "2.5.4.14", attributeType.getOid() );
@@ -90,11 +90,11 @@ public class OpenLdapSchemaParserTest
     }
 
 
-    private Map<String, AttributeType> mapAttributeTypes( List<AttributeType> attributeTypes )
+    private Map<String, MutableAttributeTypeImpl> mapAttributeTypes( List<MutableAttributeTypeImpl> attributeTypes )
     {
-        Map<String, AttributeType> m = new HashMap<String, AttributeType>();
+        Map<String, MutableAttributeTypeImpl> m = new HashMap<String, MutableAttributeTypeImpl>();
 
-        for ( AttributeType attributeType : attributeTypes )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypes )
         {
             m.put( attributeType.getOid(), attributeType );
         }
@@ -112,9 +112,9 @@ public class OpenLdapSchemaParserTest
             + "        EQUALITY caseIgnoreMatch\n"
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypeList = parser.getAttributeTypes();
-        Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
-        AttributeType type = attributeTypes.get( "2.5.4.2" );
+        List<MutableAttributeTypeImpl> attributeTypeList = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> attributeTypes = mapAttributeTypes( attributeTypeList );
+        MutableAttributeTypeImpl type = attributeTypes.get( "2.5.4.2" );
 
         assertNotNull( type );
         assertEquals( "2.5.4.2", type.getOid() );
@@ -134,9 +134,9 @@ public class OpenLdapSchemaParserTest
             + "        EQUALITY caseIgnoreMatch\n"
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypeList = parser.getAttributeTypes();
-        Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
-        AttributeType type = attributeTypes.get( "2.5.4.2" );
+        List<MutableAttributeTypeImpl> attributeTypeList = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> attributeTypes = mapAttributeTypes( attributeTypeList );
+        MutableAttributeTypeImpl type = attributeTypes.get( "2.5.4.2" );
 
         assertNotNull( type );
         assertEquals( "2.5.4.2", type.getOid() );
@@ -160,9 +160,9 @@ public class OpenLdapSchemaParserTest
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
 
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypeList = parser.getAttributeTypes();
-        Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
-        AttributeType type = attributeTypes.get( "2.5.4.2" );
+        List<MutableAttributeTypeImpl> attributeTypeList = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> attributeTypes = mapAttributeTypes( attributeTypeList );
+        MutableAttributeTypeImpl type = attributeTypes.get( "2.5.4.2" );
 
         assertNotNull( type );
         assertEquals( "2.5.4.2", type.getOid() );
@@ -182,9 +182,9 @@ public class OpenLdapSchemaParserTest
             + "        EQUALITY caseIgnoreMatch\n"
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )";
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypeList = parser.getAttributeTypes();
-        Map<String, AttributeType> attributeTypes = mapAttributeTypes( attributeTypeList );
-        AttributeType type = attributeTypes.get( "2.5.4.2" );
+        List<MutableAttributeTypeImpl> attributeTypeList = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> attributeTypes = mapAttributeTypes( attributeTypeList );
+        MutableAttributeTypeImpl type = attributeTypes.get( "2.5.4.2" );
 
         assertNotNull( type );
         assertEquals( "2.5.4.2", type.getOid() );
@@ -332,7 +332,7 @@ public class OpenLdapSchemaParserTest
         InputStream input = getClass().getResourceAsStream( "core.schema" );
         parser.parse( input );
 
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
         List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
         Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
 
@@ -348,7 +348,7 @@ public class OpenLdapSchemaParserTest
         InputStream input = getClass().getResourceAsStream( "inetorgperson.schema" );
         parser.parse( input );
 
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
         List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
         Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
 
@@ -364,14 +364,14 @@ public class OpenLdapSchemaParserTest
         InputStream input = getClass().getResourceAsStream( "collective.schema" );
         parser.parse( input );
 
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
         List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
         Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
 
         assertEquals( 13, attributeTypes.size() );
         assertEquals( 0, objectClassTypes.size() );
         assertEquals( 0, objectIdentifierMacros.size() );
-        for ( AttributeType attributeTypeLiteral : attributeTypes )
+        for ( MutableAttributeTypeImpl attributeTypeLiteral : attributeTypes )
         {
             assertTrue( attributeTypeLiteral.isCollective() );
         }
@@ -384,7 +384,7 @@ public class OpenLdapSchemaParserTest
         InputStream input = getClass().getResourceAsStream( "dyngroup.schema" );
         parser.parse( input );
 
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
         List<ObjectClass> objectClassTypes = parser.getObjectClassTypes();
         Map<String, OpenLdapObjectIdentifierMacro> objectIdentifierMacros = parser.getObjectIdentifierMacros();
 
@@ -418,7 +418,7 @@ public class OpenLdapSchemaParserTest
             }
         }
         
-        for ( AttributeType attributeType : attributeTypes )
+        for ( MutableAttributeTypeImpl attributeType : attributeTypes )
         {
             List<String> asList = attributeType.getNames();
             
@@ -446,9 +446,9 @@ public class OpenLdapSchemaParserTest
             + "        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)";
 
         parser.parse( attributeTypeData );
-        List<AttributeType> attributeTypes = parser.getAttributeTypes();
-        Map<String, AttributeType> mapAttributeTypes = mapAttributeTypes( attributeTypes );
-        AttributeType attributeType = mapAttributeTypes.get( "1.3.6.1.4.1.8104.1.1.37" );
+        List<MutableAttributeTypeImpl> attributeTypes = parser.getAttributeTypes();
+        Map<String, MutableAttributeTypeImpl> mapAttributeTypes = mapAttributeTypes( attributeTypes );
+        MutableAttributeTypeImpl attributeType = mapAttributeTypes.get( "1.3.6.1.4.1.8104.1.1.37" );
 
         assertNotNull( attributeType );
         assertEquals( "1.3.6.1.4.1.8104.1.1.37", attributeType.getOid() );

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.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/registries/AttributeTypeRegistryTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java Sun Mar 20 21:22:39 2011
@@ -27,7 +27,7 @@ import static org.junit.Assert.fail;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 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.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultAttributeTypeRegistry;
 import org.junit.Before;
@@ -56,7 +56,7 @@ public class AttributeTypeRegistryTest
     @Test
     public void testUnregister() throws LdapException
     {
-        AttributeType at0 = new AttributeType( "1.1" );
+        MutableAttributeTypeImpl at0 = new MutableAttributeTypeImpl( "1.1" );
         at0.addName( "t", "test", "Test", "T" );
         atRegistry.register( at0 );
         
@@ -81,7 +81,7 @@ public class AttributeTypeRegistryTest
     @Test
     public void testRegister() throws LdapException
     {
-        AttributeType at0 = new AttributeType( "1.1" );
+        MutableAttributeTypeImpl at0 = new MutableAttributeTypeImpl( "1.1" );
         at0.addName( "t", "test", "Test", "T" );
         atRegistry.register( at0 );
         

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.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/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import java.text.ParseException;
 
 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.UsageEnum;
 import org.apache.directory.shared.ldap.model.schema.parsers.ConsoleParserMonitor;
 import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -125,7 +125,7 @@ public class AttributeTypeDescriptionSch
     public void testSuperType() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // no SUP
         value = "( 1.1 SYNTAX 1.1 )";
@@ -212,7 +212,7 @@ public class AttributeTypeDescriptionSch
     public void testEquality() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // no EQUALITY
         value = "( 1.1 SYNTAX 1.1 )";
@@ -258,7 +258,7 @@ public class AttributeTypeDescriptionSch
     public void testOrdering() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // no ORDERING
         value = "( 1.1 SYNTAX 1.1 )";
@@ -304,7 +304,7 @@ public class AttributeTypeDescriptionSch
     public void testSubstring() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // no SUBSTR
         value = "( 1.1 SYNTAX 1.1 )";
@@ -349,7 +349,7 @@ public class AttributeTypeDescriptionSch
     public void testSyntax() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // no SYNTAX
         value = "( 1.1 SUP 1.1 )";
@@ -476,7 +476,7 @@ public class AttributeTypeDescriptionSch
     public void testSingleValue() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // not single-value
         value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
@@ -516,7 +516,7 @@ public class AttributeTypeDescriptionSch
     public void testCollective() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // not collective
         value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
@@ -556,7 +556,7 @@ public class AttributeTypeDescriptionSch
     public void testNoUserModification() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // not NO-USER-MODIFICATION
         value = "( 1.1 SYNTAX 1.1 NAME 'test' DESC 'Descripton' )";
@@ -596,7 +596,7 @@ public class AttributeTypeDescriptionSch
     public void testUsage() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         // DEFAULT is userApplications
         value = "( 1.1 SYNTAX 1.1 )";
@@ -663,7 +663,7 @@ public class AttributeTypeDescriptionSch
     public void testFull() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         value = "( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE SUP abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789 EQUALITY 2.3.4.5.6.7.8.9.0.1 ORDERING 3.4.5.6.7.8.9.0.1.2 SUBSTR 4.5.6.7.8.9.0.1.2.3 SYNTAX 5.6.7.8.9.0.1.2.3.4{1234567890} SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
         attributeType = parser.parseAttributeTypeDescription( value );
@@ -730,7 +730,7 @@ public class AttributeTypeDescriptionSch
     public void testRequiredElements() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         value = "( 1.2.3.4.5.6.7.8.9.0 SYNTAX 1.1 SUP 1.1 )";
         attributeType = parser.parseAttributeTypeDescription( value );
@@ -773,7 +773,7 @@ public class AttributeTypeDescriptionSch
     public void testCollecitveConstraint() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         value = "( 1.1 SYNTAX 1.1 COLLECTIVE )";
         attributeType = parser.parseAttributeTypeDescription( value );
@@ -833,7 +833,7 @@ public class AttributeTypeDescriptionSch
     public void testNoUserModificatonConstraint() throws ParseException
     {
         String value = null;
-        AttributeType attributeType = null;
+        MutableAttributeTypeImpl attributeType = null;
 
         value = "( 1.1 SYNTAX 1.1 NO-USER-MODIFICATION USAGE directoryOperation )";
         attributeType = parser.parseAttributeTypeDescription( value );
@@ -886,7 +886,7 @@ public class AttributeTypeDescriptionSch
     public void testIgnoreElementOrder() throws ParseException
     {
         String value = "( 2.5.4.3 SUP name SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE userApplications DESC 'RFC2256: common name(s) for which the entity is known by'  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch NAME ( 'cn' 'commonName' )  )";
-        AttributeType attributeType = parser.parseAttributeTypeDescription( value );
+        MutableAttributeTypeImpl attributeType = parser.parseAttributeTypeDescription( value );
 
         assertEquals( "2.5.4.3", attributeType.getOid() );
         assertEquals( 2, attributeType.getNames().size() );
@@ -910,7 +910,7 @@ public class AttributeTypeDescriptionSch
     public void testRfcUid() throws ParseException
     {
         String value = "( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) DESC 'RFC1274: user identifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} USAGE userApplications )";
-        AttributeType attributeType = parser.parseAttributeTypeDescription( value );
+        MutableAttributeTypeImpl attributeType = parser.parseAttributeTypeDescription( value );
 
         assertEquals( "0.9.2342.19200300.100.1.1", attributeType.getOid() );
         assertEquals( 2, attributeType.getNames().size() );
@@ -943,7 +943,7 @@ public class AttributeTypeDescriptionSch
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
             + "DESC 'bogus description' SUP name SINGLE-VALUE )";
-        AttributeType desc = parser.parseAttributeTypeDescription( substrate );
+        MutableAttributeTypeImpl desc = parser.parseAttributeTypeDescription( substrate );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getOid() );
         assertEquals( "bogus", desc.getNames().get( 0 ) );
         assertEquals( "bogusName", desc.getNames().get( 1 ) );
@@ -961,7 +961,7 @@ public class AttributeTypeDescriptionSch
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) "
             + "DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'blah' )";
-        AttributeType desc = parser.parseAttributeTypeDescription( substrate );
+        MutableAttributeTypeImpl desc = parser.parseAttributeTypeDescription( substrate );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", desc.getOid() );
         assertEquals( "bogus", desc.getNames().get( 0 ) );
         assertEquals( "bogusName", desc.getNames().get( 1 ) );
@@ -999,7 +999,7 @@ public class AttributeTypeDescriptionSch
         try
         {
             String value = null;
-            AttributeType attributeType = null;
+            MutableAttributeTypeImpl attributeType = null;
 
             parser.setQuirksMode( true );
 
@@ -1083,7 +1083,7 @@ public class AttributeTypeDescriptionSch
     {
         String value = "( 2.5.4.58 NAME 'attributeCertificateAttribute' " + "DESC 'attribute certificate use ;binary' "
             + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 ) ";
-        AttributeType attributeType = parser.parseAttributeTypeDescription( value );
+        MutableAttributeTypeImpl attributeType = parser.parseAttributeTypeDescription( value );
 
         assertEquals( "2.5.4.58", attributeType.getOid() );
         assertEquals( 1, attributeType.getNames().size() );
@@ -1107,7 +1107,7 @@ public class AttributeTypeDescriptionSch
     {
         String value = "( 1.3.18.0.2.4.216 NAME 'SAFDfpDataClass' DESC '  ' " +
             "EQUALITY 2.5.13.2 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )";
-        AttributeType attributeType = parser.parseAttributeTypeDescription( value );
+        MutableAttributeTypeImpl attributeType = parser.parseAttributeTypeDescription( value );
 
         assertEquals( "1.3.18.0.2.4.216", attributeType.getOid() );
         assertEquals( 1, attributeType.getNames().size() );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sun Mar 20 21:22:39 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 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.EntityFactory;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
@@ -872,7 +872,7 @@ public class SchemaEntityFactory impleme
      * @throws LdapInvalidAttributeValueException 
      * @throws LdapUnwillingToPerformException 
      */
-    public AttributeType getAttributeType( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+    public MutableAttributeTypeImpl getAttributeType( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
         String schemaName ) throws LdapInvalidAttributeValueException, LdapUnwillingToPerformException
     {
         checkEntry( entry, SchemaConstants.ATTRIBUTE_TYPE );
@@ -900,7 +900,7 @@ public class SchemaEntityFactory impleme
         }
 
         // Create the new AttributeType
-        AttributeType attributeType = new AttributeType( oid );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( oid );
 
         // Syntax
         EntryAttribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sun Mar 20 21:22:39 2011
@@ -41,7 +41,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.ldap.model.schema.EntityFactory;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
@@ -796,7 +796,7 @@ public class DefaultSchemaManager implem
     {
         for ( Entry entry : schemaLoader.loadAttributeTypes( schema ) )
         {
-            AttributeType attributeType = factory.getAttributeType( this, entry, registries, schema.getSchemaName() );
+            MutableAttributeTypeImpl attributeType = factory.getAttributeType( this, entry, registries, schema.getSchemaName() );
 
             addSchemaObject( registries, attributeType, schema );
         }
@@ -1518,7 +1518,7 @@ public class DefaultSchemaManager implem
     /**
      * {@inheritDoc}
      */
-    public AttributeType lookupAttributeTypeRegistry( String oid ) throws LdapException
+    public MutableAttributeTypeImpl lookupAttributeTypeRegistry( String oid ) throws LdapException
     {
         return registries.getAttributeTypeRegistry().lookup( Strings.toLowerCase( oid ).trim() );
     }
@@ -1527,7 +1527,7 @@ public class DefaultSchemaManager implem
     /**
      * {@inheritDoc}
      */
-    public AttributeType getAttributeType( String oid )
+    public MutableAttributeTypeImpl getAttributeType( String oid )
     {
         try
         {

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 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.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -128,7 +128,7 @@ public class MatchingRuleTest
         assertEquals( 0, comparator.compare( " +1 234-567 890 ", "+1234567890" ) );
 
         // test a real attribute: telephoneNumber
-        AttributeType at = schemaManager.lookupAttributeTypeRegistry( "telephoneNumber" );
+        MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( "telephoneNumber" );
         assertNotNull( at.getEquality() );
         assertEquals( TelephoneNumberNormalizer.class.getName(), at.getEquality().getNormalizer().getClass().getName() );
         assertEquals( "+1234567890", at.getEquality().getNormalizer().normalize( " +1 234-567 890 " ) );
@@ -165,7 +165,7 @@ public class MatchingRuleTest
         assertTrue( comparator.compare( 1234L, 234L ) > 0 );
 
         // test a real attribute type: uidNumber
-        AttributeType at = schemaManager.lookupAttributeTypeRegistry( "uidNumber" );
+        MutableAttributeTypeImpl at = schemaManager.lookupAttributeTypeRegistry( "uidNumber" );
         assertNotNull( at.getEquality() );
         assertEquals( NumericNormalizer.class.getName(), at.getEquality().getNormalizer().getClass().getName() );
         assertEquals( "123", at.getEquality().getNormalizer().normalize( " 1 2 3 " ) );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
-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.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
@@ -138,7 +138,7 @@ public class SchemaManagerAddTest
     {
         try
         {
-            AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+            MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
 
             return attributeType != null;
         }
@@ -223,7 +223,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -253,7 +253,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -281,7 +281,7 @@ public class SchemaManagerAddTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Create the collective attribute first
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -297,7 +297,7 @@ public class SchemaManagerAddTest
         assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
 
         // Now try to create an AT which is a subtype of teh create collective attribute
-        AttributeType subType = new AttributeType( "1.1.1" );
+        MutableAttributeTypeImpl subType = new MutableAttributeTypeImpl( "1.1.1" );
         subType.setEqualityOid( "2.5.13.1" );
         subType.setOrderingOid( null );
         subType.setSubstringOid( null );
@@ -325,7 +325,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -358,7 +358,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -392,7 +392,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -425,7 +425,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -452,7 +452,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "0.0" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -484,7 +484,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.8 " );
         attributeType.setUsage( UsageEnum.USER_APPLICATIONS );
 
@@ -510,7 +510,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( "0.0" );
         attributeType.setSubstringOid( null );
@@ -542,7 +542,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( "0.0" );
@@ -574,7 +574,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -600,7 +600,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "2.5.18.4" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "2.5.18.4" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -618,7 +618,7 @@ public class SchemaManagerAddTest
         assertTrue( isATPresent( schemaManager, "2.5.18.4" ) );
 
         // Check that it hasen't changed
-        AttributeType original = schemaManager.lookupAttributeTypeRegistry( "2.5.18.4" );
+        MutableAttributeTypeImpl original = schemaManager.lookupAttributeTypeRegistry( "2.5.18.4" );
         assertEquals( "distinguishedNameMatch", original.getEqualityOid() );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
@@ -635,7 +635,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -669,7 +669,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -688,7 +688,7 @@ public class SchemaManagerAddTest
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
 
-        AttributeType added = schemaManager.lookupAttributeTypeRegistry( "referral" );
+        MutableAttributeTypeImpl added = schemaManager.lookupAttributeTypeRegistry( "referral" );
         assertNotNull( added );
         assertEquals( "1.1.1.0", added.getOid() );
         assertTrue( added.getNames().contains( "referral" ) );
@@ -709,7 +709,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -719,7 +719,7 @@ public class SchemaManagerAddTest
         // It should not fail
         assertTrue( schemaManager.add( attributeType ) );
 
-        AttributeType result = schemaManager.lookupAttributeTypeRegistry( "1.1.0" );
+        MutableAttributeTypeImpl result = schemaManager.lookupAttributeTypeRegistry( "1.1.0" );
 
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.12", result.getSyntaxOid() );
         assertEquals( "2.5.13.1", result.getEqualityOid() );
@@ -738,7 +738,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -770,7 +770,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -802,7 +802,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Sun Mar 20 21:22:39 2011
@@ -35,7 +35,7 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapProtocolErrorException;
-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.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
@@ -128,7 +128,7 @@ public class SchemaManagerDelTest
     {
         try
         {
-            AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
+            MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
 
             return attributeType != null;
         }
@@ -234,7 +234,7 @@ public class SchemaManagerDelTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -261,7 +261,7 @@ public class SchemaManagerDelTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "generationQualifier" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "generationQualifier" );
         attributeType.setOid( "2.5.4.44" );
 
         // It should not fail
@@ -286,7 +286,7 @@ public class SchemaManagerDelTest
 
         // Try to delete an AT which is referenced by at least one OC
         // (modifiersName has one descendant : schemaModifiersName)
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( "cn" );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( "cn" );
 
         // It should fail
         assertFalse( schemaManager.delete( attributeType ) );
@@ -309,7 +309,7 @@ public class SchemaManagerDelTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Try to delete an AT which is contained by a disabled schema
-        AttributeType attributeType = new AttributeType( "gecos" );
+        MutableAttributeTypeImpl attributeType = new MutableAttributeTypeImpl( "gecos" );
         attributeType.setOid( "1.3.6.1.1.1.1.2" );
 
         // It should fail
@@ -334,7 +334,7 @@ public class SchemaManagerDelTest
 
         // Try to delete an AT which has descendant 
         // (modifiersName has one descendant : schemaModifiersName)
-        AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( "modifiersName" );
+        MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( "modifiersName" );
 
         // It should fail
         assertFalse( schemaManager.delete( attributeType ) );
@@ -557,7 +557,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using AT : it should be OK
-        AttributeType at = new AttributeType( AT_OID );
+        MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( AT_OID );
         assertTrue( schemaManager.delete( at ) );
 
         assertEquals( atrSize - 1, schemaManager.getAttributeTypeRegistry().size() );
@@ -951,7 +951,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException);
 
         // Now delete the using AT : it should be OK
-        AttributeType at = new AttributeType( AT_OID );
+        MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( AT_OID );
         assertTrue( schemaManager.delete( at ) );
 
         assertEquals( atrSize - 1, schemaManager.getAttributeTypeRegistry().size() );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java Sun Mar 20 21:22:39 2011
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
-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.DefaultSchema;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
@@ -528,7 +528,7 @@ public class SchemaManagerLoadTest
         assertTrue( schemaManager.load( "cosine" ) );
         assertFalse( schemaManager.load( "nis" ) );
         
-        AttributeType at = schemaManager.getAttributeType( "uidNumber" );
+        MutableAttributeTypeImpl at = schemaManager.getAttributeType( "uidNumber" );
         // if nis schema was loaded then the at will not be null
         assertNull( at );
 
@@ -798,7 +798,7 @@ public class SchemaManagerLoadTest
 
         assertFalse( schemaManager.getErrors().isEmpty() );
         
-        AttributeType at = schemaManager.getAttributeType( "uidNumber" );
+        MutableAttributeTypeImpl at = schemaManager.getAttributeType( "uidNumber" );
         // if nis schema was loaded then the at will not be null
         assertNotNull( at );
     }

Modified: directory/studio/branches/akarasulu/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java (original)
+++ directory/studio/branches/akarasulu/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java Sun Mar 20 21:22:39 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor;
 import org.eclipse.osgi.util.NLS;
 
@@ -206,18 +206,18 @@ public class ProtectedItemWrapper
         if ( item.getClass() == AttributeTypeItem.class )
         {
             AttributeTypeItem at = ( AttributeTypeItem ) item;
-            for ( Iterator<AttributeType> it = at.iterator(); it.hasNext(); )
+            for ( Iterator<MutableAttributeTypeImpl> it = at.iterator(); it.hasNext(); )
             {
-                AttributeType attributeType = it.next();
+                MutableAttributeTypeImpl attributeType = it.next();
                 values.add( attributeType.toString() );
             }
         }
         else if ( item.getClass() == AllAttributeValuesItem.class )
         {
             AllAttributeValuesItem aav = ( AllAttributeValuesItem ) item;
-            for ( Iterator<AttributeType> it = aav.iterator(); it.hasNext(); )
+            for ( Iterator<MutableAttributeTypeImpl> it = aav.iterator(); it.hasNext(); )
             {
-                AttributeType attributeType = it.next();
+                MutableAttributeTypeImpl attributeType = it.next();
                 values.add( attributeType.toString() );
             }
         }
@@ -233,9 +233,9 @@ public class ProtectedItemWrapper
         else if ( item.getClass() == SelfValueItem.class )
         {
             SelfValueItem sv = ( SelfValueItem ) item;
-            for ( Iterator<AttributeType> it = sv.iterator(); it.hasNext(); )
+            for ( Iterator<MutableAttributeTypeImpl> it = sv.iterator(); it.hasNext(); )
             {
-                AttributeType attributeType = it.next();
+                MutableAttributeTypeImpl attributeType = it.next();
                 values.add( attributeType.toString() );
             }
         }

Modified: directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original)
+++ directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Sun Mar 20 21:22:39 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
@@ -277,7 +277,7 @@ public class PartitionsDiffComputer
                 String id = SchemaUtils.stripOptions( returnAttribute );
                 Set<String> options = SchemaUtils.getOptions( returnAttribute );
 
-                AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( id );
+                MutableAttributeTypeImpl attributeType = schemaManager.lookupAttributeTypeRegistry( id );
                 AttributeTypeOptions attrOptions = new AttributeTypeOptions( attributeType, options );
 
                 returningAttributes.add( attrOptions );
@@ -309,12 +309,12 @@ public class PartitionsDiffComputer
     private void compareEntries( Entry originalEntry, Entry destinationEntry, LdifEntry modificationEntry )
     {
         // Creating a list to store the already evaluated attribute type
-        List<AttributeType> evaluatedATs = new ArrayList<AttributeType>();
+        List<MutableAttributeTypeImpl> evaluatedATs = new ArrayList<MutableAttributeTypeImpl>();
 
         // Checking attributes of the original entry
         for ( EntryAttribute originalAttribute : originalEntry )
         {
-            AttributeType originalAttributeType = originalAttribute.getAttributeType();
+            MutableAttributeTypeImpl originalAttributeType = originalAttribute.getAttributeType();
 
             // We're only working on 'userApplications' attributes
             if ( originalAttributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
@@ -342,7 +342,7 @@ public class PartitionsDiffComputer
         // Checking attributes of the destination entry
         for ( EntryAttribute destinationAttribute : destinationEntry )
         {
-            AttributeType destinationAttributeType = destinationAttribute.getAttributeType();
+            MutableAttributeTypeImpl destinationAttributeType = destinationAttribute.getAttributeType();
 
             // We're only working on 'userApplications' attributes
             if ( destinationAttributeType.getUsage() == UsageEnum.USER_APPLICATIONS )

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.ui.actions.SelectionUtils;
 import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
@@ -326,10 +326,10 @@ public abstract class BrowserSelectionUt
      * @param selection the selection
      * @return an array with AttributeTypeDescription beans, may be empty.
      */
-    public static AttributeType[] getAttributeTypeDescription( ISelection selection )
+    public static MutableAttributeTypeImpl[] getAttributeTypeDescription( ISelection selection )
     {
-        List<Object> list = getTypes( selection, AttributeType.class );
-        return list.toArray( new AttributeType[list.size()] );
+        List<Object> list = getTypes( selection, MutableAttributeTypeImpl.class );
+        return list.toArray( new MutableAttributeTypeImpl[list.size()] );
     }
 
 

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-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.studio.connection.core.StudioControl;
 import org.apache.directory.studio.ldapbrowser.common.dialogs.DeleteDialog;
@@ -446,12 +446,12 @@ public class DeleteAction extends Browse
 
     protected void appendValuesWarnMessage( StringBuffer message, Collection<IValue> values )
     {
-        Map<AttributeType, Integer> attributeNameToSelectedValuesCountMap = new HashMap<AttributeType, Integer>();
+        Map<MutableAttributeTypeImpl, Integer> attributeNameToSelectedValuesCountMap = new HashMap<MutableAttributeTypeImpl, Integer>();
         Set<ObjectClass> selectedObjectClasses = new HashSet<ObjectClass>();
         for ( IValue value : values )
         {
             String type = value.getAttribute().getType();
-            AttributeType atd = value.getAttribute().getAttributeTypeDescription();
+            MutableAttributeTypeImpl atd = value.getAttribute().getAttributeTypeDescription();
             AttributeHierarchy ah = value.getAttribute().getEntry().getAttributeWithSubtypes( type );
 
             // check if (part of) Rdn is selected
@@ -508,7 +508,7 @@ public class DeleteAction extends Browse
             // get remaining attributes
             Collection<ObjectClass> remainingObjectClasses = entry.getObjectClassDescriptions();
             remainingObjectClasses.removeAll( selectedObjectClasses );
-            Set<AttributeType> remainingAttributeSet = new HashSet<AttributeType>();
+            Set<MutableAttributeTypeImpl> remainingAttributeSet = new HashSet<MutableAttributeTypeImpl>();
             for ( ObjectClass ocd : remainingObjectClasses )
             {
                 {
@@ -516,7 +516,7 @@ public class DeleteAction extends Browse
                         schema );
                     for ( String mustAttr : mustAttrs )
                     {
-                        AttributeType atd = entry.getBrowserConnection().getSchema()
+                        MutableAttributeTypeImpl atd = entry.getBrowserConnection().getSchema()
                             .getAttributeTypeDescription( mustAttr );
                         remainingAttributeSet.add( atd );
                     }
@@ -524,7 +524,7 @@ public class DeleteAction extends Browse
                         schema );
                     for ( String mayAttr : mayAttrs )
                     {
-                        AttributeType atd = entry.getBrowserConnection().getSchema()
+                        MutableAttributeTypeImpl atd = entry.getBrowserConnection().getSchema()
                             .getAttributeTypeDescription( mayAttr );
                         remainingAttributeSet.add( atd );
                     }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collection;
 
 import org.apache.commons.lang.ArrayUtils;
 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.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
@@ -146,7 +146,7 @@ public class RenameEntryDialog extends D
         dnBuilderWidget = new DnBuilderWidget( true, false );
         dnBuilderWidget.addWidgetModifyListener( this );
         dnBuilderWidget.createContents( composite );
-        Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+        Collection<MutableAttributeTypeImpl> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
         String[] allAttributeNames = SchemaUtils.getNames( allAtds ).toArray( ArrayUtils.EMPTY_STRING_ARRAY );
         dnBuilderWidget.setInput( entry.getBrowserConnection(), allAttributeNames, entry.getRdn(), null );
 

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-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.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.core.Utils;
@@ -71,10 +71,10 @@ public class BinaryAttributesAndSyntaxes
 {
 
     /** Map with attribute OID => attribute type description */
-    private SortedMap<String, AttributeType> attributeOid2AtdMap;
+    private SortedMap<String, MutableAttributeTypeImpl> attributeOid2AtdMap;
 
     /** Map with attribute name => attribute type description */
-    private SortedMap<String, AttributeType> attributeNames2AtdMap;
+    private SortedMap<String, MutableAttributeTypeImpl> attributeNames2AtdMap;
 
     /** The attribute names and OIDs. */
     private String[] attributeNamesAndOids;
@@ -147,8 +147,8 @@ public class BinaryAttributesAndSyntaxes
         composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
 
         // init available attribute types
-        attributeNames2AtdMap = new TreeMap<String, AttributeType>();
-        attributeOid2AtdMap = new TreeMap<String, AttributeType>();
+        attributeNames2AtdMap = new TreeMap<String, MutableAttributeTypeImpl>();
+        attributeOid2AtdMap = new TreeMap<String, MutableAttributeTypeImpl>();
         BrowserConnectionManager cm = BrowserCorePlugin.getDefault().getConnectionManager();
         IBrowserConnection[] connections = cm.getBrowserConnections();
         for ( IBrowserConnection browserConnection : connections )
@@ -200,8 +200,8 @@ public class BinaryAttributesAndSyntaxes
 
     private void createAttributeMaps( Schema schema )
     {
-        Collection<AttributeType> atds = schema.getAttributeTypeDescriptions();
-        for ( AttributeType atd : atds )
+        Collection<MutableAttributeTypeImpl> atds = schema.getAttributeTypeDescriptions();
+        for ( MutableAttributeTypeImpl atd : atds )
         {
             attributeOid2AtdMap.put( atd.getOid(), atd );
             for ( String name : atd.getNames() )
@@ -491,7 +491,7 @@ public class BinaryAttributesAndSyntaxes
                     {
                         if ( attributeNames2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
                         {
-                            AttributeType atd = ( AttributeType ) attributeNames2AtdMap
+                            MutableAttributeTypeImpl atd = ( MutableAttributeTypeImpl ) attributeNames2AtdMap
                                 .get( attribute.getAttributeNumericOidOrName() );
                             String s = atd.getOid();
                             for ( String attributeName : atd.getNames() )
@@ -505,7 +505,7 @@ public class BinaryAttributesAndSyntaxes
                         }
                         else if ( attributeOid2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
                         {
-                            AttributeType atd = ( AttributeType ) attributeOid2AtdMap
+                            MutableAttributeTypeImpl atd = ( MutableAttributeTypeImpl ) attributeOid2AtdMap
                                 .get( attribute.getAttributeNumericOidOrName() );
                             return SchemaUtils.toString( atd );
                         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-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.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -78,10 +78,10 @@ public class ValueEditorsPreferencePage 
     private SortedMap<String, ValueEditorExtension> class2ValueEditorExtensionMap;
 
     /** Map with attribute OID => attribute type description */
-    private SortedMap<String, AttributeType> attributeOid2AtdMap;
+    private SortedMap<String, MutableAttributeTypeImpl> attributeOid2AtdMap;
 
     /** Map with attribute name => attribute type description */
-    private SortedMap<String, AttributeType> attributeNames2AtdMap;
+    private SortedMap<String, MutableAttributeTypeImpl> attributeNames2AtdMap;
 
     /** The attribute names and OIDs. */
     private String[] attributeTypesAndOids;
@@ -187,8 +187,8 @@ public class ValueEditorsPreferencePage 
         }
 
         // init available attribute types
-        attributeNames2AtdMap = new TreeMap<String, AttributeType>();
-        attributeOid2AtdMap = new TreeMap<String, AttributeType>();
+        attributeNames2AtdMap = new TreeMap<String, MutableAttributeTypeImpl>();
+        attributeOid2AtdMap = new TreeMap<String, MutableAttributeTypeImpl>();
         BrowserConnectionManager cm = BrowserCorePlugin.getDefault().getConnectionManager();
         IBrowserConnection[] connections = cm.getBrowserConnections();
         for ( IBrowserConnection browserConnection : connections )
@@ -243,8 +243,8 @@ public class ValueEditorsPreferencePage 
 
     private void createAttributeMaps( Schema schema )
     {
-        Collection<AttributeType> atds = schema.getAttributeTypeDescriptions();
-        for ( AttributeType atd : atds )
+        Collection<MutableAttributeTypeImpl> atds = schema.getAttributeTypeDescriptions();
+        for ( MutableAttributeTypeImpl atd : atds )
         {
             attributeOid2AtdMap.put( atd.getOid(), atd );
 
@@ -549,7 +549,7 @@ public class ValueEditorsPreferencePage 
                     {
                         if ( attributeNames2AtdMap.containsKey( relation.getAttributeNumericOidOrType() ) )
                         {
-                            AttributeType atd = ( AttributeType ) attributeNames2AtdMap
+                            MutableAttributeTypeImpl atd = ( MutableAttributeTypeImpl ) attributeNames2AtdMap
                                 .get( relation.getAttributeNumericOidOrType() );
                             String s = atd.getOid();
                             for ( String name : atd.getNames() )
@@ -563,7 +563,7 @@ public class ValueEditorsPreferencePage 
                         }
                         else if ( attributeOid2AtdMap.containsKey( relation.getAttributeNumericOidOrType() ) )
                         {
-                            AttributeType atd = ( AttributeType ) attributeOid2AtdMap
+                            MutableAttributeTypeImpl atd = ( MutableAttributeTypeImpl ) attributeOid2AtdMap
                                 .get( relation.getAttributeNumericOidOrType() );
                             return atd.toString();
                         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -101,7 +101,7 @@ public class FilterContentAssistProcesso
     private Schema schema;
 
     /** The possible attribute types. */
-    private Map<String, AttributeType> possibleAttributeTypes;
+    private Map<String, MutableAttributeTypeImpl> possibleAttributeTypes;
 
     /** The possible filter types. */
     private Map<String, String> possibleFilterTypes;
@@ -168,15 +168,15 @@ public class FilterContentAssistProcesso
     {
         this.schema = schema;
 
-        possibleAttributeTypes = new TreeMap<String, AttributeType>( nameAndOidComparator );
+        possibleAttributeTypes = new TreeMap<String, MutableAttributeTypeImpl>( nameAndOidComparator );
         possibleFilterTypes = new LinkedHashMap<String, String>();
         possibleObjectClasses = new TreeMap<String, ObjectClass>( nameAndOidComparator );
         possibleMatchingRules = new TreeMap<String, MutableMatchingRule>( nameAndOidComparator );
 
         if ( schema != null )
         {
-            Collection<AttributeType> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
-            for ( AttributeType atd : attributeTypeDescriptions )
+            Collection<MutableAttributeTypeImpl> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
+            for ( MutableAttributeTypeImpl atd : attributeTypeDescriptions )
             {
                 possibleAttributeTypes.put( atd.getOid(), atd );
                 for ( String atdName : atd.getNames() )
@@ -430,7 +430,7 @@ public class FilterContentAssistProcesso
         {
             for ( String possibleAttributeType : possibleAttributeTypes.keySet() )
             {
-                AttributeType description = possibleAttributeTypes.get( possibleAttributeType );
+                MutableAttributeTypeImpl description = possibleAttributeTypes.get( possibleAttributeType );
                 if ( possibleAttributeType.toUpperCase().startsWith( attributeType.toUpperCase() ) )
                 {
                     String replacementString = possibleAttributeType;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
@@ -94,7 +94,7 @@ public class FilterTextHover implements 
                         + fc.getAttributeToken().getLength() )
                 {
                     String attributeType = fc.getAttributeToken().getValue();
-                    AttributeType attributeTypeDescription = schema
+                    MutableAttributeTypeImpl attributeTypeDescription = schema
                         .getAttributeTypeDescription( attributeType );
                     String ldifLine = SchemaUtils.getLdifLine( attributeTypeDescription );
                     return ldifLine;
@@ -119,7 +119,7 @@ public class FilterTextHover implements 
                         + fc.getAttributeToken().getLength() )
                 {
                     String attributeType = fc.getAttributeToken().getValue();
-                    AttributeType attributeTypeDescription = schema
+                    MutableAttributeTypeImpl attributeTypeDescription = schema
                         .getAttributeTypeDescription( attributeType );
                     String ldifLine = SchemaUtils.getLdifLine( attributeTypeDescription );
                     return ldifLine;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -473,7 +473,7 @@ public class BrowserQuickSearchWidget
             String[] atdNames;
             if ( connection != null )
             {
-                Collection<AttributeType> atds = connection.getSchema().getAttributeTypeDescriptions();
+                Collection<MutableAttributeTypeImpl> atds = connection.getSchema().getAttributeTypeDescriptions();
                 atdNames = SchemaUtils.getNames( atds ).toArray( EMPTY );
             }
             else

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
@@ -157,8 +157,8 @@ public class OpenBestEditorAction extend
 
                 // validate if value is allowed
                 IEntry entry = value.getAttribute().getEntry();
-                Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
-                AttributeType atd = value.getAttribute().getAttributeTypeDescription();
+                Collection<MutableAttributeTypeImpl> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+                MutableAttributeTypeImpl atd = value.getAttribute().getAttributeTypeDescription();
                 if ( !allAtds.contains( atd ) )
                 {
                     message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema" ), //$NON-NLS-1$

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import java.util.Set;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.StudioControl;
@@ -799,7 +799,7 @@ public class SearchPageWrapper extends B
                 {
                     if ( returnOperationalAttributesButton.getSelection() )
                     {
-                        Collection<AttributeType> opAtds = SchemaUtils
+                        Collection<MutableAttributeTypeImpl> opAtds = SchemaUtils
                             .getOperationalAttributeDescriptions( browserConnectionWidget.getBrowserConnection()
                                 .getSchema() );
                         Collection<String> opAtdNames = SchemaUtils.getNames( opAtds );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
 import org.apache.directory.studio.ldapbrowser.common.widgets.ListContentProposalProvider;
@@ -115,13 +115,13 @@ public class AttributeTypeWizardPage ext
         this.initialShowSubschemaAttributesOnly = initialShowSubschemaAttributesOnly;
         this.initialHideExistingAttributes = initialHideExistingAttributes;
 
-        Collection<AttributeType> atds = initialEntry.getBrowserConnection().getSchema()
+        Collection<MutableAttributeTypeImpl> atds = initialEntry.getBrowserConnection().getSchema()
             .getAttributeTypeDescriptions();
         Collection<String> atdNames = SchemaUtils.getNames( atds );
         possibleAttributeTypes = atdNames.toArray( new String[atdNames.size()] );
         Arrays.sort( possibleAttributeTypes );
 
-        Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( initialEntry );
+        Collection<MutableAttributeTypeImpl> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( initialEntry );
         Collection<String> names = SchemaUtils.getNames( allAtds );
         possibleAttributeTypesSubschemaOnly = names.toArray( new String[0] );
         Arrays.sort( possibleAttributeTypesSubschemaOnly );



Mime
View raw message