values )
- {
- this.values = values;
- }
-
-
public void addValue( String value )
{
this.values.add( value );
}
-
}
+ static class NoidLen
+ {
+ String noid = "";
+ int len = 0;
+ }
}
@@ -167,7 +141,7 @@
*/
objectClassDescription returns [ObjectClassDescription ocd = new ObjectClassDescription()]
:
- ( oid:STARTNUMERICOID { ocd.setOid(numericoid(oid.getText())); } )
+ ( oid:STARTNUMERICOID { ocd.setNumericOid(numericoid(oid.getText())); } )
(
( name:NAME { ocd.setNames(qdescrs(name.getText())); } )
|
@@ -190,13 +164,128 @@
|
( extension:EXTENSION {
Extension ex = extension(extension.getText());
- ocd.addExtension(ex.getKey(), ex.getValues());
+ ocd.addExtension(ex.key, ex.values);
} )
)*
RPAR
;
+ /**
+ * Production for matching attribute type descriptions. It is fault-tolerant
+ * against element ordering.
+ *
+ *
+ * AttributeTypeDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+ * [ SP "DESC" SP qdstring ] ; description
+ * [ SP "OBSOLETE" ] ; not active
+ * [ SP "SUP" SP oid ] ; supertype
+ * [ SP "EQUALITY" SP oid ] ; equality matching rule
+ * [ SP "ORDERING" SP oid ] ; ordering matching rule
+ * [ SP "SUBSTR" SP oid ] ; substrings matching rule
+ * [ SP "SYNTAX" SP noidlen ] ; value syntax
+ * [ SP "SINGLE-VALUE" ] ; single-value
+ * [ SP "COLLECTIVE" ] ; collective
+ * [ SP "NO-USER-MODIFICATION" ] ; not user modifiable
+ * [ SP "USAGE" SP usage ] ; usage
+ * extensions WSP RPAREN ; extensions
+ *
+ * usage = "userApplications" / ; user
+ * "directoryOperation" / ; directory operational
+ * "distributedOperation" / ; DSA-shared operational
+ * "dSAOperation" ; DSA-specific operational
+ *
+ * extensions = *( SP xstring SP qdstrings )
+ * xstring = "X" HYPHEN 1*( ALPHA / HYPHEN / USCORE )
+ *
+ */
+attributeTypeDescription returns [AttributeTypeDescription atd = new AttributeTypeDescription()]
+ :
+ ( oid:STARTNUMERICOID { atd.setNumericOid(numericoid(oid.getText())); } )
+ (
+ ( name:NAME { atd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { atd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( OBSOLETE { atd.setObsolete( true ); } )
+ |
+ ( sup:SUP { atd.setSuperType(oid(sup.getText())); } )
+ |
+ ( equality:EQUALITY { atd.setEqualityMatchingRule(oid(equality.getText())); } )
+ |
+ ( ordering:ORDERING { atd.setOrderingMatchingRule(oid(ordering.getText())); } )
+ |
+ ( substr:SUBSTR { atd.setSubstringsMatchingRule(oid(substr.getText())); } )
+ |
+ ( syntax:SYNTAX {
+ NoidLen noidlen = noidlen(syntax.getText());
+ atd.setSyntax(noidlen.noid);
+ atd.setSyntaxLength(noidlen.len);
+ } )
+ |
+ ( SINGLE_VALUE { atd.setSingleValued( true ); } )
+ |
+ ( COLLECTIVE { atd.setCollective( true ); } )
+ |
+ ( NO_USER_MODIFICATION { atd.setUserModifiable( false ); } )
+ |
+ ( USAGE (WHSP)* USER_APPLICATIONS { atd.setUsage( AttributeTypeDescription.Usage.USER_APPLICATIONS ); }
+ |
+ USAGE DIRECTORY_OPERATION { atd.setUsage( AttributeTypeDescription.Usage.DIRECTORY_OPERATION ); }
+ |
+ USAGE DISTRIBUTED_OPERATION { atd.setUsage( AttributeTypeDescription.Usage.DISTRIBUTED_OPERATION ); }
+ |
+ USAGE DSA_OPERATION { atd.setUsage( AttributeTypeDescription.Usage.DSA_OPERATION ); }
+ )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ atd.addExtension(ex.key, ex.values);
+ } )
+ )*
+ RPAR
+ ;
+
+
+ /**
+ * Production for matching ldap syntax descriptions. It is fault-tolerant
+ * against element ordering.
+ *
+ *
+ * SyntaxDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "DESC" SP qdstring ] ; description
+ * extensions WSP RPAREN ; extensions
+ *
+ */
+ldapSyntaxDescription returns [LdapSyntaxDescription lsd = new LdapSyntaxDescription()]
+ :
+ ( oid:STARTNUMERICOID { lsd.setNumericOid(numericoid(oid.getText())); } )
+ (
+ ( desc:DESC { lsd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ lsd.addExtension(ex.key, ex.values);
+ } )
+ )*
+ RPAR
+ ;
+
+
+noidlen [String s] returns [NoidLen noidlen]
+ {
+ noidlen = new NoidLen();
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
+ noidlen = parser.noidlen();
+ }
+ :
+ ;
+
+
extension [String s] returns [Extension extension]
{
extension = new Extension();
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java (Revision 0)
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+
+import java.text.ParseException;
+
+import javax.naming.NamingException;
+
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+
+/**
+ * A SyntaxChecker which verifies that a value follows the
+ * attribute type descripton syntax according to RFC 4512, par 4.2.2:
+ *
+*
+ * AttributeTypeDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+ * [ SP "DESC" SP qdstring ] ; description
+ * [ SP "OBSOLETE" ] ; not active
+ * [ SP "SUP" SP oid ] ; supertype
+ * [ SP "EQUALITY" SP oid ] ; equality matching rule
+ * [ SP "ORDERING" SP oid ] ; ordering matching rule
+ * [ SP "SUBSTR" SP oid ] ; substrings matching rule
+ * [ SP "SYNTAX" SP noidlen ] ; value syntax
+ * [ SP "SINGLE-VALUE" ] ; single-value
+ * [ SP "COLLECTIVE" ] ; collective
+ * [ SP "NO-USER-MODIFICATION" ] ; not user modifiable
+ * [ SP "USAGE" SP usage ] ; usage
+ * extensions WSP RPAREN ; extensions
+ *
+ * usage = "userApplications" / ; user
+ * "directoryOperation" / ; directory operational
+ * "distributedOperation" / ; DSA-shared operational
+ * "dSAOperation" ; DSA-specific operational
+ *
+ * extensions = *( SP xstring SP qdstrings )
+ * xstring = "X" HYPHEN 1*( ALPHA / HYPHEN / USCORE )
+ *
+ * Each attribute type description must contain at least one of the SUP
+ * or SYNTAX fields.
+ *
+ * COLLECTIVE requires usage userApplications.
+ *
+ * NO-USER-MODIFICATION requires an operational usage.
+ *
+ *
+ *
+ *
+ * @author Apache Directory Project
+ * @version $Rev$
+ */
+public class AttributeTypeDescriptionSyntaxChecker implements SyntaxChecker
+{
+
+ /** The Syntax OID, according to RFC 4517, par. 3.3.1 */
+ public static final String OID = "1.3.6.1.4.1.1466.115.121.1.3";
+
+ /** The schema parser used to parse the AttributeTypeDescription Syntax */
+ private AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
+
+
+ /**
+ *
+ * Creates a new instance of AttributeTypeDescriptionSchemaParser.
+ *
+ */
+ public AttributeTypeDescriptionSyntaxChecker()
+ {
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#getSyntaxOid()
+ */
+ public String getSyntaxOid()
+ {
+ return OID;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#assertSyntax(java.lang.Object)
+ */
+ public void assertSyntax( Object value ) throws NamingException
+ {
+ if ( !isValidSyntax( value ) )
+ {
+ throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
+ }
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+ */
+ public boolean isValidSyntax( Object value )
+ {
+ String strValue;
+
+ if ( value == null )
+ {
+ return false;
+ }
+
+ if ( value instanceof String )
+ {
+ strValue = ( String ) value;
+ }
+ else if ( value instanceof byte[] )
+ {
+ strValue = StringTools.utf8ToString( ( byte[] ) value );
+ }
+ else
+ {
+ strValue = value.toString();
+ }
+
+ try
+ {
+ AttributeTypeDescription atd = schemaParser.parseAttributeTypeDescription( strValue );
+
+ // SYNTAX or SUP must be contained
+ if(atd.getSyntax() == null && atd.getSuperType() == null) {
+ return false;
+ }
+
+ // COLLECTIVE requires usage userApplications
+ if(atd.isCollective() && atd.getUsage() != AttributeTypeDescription.Usage.USER_APPLICATIONS) {
+ return false;
+ }
+
+ // NO-USER-MODIFICATION requires an operational usage.
+ if(!atd.isUserModifiable() && atd.getUsage() == AttributeTypeDescription.Usage.USER_APPLICATIONS) {
+ return false;
+ }
+
+ return true;
+ }
+ catch ( ParseException pe )
+ {
+ return false;
+ }
+ }
+}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java (Revision 0)
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+
+import java.text.ParseException;
+
+import javax.naming.NamingException;
+
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.schema.syntax.parser.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+
+/**
+ * A SyntaxChecker which verifies that a value follows the
+ * LDAP syntax descripton syntax according to RFC 4512, par 4.2.2:
+ *
+ *
+ * SyntaxDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "DESC" SP qdstring ] ; description
+ * extensions WSP RPAREN ; extensions
+ *
+ *
+ * @author Apache Directory Project
+ * @version $Rev$
+ */
+public class LdapSyntaxDescriptionSyntaxChecker implements SyntaxChecker
+{
+
+ /** The Syntax OID, according to RFC 4517, par. 3.3.18 */
+ public static final String OID = "1.3.6.1.4.1.1466.115.121.1.54";
+
+ /** The schema parser used to parse the LdapSyntaxDescription Syntax */
+ private LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
+
+
+ /**
+ *
+ * Creates a new instance of AttributeTypeDescriptionSchemaParser.
+ *
+ */
+ public LdapSyntaxDescriptionSyntaxChecker()
+ {
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#getSyntaxOid()
+ */
+ public String getSyntaxOid()
+ {
+ return OID;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#assertSyntax(java.lang.Object)
+ */
+ public void assertSyntax( Object value ) throws NamingException
+ {
+ if ( !isValidSyntax( value ) )
+ {
+ throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
+ }
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+ */
+ public boolean isValidSyntax( Object value )
+ {
+ String strValue;
+
+ if ( value == null )
+ {
+ return false;
+ }
+
+ if ( value instanceof String )
+ {
+ strValue = ( String ) value;
+ }
+ else if ( value instanceof byte[] )
+ {
+ strValue = StringTools.utf8ToString( ( byte[] ) value );
+ }
+ else
+ {
+ strValue = value.toString();
+ }
+
+ try
+ {
+ schemaParser.parseLdapSyntaxDescription( strValue );
+ return true;
+ }
+ catch ( ParseException pe )
+ {
+ return false;
+ }
+ }
+}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java (Revision 485856)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java (Arbeitskopie)
@@ -39,7 +39,7 @@
ABSTRACT, STRUCTURAL, AUXILIARY
}
- private String oid;
+ private String numericOid;
private List names;
@@ -60,7 +60,7 @@
public ObjectClassDescription()
{
- this.oid = "";
+ this.numericOid = "";
names = new ArrayList();
description = "";
isObsolete = false;
@@ -146,13 +146,13 @@
public String getNumericOid()
{
- return oid;
+ return numericOid;
}
- public void setOid( String oid )
+ public void setNumericOid( String numericOid )
{
- this.oid = oid;
+ this.numericOid = numericOid;
}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java (Revision 0)
@@ -0,0 +1,278 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.shared.ldap.schema.syntax;
+
+
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * RFC 4512 - 4.1.2. Attribute Types
+ *
+ * @author Apache Directory Project
+ */
+public class AttributeTypeDescription
+{
+ public static enum Usage
+ {
+ USER_APPLICATIONS, DIRECTORY_OPERATION, DISTRIBUTED_OPERATION, DSA_OPERATION
+ }
+
+ private String numericOid;
+
+ private List names;
+
+ private String description;
+
+ private boolean isObsolete;
+
+ private String superType;
+
+ private String equalityMatchingRule;
+
+ private String orderingMatchingRule;
+
+ private String substringsMatchingRule;
+
+ private String syntax;
+
+ private int syntaxLength;
+
+ private boolean isSingleValued;
+
+ private boolean isCollective;
+
+ private boolean isUserModifiable;
+
+ private Usage usage;
+
+ private Map> extensions;
+
+
+ public AttributeTypeDescription( )
+ {
+ this.numericOid = "";
+ names = new ArrayList();
+ description = "";
+ isObsolete = false;
+ superType = null;
+ equalityMatchingRule = null;
+ orderingMatchingRule = null;
+ substringsMatchingRule = null;
+ syntax = null;
+ syntaxLength = 0;
+ isSingleValued = false;
+ isCollective = false;
+ isUserModifiable = true;
+ usage = Usage.USER_APPLICATIONS;
+ extensions = new LinkedHashMap>();;
+ }
+
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
+
+ public String getEqualityMatchingRule()
+ {
+ return equalityMatchingRule;
+ }
+
+
+ public void setEqualityMatchingRule( String equalityMatchingRule )
+ {
+ this.equalityMatchingRule = equalityMatchingRule;
+ }
+
+
+ public Map> getExtensions()
+ {
+ return extensions;
+ }
+
+
+ public void setExtensions( Map> extensions )
+ {
+ this.extensions = extensions;
+ }
+
+
+ public boolean isCollective()
+ {
+ return isCollective;
+ }
+
+
+ public void setCollective( boolean isCollective )
+ {
+ this.isCollective = isCollective;
+ }
+
+
+ public boolean isObsolete()
+ {
+ return isObsolete;
+ }
+
+
+ public void setObsolete( boolean isObsolete )
+ {
+ this.isObsolete = isObsolete;
+ }
+
+
+ public boolean isUserModifiable()
+ {
+ return isUserModifiable;
+ }
+
+
+ public void setUserModifiable( boolean isUserModifiable )
+ {
+ this.isUserModifiable = isUserModifiable;
+ }
+
+
+ public List getNames()
+ {
+ return names;
+ }
+
+
+ public void setNames( List names )
+ {
+ this.names = names;
+ }
+
+
+ public String getNumericOid()
+ {
+ return numericOid;
+ }
+
+
+ public void setNumericOid( String oid )
+ {
+ this.numericOid = oid;
+ }
+
+
+ public String getOrderingMatchingRule()
+ {
+ return orderingMatchingRule;
+ }
+
+
+ public void setOrderingMatchingRule( String orderingMatchingRule )
+ {
+ this.orderingMatchingRule = orderingMatchingRule;
+ }
+
+
+ public boolean isSingleValued()
+ {
+ return isSingleValued;
+ }
+
+
+ public void setSingleValued( boolean singleValued )
+ {
+ this.isSingleValued = singleValued;
+ }
+
+
+ public String getSubstringsMatchingRule()
+ {
+ return substringsMatchingRule;
+ }
+
+
+ public void setSubstringsMatchingRule( String substringsMatchingRule )
+ {
+ this.substringsMatchingRule = substringsMatchingRule;
+ }
+
+
+ public String getSuperType()
+ {
+ return superType;
+ }
+
+
+ public void setSuperType( String superType )
+ {
+ this.superType = superType;
+ }
+
+
+ public String getSyntax()
+ {
+ return syntax;
+ }
+
+
+ public void setSyntax( String syntax )
+ {
+ this.syntax = syntax;
+ }
+
+
+ public int getSyntaxLength()
+ {
+ return syntaxLength;
+ }
+
+
+ public void setSyntaxLength( int syntaxLenght )
+ {
+ this.syntaxLength = syntaxLenght;
+ }
+
+
+ public Usage getUsage()
+ {
+ return usage;
+ }
+
+
+ public void setUsage( Usage usage )
+ {
+ this.usage = usage;
+ }
+
+ public void addExtension( String key, List values )
+ {
+ this.extensions.put( key, values );
+ }
+
+}
\ Kein Zeilenvorschub am Ende der Datei
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaParser.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaParser.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaParser.java (Revision 0)
@@ -0,0 +1,38 @@
+package org.apache.directory.shared.ldap.schema.syntax.parser;
+
+import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaParser;
+
+import antlr.TokenStream;
+
+/**
+ * A reusable parser class extended from antlr generated parser for an LDAP
+ * schema as defined in RFC 4512. This class
+ * enables the reuse of the antlr parser without having to recreate the it every
+ * time as stated in
+ * a Antlr Interest Group mail .
+ *
+ * @see RFC 3672
+ */
+class ReusableAntlrSchemaParser extends AntlrSchemaParser
+{
+ /**
+ * Creates a ReusableAntlrSchemaParser instance.
+ */
+ public ReusableAntlrSchemaParser( TokenStream lexer )
+ {
+ super( lexer );
+ }
+
+
+ /**
+ * Resets the state of an antlr parser.
+ */
+ public void resetState()
+ {
+ // no set method for this protected field.
+ this.traceDepth = 0;
+
+ this.getInputState().reset();
+ }
+}
\ Kein Zeilenvorschub am Ende der Datei
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaLexer.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaLexer.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaLexer.java (Revision 0)
@@ -0,0 +1,58 @@
+package org.apache.directory.shared.ldap.schema.syntax.parser;
+
+import java.io.Reader;
+
+import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaLexer;
+
+import antlr.CharBuffer;
+import antlr.LexerSharedInputState;
+
+/**
+ * A reusable lexer class extended from antlr generated lexer for an LDAP
+ * schema as defined in RFC 4512. This class
+ * enables the reuse of the antlr lexer without having to recreate the it every
+ * time as stated in
+ * a Antlr Interest Group mail .
+ *
+ * @see RFC 3672
+ */
+class ReusableAntlrSchemaLexer extends AntlrSchemaLexer
+{
+ private boolean savedCaseSensitive;
+
+ private boolean savedCaseSensitiveLiterals;
+
+
+ /**
+ * Creates a ReusableAntlrSchemaLexer instance.
+ *
+ * @param in
+ * the input to the lexer
+ */
+ public ReusableAntlrSchemaLexer( Reader in )
+ {
+ super( in );
+ savedCaseSensitive = getCaseSensitive();
+ savedCaseSensitiveLiterals = getCaseSensitiveLiterals();
+ }
+
+
+ /**
+ * Resets the state of an antlr lexer and initializes it with new input.
+ *
+ * @param in
+ * the input to the lexer
+ */
+ public void prepareNextInput( Reader in )
+ {
+ CharBuffer buf = new CharBuffer( in );
+ LexerSharedInputState state = new LexerSharedInputState( buf );
+ this.setInputState( state );
+
+ this.setCaseSensitive( savedCaseSensitive );
+
+ // no set method for this protected field.
+ this.caseSensitiveLiterals = savedCaseSensitiveLiterals;
+ }
+}
\ Kein Zeilenvorschub am Ende der Datei
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParser.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParser.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/AttributeTypeDescriptionSchemaParser.java (Revision 0)
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.schema.syntax.parser;
+
+
+import java.io.StringReader;
+import java.text.ParseException;
+
+import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+
+/**
+ * A parser for RFC 4512 attribute type descriptions.
+ *
+ * @author Apache Directory Project
+ */
+public class AttributeTypeDescriptionSchemaParser
+{
+
+ /** the antlr generated parser being wrapped */
+ private ReusableAntlrSchemaParser parser;
+
+ /** the antlr generated lexer being wrapped */
+ private ReusableAntlrSchemaLexer lexer;
+
+ static
+ {
+ }
+
+
+ /**
+ * Creates a schema parser instance.
+ */
+ public AttributeTypeDescriptionSchemaParser()
+ {
+ lexer = new ReusableAntlrSchemaLexer( new StringReader( "" ) );
+ parser = new ReusableAntlrSchemaParser( lexer );
+ }
+
+ /**
+ * Initializes the plumbing by creating a pipe and coupling the parser/lexer
+ * pair with it. param spec the specification to be parsed
+ */
+ private void reset( String spec )
+ {
+ StringReader in = new StringReader( spec );
+ lexer.prepareNextInput( in );
+ parser.resetState();
+ }
+
+
+ /**
+ * Parses a attribute type description according to RFC 4512:
+ *
+ *
+ * AttributeTypeDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+ * [ SP "DESC" SP qdstring ] ; description
+ * [ SP "OBSOLETE" ] ; not active
+ * [ SP "SUP" SP oid ] ; supertype
+ * [ SP "EQUALITY" SP oid ] ; equality matching rule
+ * [ SP "ORDERING" SP oid ] ; ordering matching rule
+ * [ SP "SUBSTR" SP oid ] ; substrings matching rule
+ * [ SP "SYNTAX" SP noidlen ] ; value syntax
+ * [ SP "SINGLE-VALUE" ] ; single-value
+ * [ SP "COLLECTIVE" ] ; collective
+ * [ SP "NO-USER-MODIFICATION" ] ; not user modifiable
+ * [ SP "USAGE" SP usage ] ; usage
+ * extensions WSP RPAREN ; extensions
+ *
+ * usage = "userApplications" / ; user
+ * "directoryOperation" / ; directory operational
+ * "distributedOperation" / ; DSA-shared operational
+ * "dSAOperation" ; DSA-specific operational
+ *
+ * extensions = *( SP xstring SP qdstrings )
+ * xstring = "X" HYPHEN 1*( ALPHA / HYPHEN / USCORE )
+ *
+ *
+ * @param attributeTypeDescription the attribute type description to be parsed
+ * @return the parsed AttributeTypeDescription bean
+ * @throws ParseException if there are any recognition errors (bad syntax)
+ */
+ public synchronized AttributeTypeDescription parseAttributeTypeDescription( String attributeTypeDescription )
+ throws ParseException
+ {
+
+ if ( attributeTypeDescription == null )
+ {
+ throw new ParseException( "Null", 0 );
+ }
+
+ reset( attributeTypeDescription ); // reset and initialize the parser / lexer pair
+
+ try
+ {
+ AttributeTypeDescription atd = parser.attributeTypeDescription();
+ return atd;
+ }
+ catch ( RecognitionException re )
+ {
+ String msg = "Parser failure on attribute type description:\n\t" + attributeTypeDescription;
+ msg += "\nAntlr message: " + re.getMessage();
+ msg += "\nAntlr column: " + re.getColumn();
+ throw new ParseException( msg, re.getColumn() );
+ }
+ catch ( TokenStreamException tse )
+ {
+ String msg = "Parser failure on attribute type description:\n\t" + attributeTypeDescription;
+ msg += "\nAntlr message: " + tse.getMessage();
+ throw new ParseException( msg, 0 );
+ }
+
+ }
+
+}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParser.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParser.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/LdapSyntaxDescriptionSchemaParser.java (Revision 0)
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.schema.syntax.parser;
+
+
+import java.io.StringReader;
+import java.text.ParseException;
+
+import org.apache.directory.shared.ldap.schema.syntax.LdapSyntaxDescription;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+
+/**
+ * A parser for RFC 4512 LDAP syntx descriptions.
+ *
+ * @author Apache Directory Project
+ */
+public class LdapSyntaxDescriptionSchemaParser
+{
+
+ /** the antlr generated parser being wrapped */
+ private ReusableAntlrSchemaParser parser;
+
+ /** the antlr generated lexer being wrapped */
+ private ReusableAntlrSchemaLexer lexer;
+
+ static
+ {
+ }
+
+
+ /**
+ * Creates a schema parser instance.
+ */
+ public LdapSyntaxDescriptionSchemaParser()
+ {
+ lexer = new ReusableAntlrSchemaLexer( new StringReader( "" ) );
+ parser = new ReusableAntlrSchemaParser( lexer );
+ }
+
+ /**
+ * Initializes the plumbing by creating a pipe and coupling the parser/lexer
+ * pair with it. param spec the specification to be parsed
+ */
+ private void reset( String spec )
+ {
+ StringReader in = new StringReader( spec );
+ lexer.prepareNextInput( in );
+ parser.resetState();
+ }
+
+
+ /**
+ * Parses a LDAP syntax description according to RFC 4512:
+ *
+ *
+ * SyntaxDescription = LPAREN WSP
+ * numericoid ; object identifier
+ * [ SP "DESC" SP qdstring ] ; description
+ * extensions WSP RPAREN ; extensions
+ *
+ *
+ * @param ldapSyntaxDescription the LDAP syntay description to be parsed
+ * @return the parsed LdapSyntaxDescription bean
+ * @throws ParseException if there are any recognition errors (bad syntax)
+ */
+ public synchronized LdapSyntaxDescription parseLdapSyntaxDescription( String ldapSyntaxDescription )
+ throws ParseException
+ {
+
+ if ( ldapSyntaxDescription == null )
+ {
+ throw new ParseException( "Null", 0 );
+ }
+
+ reset( ldapSyntaxDescription ); // reset and initialize the parser / lexer pair
+
+ try
+ {
+ LdapSyntaxDescription lsd = parser.ldapSyntaxDescription();
+ return lsd;
+ }
+ catch ( RecognitionException re )
+ {
+ String msg = "Parser failure on LDAP syntay description:\n\t" + ldapSyntaxDescription;
+ msg += "\nAntlr message: " + re.getMessage();
+ msg += "\nAntlr column: " + re.getColumn();
+ throw new ParseException( msg, re.getColumn() );
+ }
+ catch ( TokenStreamException tse )
+ {
+ String msg = "Parser failure on LDAP syntay description:\n\t" + ldapSyntaxDescription;
+ msg += "\nAntlr message: " + tse.getMessage();
+ throw new ParseException( msg, 0 );
+ }
+
+ }
+
+}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParser.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParser.java (Revision 485856)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ObjectClassDescriptionSchemaParser.java (Arbeitskopie)
@@ -20,23 +20,17 @@
package org.apache.directory.shared.ldap.schema.syntax.parser;
-import java.io.Reader;
import java.io.StringReader;
import java.text.ParseException;
-import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaLexer;
-import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaParser;
import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescription;
-import antlr.CharBuffer;
-import antlr.LexerSharedInputState;
import antlr.RecognitionException;
-import antlr.TokenStream;
import antlr.TokenStreamException;
/**
- * A parser for RFC 4512 schema objects
+ * A parser for RFC 4512 object class descriptons
*
* @author Apache Directory Project
*/
@@ -131,87 +125,4 @@
}
}
-
- /**
- * A reusable lexer class extended from antlr generated lexer for an LDAP
- * schema as defined in RFC 4512. This class
- * enables the reuse of the antlr lexer without having to recreate the it every
- * time as stated in
- * a Antlr Interest Group mail .
- *
- * @see RFC 3672
- */
- private static class ReusableAntlrSchemaLexer extends AntlrSchemaLexer
- {
- private boolean savedCaseSensitive;
-
- private boolean savedCaseSensitiveLiterals;
-
-
- /**
- * Creates a ReusableAntlrSchemaLexer instance.
- *
- * @param in
- * the input to the lexer
- */
- public ReusableAntlrSchemaLexer( Reader in )
- {
- super( in );
- savedCaseSensitive = getCaseSensitive();
- savedCaseSensitiveLiterals = getCaseSensitiveLiterals();
- }
-
-
- /**
- * Resets the state of an antlr lexer and initializes it with new input.
- *
- * @param in
- * the input to the lexer
- */
- public void prepareNextInput( Reader in )
- {
- CharBuffer buf = new CharBuffer( in );
- LexerSharedInputState state = new LexerSharedInputState( buf );
- this.setInputState( state );
-
- this.setCaseSensitive( savedCaseSensitive );
-
- // no set method for this protected field.
- this.caseSensitiveLiterals = savedCaseSensitiveLiterals;
- }
- }
-
- /**
- * A reusable parser class extended from antlr generated parser for an LDAP
- * schema as defined in RFC 4512. This class
- * enables the reuse of the antlr parser without having to recreate the it every
- * time as stated in
- * a Antlr Interest Group mail .
- *
- * @see RFC 3672
- */
- private static class ReusableAntlrSchemaParser extends AntlrSchemaParser
- {
- /**
- * Creates a ReusableAntlrSchemaParser instance.
- */
- public ReusableAntlrSchemaParser( TokenStream lexer )
- {
- super( lexer );
- }
-
-
- /**
- * Resets the state of an antlr parser.
- */
- public void resetState()
- {
- // no set method for this protected field.
- this.traceDepth = 0;
-
- this.getInputState().reset();
- }
- }
}
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java (Revision 0)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java (Revision 0)
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.shared.ldap.schema.syntax;
+
+
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * RFC 4512 - 4.1.5. LDAP Syntaxes
+ *
+ * @author Apache Directory Project
+ */
+public class LdapSyntaxDescription
+{
+
+ private String numericOid;
+
+ private String description;
+
+ private Map> extensions;
+
+
+ public LdapSyntaxDescription( )
+ {
+ this.numericOid = "";
+ description = "";
+ extensions = new LinkedHashMap>();;
+ }
+
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
+
+ public Map> getExtensions()
+ {
+ return extensions;
+ }
+
+
+ public void setExtensions( Map> extensions )
+ {
+ this.extensions = extensions;
+ }
+
+
+ public String getNumericOid()
+ {
+ return numericOid;
+ }
+
+
+ public void setNumericOid( String oid )
+ {
+ this.numericOid = oid;
+ }
+
+
+ public void addExtension( String key, List values )
+ {
+ this.extensions.put( key, values );
+ }
+
+}
\ Kein Zeilenvorschub am Ende der Datei