Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 5236 invoked from network); 22 Jul 2007 18:35:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Jul 2007 18:35:55 -0000 Received: (qmail 15667 invoked by uid 500); 22 Jul 2007 18:35:56 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 15605 invoked by uid 500); 22 Jul 2007 18:35:56 -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 15590 invoked by uid 99); 22 Jul 2007 18:35:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2007 11:35:56 -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; Sun, 22 Jul 2007 11:35:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C7A151A981A; Sun, 22 Jul 2007 11:35:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r558524 - in /directory/shared/trunk: ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java Date: Sun, 22 Jul 2007 18:35:33 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070722183533.C7A151A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Jul 22 11:35:31 2007 New Revision: 558524 URL: http://svn.apache.org/viewvc?view=rev&rev=558524 Log: adding some more schema constants and using in a syntax checker Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?view=diff&rev=558524&r1=558523&r2=558524 ============================================================================== --- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original) +++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Sun Jul 22 11:35:31 2007 @@ -256,10 +256,24 @@ String GENERALIZED_TIME_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.24"; String INTEGER_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.27"; String UTC_TIME_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.53"; + String DIRECTORY_STRING_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.15"; String JAVA_BYTE_SYNTAX = "1.3.6.1.4.1.18060.0.4.1.0.0"; String JAVA_CHAR_SYNTAX = "1.3.6.1.4.1.18060.0.4.1.0.1"; String JAVA_SHORT_SYNTAX = "1.3.6.1.4.1.18060.0.4.1.0.2"; String JAVA_LONG_SYNTAX = "1.3.6.1.4.1.18060.0.4.1.0.3"; String JAVA_INT_SYNTAX = "1.3.6.1.4.1.18060.0.4.1.0.4"; + + // ---- MatchingRules ----------------------------------------------------- + + String CASE_IGNORE_MR = "caseIgnoreMatch"; + String CASE_IGNORE_SUBSTRING_MR = "caseIgnoreSubstringsMatch"; + String CASE_EXACT_MR = "caseExactMatch"; + String CASE_EXACT_SUBSTRING_MR = "caseExactSubstringsMatch"; + String INTEGER_MR = "integerMatch"; + String INTEGER_ORDERING_MR = "integerOrderingMatch"; + String BOOLEAN_MR = "booleanMatch"; + String BIT_STRING_MR = "bitStringMatch"; + String GENERALIZED_TIME_MR = "generalizedTimeMatch"; + String GENERALIZED_TIME_ORDERING_MR = "generalizedTimeOrderingMatch"; } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java?view=diff&rev=558524&r1=558523&r2=558524 ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java Sun Jul 22 11:35:31 2007 @@ -21,6 +21,7 @@ import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.ldap.constants.SchemaConstants; /** @@ -34,10 +35,6 @@ */ public class DirectoryStringSyntaxChecker extends AbstractSyntaxChecker { - /** The Syntax OID, according to RFC 4517, par. 3.3.6 */ - private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.15"; - - /** * * Creates a new instance of DirectoryStringSyntaxChecker. @@ -45,7 +42,7 @@ */ public DirectoryStringSyntaxChecker() { - super( SC_OID ); + super( SchemaConstants.DIRECTORY_STRING_SYNTAX ); }