directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r519581 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema: MetaMatchingRuleHandler.java SchemaManager.java SchemaService.java SchemaSubentryModifier.java
Date Sun, 18 Mar 2007 09:34:26 GMT
Author: elecharny
Date: Sun Mar 18 02:34:25 2007
New Revision: 519581

URL: http://svn.apache.org/viewvc?view=rev&rev=519581
Log:
Removed the "matchingRules" from the code (except from tests and antlr files) and replaced
it by 
a reference to the constant declared in the new SchemaConstants class in shared-ldap-constants

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java?view=diff&rev=519581&r1=519580&r2=519581
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
Sun Mar 18 02:34:25 2007
@@ -30,6 +30,7 @@
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -237,7 +238,7 @@
                 ResultCodeEnum.NAMING_VIOLATION );
         }
         
-        if ( ! ( ( String ) rdn.getValue() ).equalsIgnoreCase( "matchingRules" ) )
+        if ( ! ( ( String ) rdn.getValue() ).equalsIgnoreCase( SchemaConstants.MATCHING_RULES_AT
) )
         {
             throw new LdapInvalidNameException( 
                 "The parent entry of a syntax should have a relative name of ou=matchingRules.",


Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?view=diff&rev=519581&r1=519580&r2=519581
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
Sun Mar 18 02:34:25 2007
@@ -101,7 +101,7 @@
         "normalizers",
         "syntaxCheckers",
         SchemaConstants.LDAP_SYNTAXES_AT,
-        "matchingRules",
+        SchemaConstants.MATCHING_RULES_AT,
         "attributeTypes",
         SchemaConstants.OBJECT_CLASSES_AT,
         "matchingRuleUse",
@@ -161,7 +161,7 @@
         VALID_OU_VALUES.add( "comparators" );
         VALID_OU_VALUES.add( "syntaxcheckers" );
         VALID_OU_VALUES.add( "syntaxes" );
-        VALID_OU_VALUES.add( "matchingrules" );
+        VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULES_AT );
         VALID_OU_VALUES.add( "matchingruleuse" );
         VALID_OU_VALUES.add( "attributetypes" );
         VALID_OU_VALUES.add( "objectclasses" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=519581&r1=519580&r2=519581
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Sun Mar 18 02:34:25 2007
@@ -613,9 +613,9 @@
             attrs.put( attr );
         }
 
-        if ( returnAllOperationalAttributes || set.contains( "matchingrules" ) )
+        if ( returnAllOperationalAttributes || set.contains( SchemaConstants.MATCHING_RULES_AT
) )
         {
-            attr = new AttributeImpl( "matchingRules" );
+            attr = new AttributeImpl( SchemaConstants.MATCHING_RULES_AT );
             Iterator<MatchingRule> list = registries.getMatchingRuleRegistry().iterator();
             
             while ( list.hasNext() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?view=diff&rev=519581&r1=519580&r2=519581
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
Sun Mar 18 02:34:25 2007
@@ -95,7 +95,7 @@
         }
         else if ( obj instanceof MatchingRule )
         {
-            buf.append( "matchingRules" );
+            buf.append( SchemaConstants.MATCHING_RULES_AT );
         }
         else if ( obj instanceof AttributeType )
         {



Mime
View raw message