Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28069 invoked from network); 2 Apr 2007 14:05:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2007 14:05:04 -0000 Received: (qmail 67919 invoked by uid 500); 2 Apr 2007 14:05:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67860 invoked by uid 500); 2 Apr 2007 14:05:11 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 67849 invoked by uid 99); 2 Apr 2007 14:05:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 07:05:11 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 07:05:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 22CF61A9838; Mon, 2 Apr 2007 07:04:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070402140443.22CF61A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 VALID_OU_VALUES = new HashSet(); 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 );