From commits-return-10744-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Nov 01 20:36:23 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 72972 invoked from network); 1 Nov 2006 20:36:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Nov 2006 20:36:21 -0000 Received: (qmail 31623 invoked by uid 500); 1 Nov 2006 20:36:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 31570 invoked by uid 500); 1 Nov 2006 20:36:32 -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 31558 invoked by uid 99); 1 Nov 2006 20:36:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 12:36:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 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; Wed, 01 Nov 2006 12:36:19 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 349561A9846; Wed, 1 Nov 2006 12:35:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470089 - /directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Date: Wed, 01 Nov 2006 20:35:55 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061101203555.349561A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Nov 1 12:35:54 2006 New Revision: 470089 URL: http://svn.apache.org/viewvc?view=rev&rev=470089 Log: Fixed javadoc Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?view=diff&rev=470089&r1=470088&r2=470089 ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Wed Nov 1 12:35:54 2006 @@ -394,7 +394,7 @@ /** * Parse a number following the rules : * - * ::= ::= | e + * <number> ::= <digit> <digits> <digits> ::= <digit> <digits> | e <digit> * ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' * * Check that the number is in the interval @@ -673,15 +673,15 @@ } /** - * Parse a control. The grammar is : ::= "control:" - * ::= - * | e ::= "true" | "false" ::= - * | e ::= ":" | "::" - * | ":<" - * - * It can be read as : "control:" [ " "+ ( "true" | - * "false") ] [ ":" | "::" | ":<" - * ] + * Parse a control. The grammar is : <control> ::= "control:" <fill> + * <ldap-oid> <critical-e> <value-spec-e> <sep> <critical-e> ::= <spaces> + * <boolean> | e <boolean> ::= "true" | "false" <value-spec-e> ::= + * <value-spec> | e <value-spec> ::= ":" <fill> <SAFE-STRING-e> | "::" + * <fill> <BASE64-STRING> | ":<" <fill> <url> + * + * It can be read as : "control:" <fill> <ldap-oid> [ " "+ ( "true" | + * "false") ] [ ":" <fill> <SAFE-STRING-e> | "::" <fill> <BASE64-STRING> | ":<" + * <fill> <url> ] * * @param line * The line containing the control @@ -923,13 +923,13 @@ /** * Parse a modify change type. * - * The grammar is : ::= "changetype:" FILL "modify" SEP - * ::= "add:" | "delete:" - * | "replace:" ::= - * | e ::= FILL ATTRIBUTE-DESCRIPTION SEP - * ATTRVAL-SPEC "-" SEP ::= FILL - * ATTRIBUTE-DESCRIPTION SEP "-" SEP ::= - * ATTRVAL-SPEC | e * + * The grammar is : <changerecord> ::= "changetype:" FILL "modify" SEP + * <mod-spec> <mod-specs-e> <mod-spec> ::= "add:" <mod-val> | "delete:" + * <mod-val-del> | "replace:" <mod-val> <mod-specs-e> ::= <mod-spec> + * <mod-specs-e> | e <mod-val> ::= FILL ATTRIBUTE-DESCRIPTION SEP + * ATTRVAL-SPEC <attrval-specs-e> "-" SEP <mod-val-del> ::= FILL + * ATTRIBUTE-DESCRIPTION SEP <attrval-specs-e> "-" SEP <attrval-specs-e> ::= + * ATTRVAL-SPEC <attrval-specs> | e * * * @param entry * The entry to feed @@ -1054,18 +1054,18 @@ * "newrdn:" and a "deleteoldrdn:" 4) ModRDN : the very same, but a * "newsuperior:" line is expected 5) Modify : * - * The grammar is : ::= "changetype:" FILL "add" SEP - * | "changetype:" FILL "delete" | - * "changetype:" FILL "modrdn" SEP SEP SEP | // To - * be checked "changetype:" FILL "moddn" SEP SEP SEP - * SEP | "changetype:" FILL "modify" SEP - * ::= "newrdn:" FILL RDN | "newrdn::" FILL - * BASE64-RDN ::= "deleteoldrdn:" FILL "0" | "deleteoldrdn:" - * FILL "1" ::= "newsuperior:" FILL DN | "newsuperior::" FILL - * BASE64-DN ::= | e ::= - * "add:" | "delete:" | "replace:" - * ::= FILL ATTRIBUTE-DESCRIPTION SEP ATTRVAL-SPEC "-" SEP - * ::= ATTRVAL-SPEC | e + * The grammar is : <changerecord> ::= "changetype:" FILL "add" SEP + * <attrval-spec> <attrval-specs-e> | "changetype:" FILL "delete" | + * "changetype:" FILL "modrdn" SEP <newrdn> SEP <deleteoldrdn> SEP | // To + * be checked "changetype:" FILL "moddn" SEP <newrdn> SEP <deleteoldrdn> SEP + * <newsuperior> SEP | "changetype:" FILL "modify" SEP <mod-spec> + * <mod-specs-e> <newrdn> ::= "newrdn:" FILL RDN | "newrdn::" FILL + * BASE64-RDN <deleteoldrdn> ::= "deleteoldrdn:" FILL "0" | "deleteoldrdn:" + * FILL "1" <newsuperior> ::= "newsuperior:" FILL DN | "newsuperior::" FILL + * BASE64-DN <mod-specs-e> ::= <mod-spec> <mod-specs-e> | e <mod-spec> ::= + * "add:" <mod-val> | "delete:" <mod-val> | "replace:" <mod-val> <mod-val> + * ::= FILL ATTRIBUTE-DESCRIPTION SEP ATTRVAL-SPEC <attrval-specs-e> "-" SEP + * <attrval-specs-e> ::= ATTRVAL-SPEC <attrval-specs> | e * * @param entry * The entry to feed @@ -1152,12 +1152,12 @@ /** * Parse a ldif file. The following rules are processed : * - * ::= | - * ::= - * ::= - * ::= "dn:" - * | "dn::" - * ::= "changetype:" + * <ldif-file> ::= <ldif-attrval-record> <ldif-attrval-records> | + * <ldif-change-record> <ldif-change-records> <ldif-attrval-record> ::= + * <dn-spec> <sep> <attrval-spec> <attrval-specs> <ldif-change-record> ::= + * <dn-spec> <sep> <controls-e> <changerecord> <dn-spec> ::= "dn:" <fill> + * <distinguishedName> | "dn::" <fill> <base64-distinguishedName> + * <changerecord> ::= "changetype:" <fill> <change-op> */ private Entry parseEntry() throws NamingException {