directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r524788 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
Date Mon, 02 Apr 2007 14:04:43 GMT
Author: elecharny
Date: Mon Apr  2 07:04:42 2007
New Revision: 524788

URL: http://svn.apache.org/viewvc?view=rev&rev=524788
Log:
Removed the last schema static strings to replace them by SchemaConstants elements, except
for "syntaxes" (not sure this constant should be declared anyway ...)

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.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=524788&r1=524787&r2=524788
==============================================================================
--- 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
Mon Apr  2 07:04:42 2007
@@ -97,9 +97,9 @@
 
     private static final Set<String> VALID_OU_VALUES = new HashSet<String>();
     private static final String[] opAttrs = new String[] {
-        "comparators",
-        "normalizers",
-        "syntaxCheckers",
+        SchemaConstants.COMPARATORS_AT,
+        SchemaConstants.NORMALIZERS_AT,
+        SchemaConstants.SYNTAX_CHECKERS_AT,
         SchemaConstants.LDAP_SYNTAXES_AT,
         SchemaConstants.MATCHING_RULES_AT,
         SchemaConstants.ATTRIBUTE_TYPES_AT,
@@ -157,9 +157,9 @@
     
     static 
     {
-        VALID_OU_VALUES.add( "normalizers".toLowerCase() );
-        VALID_OU_VALUES.add( "comparators".toLowerCase() );
-        VALID_OU_VALUES.add( "syntaxcheckers".toLowerCase() );
+        VALID_OU_VALUES.add( SchemaConstants.NORMALIZERS_AT.toLowerCase() );
+        VALID_OU_VALUES.add( SchemaConstants.COMPARATORS_AT.toLowerCase() );
+        VALID_OU_VALUES.add( SchemaConstants.SYNTAX_CHECKERS_AT.toLowerCase() );
         VALID_OU_VALUES.add( "syntaxes".toLowerCase() );
         VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULES_AT.toLowerCase() );
         VALID_OU_VALUES.add( SchemaConstants.MATCHING_RULE_USE_AT.toLowerCase() );
@@ -209,13 +209,13 @@
         
         OidRegistry oidRegistry = globalRegistries.getOidRegistry();
         
-        comparatorsOid = oidRegistry.getOid( ApacheSchemaConstants.COMPARATORS_AT );
+        comparatorsOid = oidRegistry.getOid( SchemaConstants.COMPARATORS_AT );
         opAttr2handlerIndex.put( comparatorsOid, new Integer( COMPARATOR_INDEX ) );
         
-        normalizersOid = oidRegistry.getOid( ApacheSchemaConstants.NORMALIZERS_AT );
+        normalizersOid = oidRegistry.getOid( SchemaConstants.NORMALIZERS_AT );
         opAttr2handlerIndex.put( normalizersOid, new Integer( NORMALIZER_INDEX ) );
         
-        syntaxCheckersOid = oidRegistry.getOid( ApacheSchemaConstants.SYNTAX_CHECKERS_AT
);
+        syntaxCheckersOid = oidRegistry.getOid( SchemaConstants.SYNTAX_CHECKERS_AT );
         opAttr2handlerIndex.put( syntaxCheckersOid, new Integer( SYNTAX_CHECKER_INDEX ) );
         
         ldapSyntaxesOid = oidRegistry.getOid( SchemaConstants.LDAP_SYNTAXES_AT );



Mime
View raw message