directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1080977 [1/3] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/branches/akarasu...
Date Sat, 12 Mar 2011 19:05:20 GMT
Author: akarasulu
Date: Sat Mar 12 19:05:17 2011
New Revision: 1080977

URL: http://svn.apache.org/viewvc?rev=1080977&view=rev
Log:
moving MatchingRule out of the way naming it to MutableMatchingRuleImpl

Added:
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableMatchingRuleImpl.java
      - copied, changed from r1080975, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
Removed:
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
Modified:
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/MatchingRuleRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
    directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
    directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
    directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java
    directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
    directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
    directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
    directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Sat Mar 12 19:05:17 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
@@ -54,16 +54,16 @@ public class TestServerEntryUtils
         }
     }
 
-    public static MatchingRule matchingRuleFactory( String oid )
+    public static MutableMatchingRuleImpl matchingRuleFactory( String oid )
     {
-        MatchingRule matchingRule = new MatchingRule( oid );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( oid );
         
         return matchingRule;
     }
     /**
      * A local MatchingRule class for tests
      */
-    static class MR extends MatchingRule
+    static class MR extends MutableMatchingRuleImpl
     {
         private static final long serialVersionUID = -5428997199906309370L;
 
@@ -131,7 +131,7 @@ public class TestServerEntryUtils
             }
         } );
         
-        MatchingRule matchingRule = new MatchingRule( "1.1.2.1" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.2.1" );
         matchingRule.setSyntax( syntax );
 
 
@@ -216,7 +216,7 @@ public class TestServerEntryUtils
             }
         } );
         
-        MatchingRule matchingRule = new MatchingRule( "1.1.2" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.2" );
         matchingRule.setSyntax( syntax );
 
 
@@ -261,7 +261,7 @@ public class TestServerEntryUtils
             }
         } );
 
-        MatchingRule matchingRule = new MatchingRule( "1.2.2" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.2.2" );
         matchingRule.setSyntax( syntax );
 
         matchingRule.setLdapComparator( new ByteArrayComparator( "1.2.2" ) );

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Sat Mar 12 19:05:17 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -71,7 +71,7 @@ public class DescriptionParsers
     private static final NormalizerDescription[]     EMPTY_NORMALIZERS         = new NormalizerDescription[0];
     private static final SyntaxCheckerDescription[]  EMPTY_SYNTAX_CHECKERS     = new SyntaxCheckerDescription[0];
     private static final MutableLdapSyntaxImpl[]                EMPTY_SYNTAXES            = new MutableLdapSyntaxImpl[0];
-    private static final MatchingRule[]              EMPTY_MATCHING_RULES      = new MatchingRule[0];
+    private static final MutableMatchingRuleImpl[]              EMPTY_MATCHING_RULES      = new MutableMatchingRuleImpl[0];
     private static final AttributeType[]             EMPTY_ATTRIBUTE_TYPES     = new AttributeType[0];
     private static final ObjectClass[]               EMPTY_OBJECT_CLASSES      = new ObjectClass[0];
     private static final MatchingRuleUse[]           EMPTY_MATCHING_RULE_USES  = new MatchingRuleUse[0];
@@ -471,20 +471,20 @@ public class DescriptionParsers
      * @return the set of matchingRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public MatchingRule[] parseMatchingRules( EntryAttribute attr ) throws LdapException
+    public MutableMatchingRuleImpl[] parseMatchingRules( EntryAttribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
             return EMPTY_MATCHING_RULES;
         }
 
-        MatchingRule[] matchingRules = new MatchingRule[attr.size()];
+        MutableMatchingRuleImpl[] matchingRules = new MutableMatchingRuleImpl[attr.size()];
 
         int pos = 0;
 
         for ( Value<?> value : attr )
         {
-            MatchingRule matchingRule = null;
+            MutableMatchingRuleImpl matchingRule = null;
 
             try
             {

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sat Mar 12 19:05:17 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 
@@ -140,7 +140,7 @@ public interface SchemaPartitionDao
     Set<Entry> listSyntaxDependents( String numericOid ) throws Exception;
 
 
-    Set<Entry> listMatchingRuleDependents( MatchingRule mr ) throws Exception;
+    Set<Entry> listMatchingRuleDependents( MutableMatchingRuleImpl mr ) throws Exception;
 
 
     EntryFilteringCursor listAllNames() throws Exception;

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Sat Mar 12 19:05:17 2011
@@ -59,7 +59,7 @@ import org.apache.directory.shared.ldap.
 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.AttributeTypeOptions;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 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.Schema;
@@ -649,7 +649,7 @@ public class SchemaPartitionDaoImpl impl
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaPartitionDao#listMatchingRuleDependents(org.apache.directory.shared.ldap.schema.MatchingRule)
      */
-    public Set<Entry> listMatchingRuleDependents( MatchingRule mr ) throws Exception
+    public Set<Entry> listMatchingRuleDependents( MutableMatchingRuleImpl mr ) throws Exception
     {
         Set<Entry> set = new HashSet<Entry>();
         BranchNode filter = new AndNode();

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Sat Mar 12 19:05:17 2011
@@ -31,7 +31,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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 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;
@@ -72,7 +72,7 @@ public class MatchingRuleSynchronizer ex
         Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
-        MatchingRule mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
 
         String oldOid = getOid( entry );
@@ -108,7 +108,7 @@ public class MatchingRuleSynchronizer ex
         // Build the new MatchingRule from the given entry
         String schemaName = getSchemaName( dn );
 
-        MatchingRule matchingRule = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl matchingRule = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             schemaName );
         
         // At this point, the constructed MatchingRule has not been checked against the 
@@ -165,7 +165,7 @@ public class MatchingRuleSynchronizer ex
         }
 
         // Test that the Oid exists
-        MatchingRule matchingRule = ( MatchingRule ) checkOidExists( entry );
+        MutableMatchingRuleImpl matchingRule = ( MutableMatchingRuleImpl ) checkOidExists( entry );
 
         if ( schema.isEnabled() && matchingRule.isEnabled() )
         {
@@ -196,13 +196,13 @@ public class MatchingRuleSynchronizer ex
     public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
-        MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
+        MutableMatchingRuleImpl oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
         Entry targetEntry = (Entry) entry.clone();
         String newOid = newRdn.getNormValue().getString();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
-        MatchingRule mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -224,14 +224,14 @@ public class MatchingRuleSynchronizer ex
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
-        MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
         Entry targetEntry = ( Entry ) entry.clone();
         String newOid = newRdn.getNormValue().getString();
         checkOidIsUnique( newOid );
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
-        MatchingRule mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )
@@ -259,9 +259,9 @@ public class MatchingRuleSynchronizer ex
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
         String newSchemaName = getSchemaName( newParentName );
-        MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             oldSchemaName );
-        MatchingRule newMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
+        MutableMatchingRuleImpl newMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )

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=1080977&r1=1080976&r2=1080977&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 Sat Mar 12 19:05:17 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 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.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -156,7 +156,7 @@ public class SyntaxSynchronizer extends 
             }
         }
 
-        for ( MatchingRule matchingRule : schemaManager.getMatchingRuleRegistry() )
+        for ( MutableMatchingRuleImpl matchingRule : schemaManager.getMatchingRuleRegistry() )
         {
             if ( oid.equals( matchingRule.getSyntax().getOid() ) )
             {

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Sat Mar 12 19:05:17 2011
@@ -47,7 +47,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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.BooleanComparator;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
@@ -73,7 +73,7 @@ public class MetaComparatorHandlerIT ext
 
     public static SchemaManager schemaManager;
 
-    class DummyMR extends MatchingRule
+    class DummyMR extends MutableMatchingRuleImpl
     {
         public DummyMR()
         {

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Sat Mar 12 19:05:17 2011
@@ -42,7 +42,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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
 import org.apache.directory.shared.ldap.util.JndiUtils;
@@ -250,7 +250,7 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        MatchingRule mr = schemaManager.getMatchingRuleRegistry().lookup( OID );
+        MutableMatchingRuleImpl mr = schemaManager.getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
@@ -282,7 +282,7 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        MatchingRule mr = schemaManager.getMatchingRuleRegistry().lookup( OID );
+        MutableMatchingRuleImpl mr = schemaManager.getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Sat Mar 12 19:05:17 2011
@@ -46,7 +46,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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
@@ -653,7 +653,7 @@ public class MetaNormalizerHandlerIT ext
     }
 
 
-    class DummyMR extends MatchingRule
+    class DummyMR extends MutableMatchingRuleImpl
     {
         public DummyMR()
         {

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=1080977&r1=1080976&r2=1080977&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 Sat Mar 12 19:05:17 2011
@@ -71,7 +71,7 @@ import org.apache.directory.shared.ldap.
 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.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 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.AbstractSyntaxChecker;
@@ -906,7 +906,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "matchingRules" );
-        MatchingRule matchingRule = null;
+        MutableMatchingRuleImpl matchingRule = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Sat Mar 12 19:05:17 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 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.AbstractLdapComparator;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.exception.NotImplementedException;
@@ -322,7 +322,7 @@ public class LeafEvaluator implements Ev
      */
     private AbstractLdapComparator<? super Object> getComparator( AttributeType attributeType ) throws LdapException
     {
-        MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
+        MutableMatchingRuleImpl mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
         
         return mrule.getLdapComparator();
     }
@@ -337,7 +337,7 @@ public class LeafEvaluator implements Ev
      */
     private Normalizer getNormalizer( AttributeType attributeType ) throws LdapException
     {
-        MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
+        MutableMatchingRuleImpl mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
         
         return mrule.getNormalizer();
     }
@@ -350,9 +350,9 @@ public class LeafEvaluator implements Ev
      * @return the matching rule
      * @throws LdapException if there is a failure
      */
-    private MatchingRule getMatchingRule( AttributeType attributeType, int matchType ) throws LdapException
+    private MutableMatchingRuleImpl getMatchingRule( AttributeType attributeType, int matchType ) throws LdapException
     {
-        MatchingRule mrule = null;
+        MutableMatchingRuleImpl mrule = null;
 
         switch ( matchType )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Sat Mar 12 19:05:17 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 
 
@@ -60,7 +60,7 @@ public class SubstringEvaluator implemen
         Pattern regex = null;
         SubstringNode snode = (SubstringNode)node;
         AttributeType attributeType = snode.getAttributeType();
-        MatchingRule matchingRule = attributeType.getSubstring();
+        MutableMatchingRuleImpl matchingRule = attributeType.getSubstring();
         
         if ( matchingRule == null )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Sat Mar 12 19:05:17 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
@@ -63,9 +63,9 @@ public class AttributesFactory
         {
             return getAttributes( ( MutableLdapSyntaxImpl ) obj, schema, schemaManager );
         }
-        else if ( obj instanceof MatchingRule )
+        else if ( obj instanceof MutableMatchingRuleImpl )
         {
-            return getAttributes( ( MatchingRule ) obj, schema, schemaManager );
+            return getAttributes( ( MutableMatchingRuleImpl ) obj, schema, schemaManager );
         }
         else if ( obj instanceof AttributeType )
         {
@@ -188,7 +188,7 @@ public class AttributesFactory
      * @return Attributes
      * @throws LdapException
      */
-    public Entry getAttributes( MatchingRule matchingRule, Schema schema, SchemaManager schemaManager ) throws LdapException
+    public Entry getAttributes( MutableMatchingRuleImpl matchingRule, Schema schema, SchemaManager schemaManager ) throws LdapException
     {
         Entry entry = new DefaultEntry( schemaManager );
 

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sat Mar 12 19:05:17 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -182,7 +182,7 @@ public class DefaultSchemaService implem
         EntryAttribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.MATCHING_RULES_AT ) );
 
-        for ( MatchingRule matchingRule : getSchemaManager().getMatchingRuleRegistry() )
+        for ( MutableMatchingRuleImpl matchingRule : getSchemaManager().getMatchingRuleRegistry() )
         {
             attr.add( SchemaUtils.render( matchingRule ).toString() );
         }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Sat Mar 12 19:05:17 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -246,9 +246,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( MATCHING_RULE_INDEX ):
-                MatchingRule[] mrs = parsers.parseMatchingRules( mods );
+                MutableMatchingRuleImpl[] mrs = parsers.parseMatchingRules( mods );
                 
-                for ( MatchingRule mr : mrs )
+                for ( MutableMatchingRuleImpl mr : mrs )
                 {
                     subentryModifier.deleteSchemaObject( modifyContext, mr );
                 }
@@ -384,9 +384,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( MATCHING_RULE_INDEX ):
-                MatchingRule[] mrs = parsers.parseMatchingRules( mods );
+                MutableMatchingRuleImpl[] mrs = parsers.parseMatchingRules( mods );
                 
-                for ( MatchingRule mr : mrs )
+                for ( MutableMatchingRuleImpl mr : mrs )
                 {
                     subentryModifier.addSchemaObject( modifyContext, mr );
                 }

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sat Mar 12 19:05:17 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -109,7 +109,7 @@ public class SchemaSubentryModifier
         {
             buf.append( "syntaxes" );
         }
-        else if ( obj instanceof MatchingRule )
+        else if ( obj instanceof MutableMatchingRuleImpl )
         {
             buf.append( SchemaConstants.MATCHING_RULES_AT );
         }

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sat Mar 12 19:05:17 2011
@@ -28,7 +28,7 @@ import java.util.Set;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -60,7 +60,7 @@ public class DummyAttributeTypeRegistry 
     {
         AbstractNormalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
 
-        MatchingRule equality = new MatchingRule( "1.1.1" );
+        MutableMatchingRuleImpl equality = new MutableMatchingRuleImpl( "1.1.1" );
         equality.setNormalizer( normalizer );
 
         AttributeType attributeType = new AttributeType( id );

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Sat Mar 12 19:05:17 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.util.SynchronizedLRUMap;
@@ -210,7 +210,7 @@ public class JdbmIndex<K, O> extends Abs
     {
         SerializableComparator<K> comp;
 
-        MatchingRule mr = attributeType.getEquality();
+        MutableMatchingRuleImpl mr = attributeType.getEquality();
 
         if ( mr == null )
         {

Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Sat Mar 12 19:05:17 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
 import org.apache.directory.server.xdbm.ParentIdAndRdnComparator;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.SynchronizedLRUMap;
 import org.slf4j.Logger;
@@ -128,7 +128,7 @@ public class JdbmRdnIndex<E> extends Jdb
      */
     private void initTables( SchemaManager schemaManager ) throws IOException
     {
-        MatchingRule mr = attributeType.getEquality();
+        MutableMatchingRuleImpl mr = attributeType.getEquality();
 
         if ( mr == null )
         {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sat Mar 12 19:05:17 2011
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -276,7 +276,7 @@ public abstract class AbstractStore<E, I
         {
             // check that the attributeType has an EQUALITY matchingRule
             AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
-            MatchingRule mr = attributeType.getEquality();
+            MutableMatchingRuleImpl mr = attributeType.getEquality();
 
             if ( mr != null )
             {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Sat Mar 12 19:05:17 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
@@ -65,7 +65,7 @@ public class AvlIndex<K, O> extends Abst
     {
         this.attributeType = attributeType;
 
-        MatchingRule mr = attributeType.getEquality();
+        MutableMatchingRuleImpl mr = attributeType.getEquality();
 
         if ( mr == null )
         {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Sat Mar 12 19:05:17 2011
@@ -26,7 +26,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
 import org.apache.directory.server.xdbm.ParentIdAndRdnComparator;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
@@ -53,7 +53,7 @@ public class AvlRdnIndex<E> extends AvlI
     {
         this.attributeType = attributeType;
 
-        MatchingRule mr = attributeType.getEquality();
+        MutableMatchingRuleImpl mr = attributeType.getEquality();
 
         if ( mr == null )
         {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Sat Mar 12 19:05:17 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.ApproximateNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
@@ -58,7 +58,7 @@ public class ApproximateEvaluator<T, ID 
         {
             idx = null;
 
-            MatchingRule mr = attributeType.getEquality();
+            MutableMatchingRuleImpl mr = attributeType.getEquality();
 
             if ( mr == null )
             {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Sat Mar 12 19:05:17 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
@@ -70,7 +70,7 @@ public class EqualityEvaluator<T, ID ext
         {
             idx = null;
 
-            MatchingRule mr = attributeType.getEquality();
+            MutableMatchingRuleImpl mr = attributeType.getEquality();
 
             if ( mr == null )
             {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
    (empty)

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
    (empty)

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Sat Mar 12 19:05:17 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
@@ -86,7 +86,7 @@ public class SubstringEvaluator<ID exten
         this.schemaManager = schemaManager;
         this.attributeType = node.getAttributeType();
 
-        MatchingRule rule = attributeType.getSubstring();
+        MutableMatchingRuleImpl rule = attributeType.getSubstring();
 
         if ( rule == null )
         {

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sat Mar 12 19:05:17 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 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.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
 import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
@@ -713,7 +713,7 @@ public class GreaterEqTest
     public void testEvaluatorAttributeOrderingMatchingRule() throws Exception
     {
         MutableLdapSyntaxImpl syntax = new BogusSyntax( 1 );
-        MatchingRule mr = new MatchingRule( "1.1" );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( "1.1" );
         mr.setSyntax( syntax );
         mr.setLdapComparator( new StringComparator( "1.1" ) );
 

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sat Mar 12 19:05:17 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 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.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
 import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
@@ -741,7 +741,7 @@ public class LessEqTest
     {
         MutableLdapSyntaxImpl syntax = new BogusSyntax( 2 );
 
-        MatchingRule mr = new MatchingRule( "1.1" );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( "1.1" );
         mr.setSyntax( syntax );
         mr.setLdapComparator( new StringComparator( "1.1" ) );
 

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java Sat Mar 12 19:05:17 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.i18n.
 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.AbstractLdapComparator;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
@@ -169,7 +169,7 @@ public abstract class AbstractValue<T> i
     {
         if ( attributeType != null )
         {
-            MatchingRule mr = getMatchingRule();
+            MutableMatchingRuleImpl mr = getMatchingRule();
     
             if ( mr == null )
             {
@@ -194,11 +194,11 @@ public abstract class AbstractValue<T> i
      * @return a matchingRule or null if one cannot be found for the attributeType
      * @throws LdapException if resolution of schema entities fail
      */
-    protected final MatchingRule getMatchingRule() throws LdapException
+    protected final MutableMatchingRuleImpl getMatchingRule() throws LdapException
     {
         if ( attributeType != null )
         {
-            MatchingRule mr = attributeType.getEquality();
+            MutableMatchingRuleImpl mr = attributeType.getEquality();
     
             if ( mr == null )
             {
@@ -230,7 +230,7 @@ public abstract class AbstractValue<T> i
     {
         if ( attributeType != null )
         {
-            MatchingRule mr = getMatchingRule();
+            MutableMatchingRuleImpl mr = getMatchingRule();
     
             if ( mr == null )
             {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
    (empty)

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java Sat Mar 12 19:05:17 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
@@ -51,16 +51,16 @@ public class EntryUtils
         }
     }
 
-    public static MatchingRule matchingRuleFactory( String oid )
+    public static MutableMatchingRuleImpl matchingRuleFactory( String oid )
     {
-        MatchingRule matchingRule = new MatchingRule( oid );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( oid );
         
         return matchingRule;
     }
     /**
      * A local MatchingRule class for tests
      */
-    static class MR extends MatchingRule
+    static class MR extends MutableMatchingRuleImpl
     {
         private static final long serialVersionUID = 1L;
 
@@ -129,7 +129,7 @@ public class EntryUtils
             }
         } );
         
-        MatchingRule matchingRule = new MatchingRule( "1.1.2.1" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.2.1" );
         matchingRule.setSyntax( syntax );
 
 
@@ -199,7 +199,7 @@ public class EntryUtils
             }
         } );
         
-        MatchingRule matchingRule = new MatchingRule( "1.1.2" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.2" );
         matchingRule.setSyntax( syntax );
 
 
@@ -246,7 +246,7 @@ public class EntryUtils
             }
         } );
 
-        MatchingRule matchingRule = new MatchingRule( "1.2.2" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.2.2" );
         matchingRule.setSyntax( syntax );
 
         matchingRule.setLdapComparator( new ByteArrayComparator( "1.2.2" ) );

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java Sat Mar 12 19:05:17 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -211,7 +211,7 @@ public final class Ava implements Extern
             
         try
         {
-            MatchingRule equalityMatchingRule = attributeType.getEquality();
+            MutableMatchingRuleImpl equalityMatchingRule = attributeType.getEquality();
             
             if ( equalityMatchingRule != null )
             {
@@ -676,7 +676,7 @@ public final class Ava implements Extern
         {
             if ( schemaManager != null )
             {
-                MatchingRule equalityMatchingRule = attributeType.getEquality();
+                MutableMatchingRuleImpl equalityMatchingRule = attributeType.getEquality();
                 
                 if ( equalityMatchingRule != null )
                 {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java Sat Mar 12 19:05:17 2011
@@ -156,19 +156,19 @@ public class AttributeType extends Abstr
     private String equalityOid;
 
     /** The equality MatchingRule associated with the equalityID */
-    private MatchingRule equality;
+    private MutableMatchingRuleImpl equality;
 
     /** The substring OID associated with this AttributeType */
     private String substringOid;
 
     /** The substring MatchingRule associated with the substringID */
-    private MatchingRule substring;
+    private MutableMatchingRuleImpl substring;
 
     /** The ordering OID associated with this AttributeType */
     private String orderingOid;
 
     /** The ordering MatchingRule associated with the orderingID */
-    private MatchingRule ordering;
+    private MutableMatchingRuleImpl ordering;
 
     /** The superior AttributeType OID */
     private String superiorOid;
@@ -407,7 +407,7 @@ public class AttributeType extends Abstr
         // The equality MR. It can be null
         if ( equalityOid != null )
         {
-            MatchingRule currentEquality = null;
+            MutableMatchingRuleImpl currentEquality = null;
 
             try
             {
@@ -463,7 +463,7 @@ public class AttributeType extends Abstr
     {
         if ( orderingOid != null )
         {
-            MatchingRule currentOrdering = null;
+            MutableMatchingRuleImpl currentOrdering = null;
 
             try
             {
@@ -520,7 +520,7 @@ public class AttributeType extends Abstr
         // The Substring MR. It can be null
         if ( substringOid != null )
         {
-            MatchingRule currentSubstring = null;
+            MutableMatchingRuleImpl currentSubstring = null;
 
             try
             {
@@ -1184,7 +1184,7 @@ public class AttributeType extends Abstr
      *
      * @return the equality matching rule
      */
-    public MatchingRule getEquality()
+    public MutableMatchingRuleImpl getEquality()
     {
         return equality;
     }
@@ -1243,7 +1243,7 @@ public class AttributeType extends Abstr
      *
      * @param equality The Equality MR for this AttributeType
      */
-    public void setEquality( MatchingRule equality )
+    public void setEquality( MutableMatchingRuleImpl equality )
     {
         if ( locked )
         {
@@ -1263,7 +1263,7 @@ public class AttributeType extends Abstr
      *
      * @param newEquality The Equality MR for this AttributeType
      */
-    public void updateEquality( MatchingRule newEquality )
+    public void updateEquality( MutableMatchingRuleImpl newEquality )
     {
         if ( locked )
         {
@@ -1280,7 +1280,7 @@ public class AttributeType extends Abstr
      *
      * @return the Ordering matching rule
      */
-    public MatchingRule getOrdering()
+    public MutableMatchingRuleImpl getOrdering()
     {
         return ordering;
     }
@@ -1339,7 +1339,7 @@ public class AttributeType extends Abstr
      *
      * @param ordering The Ordering MR for this AttributeType
      */
-    public void setOrdering( MatchingRule ordering )
+    public void setOrdering( MutableMatchingRuleImpl ordering )
     {
         if ( locked )
         {
@@ -1359,7 +1359,7 @@ public class AttributeType extends Abstr
      *
      * @param newOrdering The Ordering MR for this AttributeType
      */
-    public void updateOrdering( MatchingRule newOrdering )
+    public void updateOrdering( MutableMatchingRuleImpl newOrdering )
     {
         if ( locked )
         {
@@ -1376,7 +1376,7 @@ public class AttributeType extends Abstr
      *
      * @return the Substr matching rule
      */
-    public MatchingRule getSubstring()
+    public MutableMatchingRuleImpl getSubstring()
     {
         return substring;
     }
@@ -1435,7 +1435,7 @@ public class AttributeType extends Abstr
      *
      * @param substring The Substr MR for this AttributeType
      */
-    public void setSubstring( MatchingRule substring )
+    public void setSubstring( MutableMatchingRuleImpl substring )
     {
         if ( locked )
         {
@@ -1455,7 +1455,7 @@ public class AttributeType extends Abstr
      *
      * @param newSubstring The Substr MR for this AttributeType
      */
-    public void updateSubstring( MatchingRule newSubstring )
+    public void updateSubstring( MutableMatchingRuleImpl newSubstring )
     {
         if ( locked )
         {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java Sat Mar 12 19:05:17 2011
@@ -409,7 +409,7 @@ public final class DescriptionUtils
      *            the MatchingRule to generate the description for
      * @return the MatchingRuleDescription string
      */
-    public static String getDescription( MatchingRule matchingRule )
+    public static String getDescription( MutableMatchingRuleImpl matchingRule )
     {
         StringBuilder buf = new StringBuilder( "( " );
         buf.append( matchingRule.getOid() );

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java Sat Mar 12 19:05:17 2011
@@ -91,7 +91,7 @@ public interface EntityFactory
      * @return A MatchingRule SchemaObject
      * @throws LdapException If the MatchingRule is invalid
      */
-    MatchingRule getMatchingRule( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName ) throws LdapException;
+    MutableMatchingRuleImpl getMatchingRule( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName ) throws LdapException;
 
 
     /**

Copied: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableMatchingRuleImpl.java (from r1080975, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableMatchingRuleImpl.java?p2=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableMatchingRuleImpl.java&p1=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java&r1=1080975&r2=1080977&rev=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableMatchingRuleImpl.java Sat Mar 12 19:05:17 2011
@@ -82,15 +82,15 @@ import org.slf4j.LoggerFactory;
  * @see <a
  *      href="http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-11.txt">ldapbis
  *      [MODELS]</a>
- * @see DescriptionUtils#getDescription(MatchingRule)
+ * @see DescriptionUtils#getDescription(MutableMatchingRuleImpl)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MatchingRule extends AbstractMutableSchemaObject
+public class MutableMatchingRuleImpl extends AbstractMutableSchemaObject implements MatchingRule
 {
     private static final long serialVersionUID = 1L;
 
     /** A logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( MatchingRule.class );
+    private static final Logger LOG = LoggerFactory.getLogger( MutableMatchingRuleImpl.class );
 
     /** The associated Comparator */
     protected AbstractLdapComparator<? super Object> ldapComparator;
@@ -110,7 +110,7 @@ public class MatchingRule extends Abstra
      *
      * @param oid The MatchingRule OID
      */
-    public MatchingRule( String oid )
+    public MutableMatchingRuleImpl( String oid )
     {
         super( SchemaObjectType.MATCHING_RULE, oid );
     }
@@ -231,10 +231,8 @@ public class MatchingRule extends Abstra
     }
 
 
-    /**
-     * Gets the LdapSyntax used by this MatchingRule.
-     * 
-     * @return the LdapSyntax of this MatchingRule
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.MatchingRule#getSyntax()
      */
     public MutableLdapSyntax getSyntax()
     {
@@ -242,11 +240,8 @@ public class MatchingRule extends Abstra
     }
 
 
-    /**
-     * Gets the LdapSyntax OID used by this MatchingRule.
-     * 
-     * @return the LdapSyntax of this MatchingRule
-     * @throws NamingException if there is a failure resolving the object
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.MatchingRule#getSyntaxOid()
      */
     public String getSyntaxOid()
     {
@@ -310,12 +305,8 @@ public class MatchingRule extends Abstra
     }
 
 
-    /**
-     * Gets the LdapComparator enabling the use of this MatchingRule for ORDERING
-     * and sorted indexing.
-     * 
-     * @return the ordering LdapComparator
-     * @throws NamingException if there is a failure resolving the object
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.MatchingRule#getLdapComparator()
      */
     public AbstractLdapComparator<? super Object> getLdapComparator()
     {
@@ -360,12 +351,8 @@ public class MatchingRule extends Abstra
     }
 
 
-    /**
-     * Gets the Normalizer enabling the use of this MatchingRule for EQUALITY
-     * matching and indexing.
-     * 
-     * @return the associated normalizer
-     * @throws NamingException if there is a failure resolving the object
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.MatchingRule#getNormalizer()
      */
     public MutableNormalizer getNormalizer()
     {
@@ -417,12 +404,12 @@ public class MatchingRule extends Abstra
     }
 
 
-    /**
-     * Copy an MatchingRule
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.MatchingRule#copy()
      */
     public MatchingRule copy()
     {
-        MatchingRule copy = new MatchingRule( oid );
+        MutableMatchingRuleImpl copy = new MutableMatchingRuleImpl( oid );
 
         // Copy the SchemaObject common data
         copy.copy( this );
@@ -450,12 +437,12 @@ public class MatchingRule extends Abstra
             return false;
         }
 
-        if ( !( o instanceof MatchingRule ) )
+        if ( !( o instanceof MutableMatchingRuleImpl ) )
         {
             return false;
         }
 
-        MatchingRule that = ( MatchingRule ) o;
+        MutableMatchingRuleImpl that = ( MutableMatchingRuleImpl ) o;
 
         // Check the Comparator
         if ( ldapComparator != null )



Mime
View raw message