You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/03/18 10:40:00 UTC
svn commit: r519582 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema:
SchemaManager.java SchemaService.java
Author: elecharny
Date: Sun Mar 18 02:39:56 2007
New Revision: 519582
URL: http://svn.apache.org/viewvc?view=rev&rev=519582
Log:
Removed the "matchingRulesUse" 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/SchemaManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
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=519582&r1=519581&r2=519582
==============================================================================
--- 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:39:56 2007
@@ -104,7 +104,7 @@
SchemaConstants.MATCHING_RULES_AT,
"attributeTypes",
SchemaConstants.OBJECT_CLASSES_AT,
- "matchingRuleUse",
+ SchemaConstants.MATCHING_RULE_USE_AT,
"dITStructureRules",
"dITContentRules",
"nameForms"
@@ -162,7 +162,7 @@
VALID_OU_VALUES.add( "syntaxcheckers" );
VALID_OU_VALUES.add( "syntaxes" );
VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULES_AT );
- VALID_OU_VALUES.add( "matchingruleuse" );
+ VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULE_USE_AT );
VALID_OU_VALUES.add( "attributetypes" );
VALID_OU_VALUES.add( "objectclasses" );
VALID_OU_VALUES.add( "nameforms" );
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=519582&r1=519581&r2=519582
==============================================================================
--- 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:39:56 2007
@@ -627,9 +627,9 @@
attrs.put( attr );
}
- if ( returnAllOperationalAttributes || set.contains( "matchingruleuse" ) )
+ if ( returnAllOperationalAttributes || set.contains( SchemaConstants.MATCHING_RULE_USE_AT ) )
{
- attr = new AttributeImpl( "matchingRuleUse" );
+ attr = new AttributeImpl( SchemaConstants.MATCHING_RULE_USE_AT );
Iterator list = registries.getMatchingRuleUseRegistry().iterator();
while ( list.hasNext() )