Author: akarasulu Date: Sat Sep 25 21:51:13 2004 New Revision: 47236 Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/AttributeType.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/BinarySyntaxChecker.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITContentRule.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITStructureRule.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultMatchingRule.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultSyntax.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DescriptionUtils.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRule.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleEnum.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleUse.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/NameForm.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Normalizer.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClass.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClassTypeEnum.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/RegexSyntaxChecker.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SchemaObject.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Syntax.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SyntaxChecker.java incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/UsageEnum.java Log: package name changes Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/AttributeType.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/AttributeType.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/AttributeType.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/BinarySyntaxChecker.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/BinarySyntaxChecker.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/BinarySyntaxChecker.java Sat Sep 25 21:51:13 2004 @@ -1,90 +1,90 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -import javax.naming.NamingException ; - - -/** - * A binary value (universal value acceptor) syntax checker. - * - * @author Alex Karasulu - * @author $Author$ - * @version $Rev$ - */ -public class BinarySyntaxChecker implements SyntaxChecker -{ - /** - * @see org.apache.eve.schema.SyntaxChecker#assertSyntax(java.lang.Object) - */ - public void assertSyntax( Object a_value ) throws NamingException - { - // do nothing because everything is valid - } - - - /** - * @see org.apache.eve.schema.SyntaxChecker#getSyntaxOid() - */ - public String getSyntaxOid() - { - return "1.3.6.1.4.1.1466.115.121.1.5" ; - } - - - /** - * @see org.apache.eve.schema.SyntaxChecker#isValidSyntax(java.lang.Object) - */ - public boolean isValidSyntax( Object a_value ) - { - return true ; - } -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +import javax.naming.NamingException ; + + +/** + * A binary value (universal value acceptor) syntax checker. + * + * @author Alex Karasulu + * @author $Author$ + * @version $Rev$ + */ +public class BinarySyntaxChecker implements SyntaxChecker +{ + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#assertSyntax(java.lang.Object) + */ + public void assertSyntax( Object a_value ) throws NamingException + { + // do nothing because everything is valid + } + + + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#getSyntaxOid() + */ + public String getSyntaxOid() + { + return "1.3.6.1.4.1.1466.115.121.1.5" ; + } + + + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#isValidSyntax(java.lang.Object) + */ + public boolean isValidSyntax( Object a_value ) + { + return true ; + } +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITContentRule.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITContentRule.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITContentRule.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITStructureRule.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITStructureRule.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DITStructureRule.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultMatchingRule.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultMatchingRule.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultMatchingRule.java Sat Sep 25 21:51:13 2004 @@ -1,213 +1,213 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -import java.util.Comparator ; - - -/** - * The default MatchingRule implementation. - * - * @author Alex Karasulu - * @author $LastChangedBy$ - * @version $LastChangedRevision$ - */ -public class DefaultMatchingRule implements MatchingRule -{ - /** the object identifier */ - private final String m_oid ; - /** the syntax this matching rule can be applied to */ - private final Syntax m_syntax ; - /** comparator used to compare and match values of the associated syntax */ - private final Comparator m_comparator ; - /** normalizer used to transform values to a canonical form */ - private final Normalizer m_normalizer ; - - /** isObsolete boolean flag */ - private boolean m_isObsolete = false ; - /** a short descriptive name */ - private String m_name = null ; - /** a description about this MatchingRule */ - private String m_description = null ; - - - // ------------------------------------------------------------------------ - // C O N S T R U C T O R S - // ------------------------------------------------------------------------ - - - /** - * Creates a MatchingRule using the minimal set of required information. - * - * @param a_oid the object identifier for this matching rule - * @param a_syntax the syntax this matching rule is applicable to - * @param a_comparator the comparator used by this matching rule to compare - * and match values of the associated syntax - * @param a_normalizer the normalizer used to transform syntax values to a - * canonical form. - */ - public DefaultMatchingRule( String a_oid, - Syntax a_syntax, - Comparator a_comparator, - Normalizer a_normalizer ) - { - m_oid = a_oid ; - m_syntax = a_syntax ; - m_comparator = a_comparator ; - m_normalizer = a_normalizer ; - } - - - // ------------------------------------------------------------------------ - // P U B L I C A C C E S S O R S - // ------------------------------------------------------------------------ - - - /** - * @see org.apache.eve.schema.MatchingRule#getDescription() - */ - public String getDescription() - { - return m_description ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#getName() - */ - public String getName() - { - return m_name ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#getOid() - */ - public String getOid() - { - return m_oid ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#getSyntax() - */ - public Syntax getSyntax() - { - return m_syntax ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#isObsolete() - */ - public boolean isObsolete() - { - return m_isObsolete ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#getComparator() - */ - public Comparator getComparator() - { - return m_comparator ; - } - - - /** - * @see org.apache.eve.schema.MatchingRule#getNormalizer() - */ - public Normalizer getNormalizer() - { - return m_normalizer ; - } - - - // ------------------------------------------------------------------------ - // P R O T E C T E D M U T A T O R S - // ------------------------------------------------------------------------ - - - /** - * Sets a short description for this MatchingRule. - * - * @param a_description the description to set - */ - protected void setDescription(String a_description) - { - m_description = a_description; - } - - - /** - * Sets this MatchingRule's isObsolete flag. - * - * @param a_isObsolete whether or not this object is obsolete. - */ - protected void setObsolete( boolean a_isObsolete ) - { - m_isObsolete = a_isObsolete ; - } - - - /** - * Sets the short descriptive name for this MatchingRule. - * - * @param a_name The name to set - */ - protected void setName( String a_name ) - { - m_name = a_name ; - } -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +import java.util.Comparator ; + + +/** + * The default MatchingRule implementation. + * + * @author Alex Karasulu + * @author $LastChangedBy$ + * @version $LastChangedRevision$ + */ +public class DefaultMatchingRule implements MatchingRule +{ + /** the object identifier */ + private final String m_oid ; + /** the syntax this matching rule can be applied to */ + private final Syntax m_syntax ; + /** comparator used to compare and match values of the associated syntax */ + private final Comparator m_comparator ; + /** normalizer used to transform values to a canonical form */ + private final Normalizer m_normalizer ; + + /** isObsolete boolean flag */ + private boolean m_isObsolete = false ; + /** a short descriptive name */ + private String m_name = null ; + /** a description about this MatchingRule */ + private String m_description = null ; + + + // ------------------------------------------------------------------------ + // C O N S T R U C T O R S + // ------------------------------------------------------------------------ + + + /** + * Creates a MatchingRule using the minimal set of required information. + * + * @param a_oid the object identifier for this matching rule + * @param a_syntax the syntax this matching rule is applicable to + * @param a_comparator the comparator used by this matching rule to compare + * and match values of the associated syntax + * @param a_normalizer the normalizer used to transform syntax values to a + * canonical form. + */ + public DefaultMatchingRule( String a_oid, + Syntax a_syntax, + Comparator a_comparator, + Normalizer a_normalizer ) + { + m_oid = a_oid ; + m_syntax = a_syntax ; + m_comparator = a_comparator ; + m_normalizer = a_normalizer ; + } + + + // ------------------------------------------------------------------------ + // P U B L I C A C C E S S O R S + // ------------------------------------------------------------------------ + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getDescription() + */ + public String getDescription() + { + return m_description ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getName() + */ + public String getName() + { + return m_name ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getOid() + */ + public String getOid() + { + return m_oid ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getSyntax() + */ + public Syntax getSyntax() + { + return m_syntax ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#isObsolete() + */ + public boolean isObsolete() + { + return m_isObsolete ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getComparator() + */ + public Comparator getComparator() + { + return m_comparator ; + } + + + /** + * @see org.apache.ldap.common.schema.MatchingRule#getNormalizer() + */ + public Normalizer getNormalizer() + { + return m_normalizer ; + } + + + // ------------------------------------------------------------------------ + // P R O T E C T E D M U T A T O R S + // ------------------------------------------------------------------------ + + + /** + * Sets a short description for this MatchingRule. + * + * @param a_description the description to set + */ + protected void setDescription(String a_description) + { + m_description = a_description; + } + + + /** + * Sets this MatchingRule's isObsolete flag. + * + * @param a_isObsolete whether or not this object is obsolete. + */ + protected void setObsolete( boolean a_isObsolete ) + { + m_isObsolete = a_isObsolete ; + } + + + /** + * Sets the short descriptive name for this MatchingRule. + * + * @param a_name The name to set + */ + protected void setName( String a_name ) + { + m_name = a_name ; + } +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultSyntax.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultSyntax.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DefaultSyntax.java Sat Sep 25 21:51:13 2004 @@ -1,179 +1,179 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -/** - * Default Syntax implementation. - * - * @author Alex Karasulu - * @author $Author$ - * @version $Rev$ - */ -public class DefaultSyntax implements Syntax -{ - /** the oid of this Syntax */ - private final String m_oid ; - /** the SyntaxChecker used to enforce this Syntax */ - private final SyntaxChecker m_checker ; - - /** the human readible flag */ - private boolean m_isHumanReadible ; - /** a short description of this Syntax */ - private String m_description ; - /** a human readible identifier for this Syntax */ - private String m_name ; - - - // ------------------------------------------------------------------------ - // C O N S T R U C T O R S - // ------------------------------------------------------------------------ - - - /** - * Creates a Syntax object. - * - * @param a_oid the OID for this Syntax - * @param a_checker the SyntaxChecker used to enforce this Syntax - */ - public DefaultSyntax( String a_oid, SyntaxChecker a_checker ) - { - m_oid = a_oid ; - m_checker = a_checker ; - } - - - // ------------------------------------------------------------------------ - // Syntax interface methods - // ------------------------------------------------------------------------ - - - /** - * @see org.apache.eve.schema.Syntax#isHumanReadable() - */ - public boolean isHumanReadable() - { - return m_isHumanReadible ; - } - - - /** - * @see org.apache.eve.schema.Syntax#getDescription() - */ - public String getDescription() - { - return m_description ; - } - - - /** - * @see org.apache.eve.schema.Syntax#getName() - */ - public String getName() - { - return m_name ; - } - - - /** - * @see org.apache.eve.schema.Syntax#getOid() - */ - public final String getOid() - { - return m_oid ; - } - - - /** - * @see org.apache.eve.schema.Syntax#getSyntaxChecker() - */ - public SyntaxChecker getSyntaxChecker() - { - return m_checker ; - } - - - // ------------------------------------------------------------------------ - // Protected setters - // ------------------------------------------------------------------------ - - - /** - * Sets the description for this Syntax. - * - * @param a_description the description to set - */ - protected void setDescription( String a_description ) - { - m_description = a_description ; - } - - - /** - * Sets the human readible flag value. - * - * @param a_isHumanReadible the human readible flag value to set - */ - protected void setHumanReadible( boolean a_isHumanReadible ) - { - m_isHumanReadible = a_isHumanReadible ; - } - - - /** - * Sets the name of this Syntax. - * - * @param a_name the name to set. - */ - protected void setName( String a_name ) - { - m_name = a_name ; - } -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +/** + * Default Syntax implementation. + * + * @author Alex Karasulu + * @author $Author$ + * @version $Rev$ + */ +public class DefaultSyntax implements Syntax +{ + /** the oid of this Syntax */ + private final String m_oid ; + /** the SyntaxChecker used to enforce this Syntax */ + private final SyntaxChecker m_checker ; + + /** the human readible flag */ + private boolean m_isHumanReadible ; + /** a short description of this Syntax */ + private String m_description ; + /** a human readible identifier for this Syntax */ + private String m_name ; + + + // ------------------------------------------------------------------------ + // C O N S T R U C T O R S + // ------------------------------------------------------------------------ + + + /** + * Creates a Syntax object. + * + * @param a_oid the OID for this Syntax + * @param a_checker the SyntaxChecker used to enforce this Syntax + */ + public DefaultSyntax( String a_oid, SyntaxChecker a_checker ) + { + m_oid = a_oid ; + m_checker = a_checker ; + } + + + // ------------------------------------------------------------------------ + // Syntax interface methods + // ------------------------------------------------------------------------ + + + /** + * @see org.apache.ldap.common.schema.Syntax#isHumanReadable() + */ + public boolean isHumanReadable() + { + return m_isHumanReadible ; + } + + + /** + * @see org.apache.ldap.common.schema.Syntax#getDescription() + */ + public String getDescription() + { + return m_description ; + } + + + /** + * @see org.apache.ldap.common.schema.Syntax#getName() + */ + public String getName() + { + return m_name ; + } + + + /** + * @see org.apache.ldap.common.schema.Syntax#getOid() + */ + public final String getOid() + { + return m_oid ; + } + + + /** + * @see org.apache.ldap.common.schema.Syntax#getSyntaxChecker() + */ + public SyntaxChecker getSyntaxChecker() + { + return m_checker ; + } + + + // ------------------------------------------------------------------------ + // Protected setters + // ------------------------------------------------------------------------ + + + /** + * Sets the description for this Syntax. + * + * @param a_description the description to set + */ + protected void setDescription( String a_description ) + { + m_description = a_description ; + } + + + /** + * Sets the human readible flag value. + * + * @param a_isHumanReadible the human readible flag value to set + */ + protected void setHumanReadible( boolean a_isHumanReadible ) + { + m_isHumanReadible = a_isHumanReadible ; + } + + + /** + * Sets the name of this Syntax. + * + * @param a_name the name to set. + */ + protected void setName( String a_name ) + { + m_name = a_name ; + } +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DescriptionUtils.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DescriptionUtils.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/DescriptionUtils.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRule.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRule.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRule.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import java.util.Comparator ; Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleEnum.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleEnum.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleEnum.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import java.util.Map ; Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleUse.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleUse.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/MatchingRuleUse.java Sat Sep 25 21:51:13 2004 @@ -1,146 +1,146 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -/** - * Represents an LDAP MatchingRuleUseDescription defined in RFC 2252. - *

- * According to ldapbis [MODELS]: - *

- *
- * Values of the matchingRuleUse list the attributes which are suitable
- * for use with an extensible matching rule.
- * 
- *   Matching rule use descriptions are written according to the following
- *   ABNF:
- *
- *     MatchingRuleUseDescription = LPAREN WSP
- *         numericoid                 ; object identifier
- *         [ SP "NAME" SP qdescrs ]   ; short names (descriptors)
- *         [ SP "DESC" SP qdstring ]  ; description
- *         [ SP "OBSOLETE" ]          ; not active
- *         SP "APPLIES" SP oids       ; attribute types
- *         extensions WSP RPAREN      ; extensions
- * 
- *   where:
- *     [numericoid] is the object identifier of the matching rule
- *         associated with this matching rule use description;
- *     NAME [qdescrs] are short names (descriptors) identifying this
- *         matching rule use;
- *     DESC [qdstring] is a short descriptive string;
- *     OBSOLETE indicates this matching rule use is not active;
- *     APPLIES provides a list of attribute types the matching rule applies
- *         to; and
- *     [extensions] describe extensions.
- *
- * The matchingRule within the MatchingRuleUse definition can be used by an
- * extensible match assertion if the assertion is based on the attributes 
- * listed within the MatchingRuleUse definition.  If an extensible match 
- * assertion is based on attributes other than those listed within the 
- * MatchingRuleUse definition then the assertion is deemed undefined.
- * 
- * Also according to 3.3.20 of [SYNTAXES] (ldapbis working group):
- * 
- * A value of the Matching Rule Use Description syntax indicates the
- * attribute types to which a matching rule may be applied in an
- * extensibleMatch search filter [PROT].  The LDAP-specific encoding of
- * a value of this syntax is defined by the 
- * rule in [MODELS] above.
- * 
- * - * @see - * ldapbis [MODELS] - * @see - * ldapbis [SYNTAXES] - * @author Alex Karasulu - * @author $Author$ - * @version $Rev$ - */ -public interface MatchingRuleUse -{ - /** - * Gets a long description for the MatchingRuleUse. - * - * @return a long description - */ - String getDescription() ; - - /** - * Gets a short descriptive name for the MatchingRuleUse. - * - * @return a short name - */ - String getName() ; - - /** - * Gets whether or not this MatchingRuleUse has been obsoleted for another. - * - * @return true if it is obsolete false otherwise - */ - boolean isObsolete() ; - - /** - * Gets the matchingRule this MatchingRuleUse definition applies to. - * - * @return the matchingRule - */ - public MatchingRule getMatchingRule() ; - - /** - * Gets the the attributes which can be used with the matching rule in an - * extensible match assertion. - * - * @return the applicable attributes - */ - public AttributeType [] getApplicableAttributes() ; -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +/** + * Represents an LDAP MatchingRuleUseDescription defined in RFC 2252. + *

+ * According to ldapbis [MODELS]: + *

+ *
+ * Values of the matchingRuleUse list the attributes which are suitable
+ * for use with an extensible matching rule.
+ * 
+ *   Matching rule use descriptions are written according to the following
+ *   ABNF:
+ *
+ *     MatchingRuleUseDescription = LPAREN WSP
+ *         numericoid                 ; object identifier
+ *         [ SP "NAME" SP qdescrs ]   ; short names (descriptors)
+ *         [ SP "DESC" SP qdstring ]  ; description
+ *         [ SP "OBSOLETE" ]          ; not active
+ *         SP "APPLIES" SP oids       ; attribute types
+ *         extensions WSP RPAREN      ; extensions
+ * 
+ *   where:
+ *     [numericoid] is the object identifier of the matching rule
+ *         associated with this matching rule use description;
+ *     NAME [qdescrs] are short names (descriptors) identifying this
+ *         matching rule use;
+ *     DESC [qdstring] is a short descriptive string;
+ *     OBSOLETE indicates this matching rule use is not active;
+ *     APPLIES provides a list of attribute types the matching rule applies
+ *         to; and
+ *     [extensions] describe extensions.
+ *
+ * The matchingRule within the MatchingRuleUse definition can be used by an
+ * extensible match assertion if the assertion is based on the attributes 
+ * listed within the MatchingRuleUse definition.  If an extensible match 
+ * assertion is based on attributes other than those listed within the 
+ * MatchingRuleUse definition then the assertion is deemed undefined.
+ * 
+ * Also according to 3.3.20 of [SYNTAXES] (ldapbis working group):
+ * 
+ * A value of the Matching Rule Use Description syntax indicates the
+ * attribute types to which a matching rule may be applied in an
+ * extensibleMatch search filter [PROT].  The LDAP-specific encoding of
+ * a value of this syntax is defined by the 
+ * rule in [MODELS] above.
+ * 
+ * + * @see + * ldapbis [MODELS] + * @see + * ldapbis [SYNTAXES] + * @author Alex Karasulu + * @author $Author$ + * @version $Rev$ + */ +public interface MatchingRuleUse +{ + /** + * Gets a long description for the MatchingRuleUse. + * + * @return a long description + */ + String getDescription() ; + + /** + * Gets a short descriptive name for the MatchingRuleUse. + * + * @return a short name + */ + String getName() ; + + /** + * Gets whether or not this MatchingRuleUse has been obsoleted for another. + * + * @return true if it is obsolete false otherwise + */ + boolean isObsolete() ; + + /** + * Gets the matchingRule this MatchingRuleUse definition applies to. + * + * @return the matchingRule + */ + public MatchingRule getMatchingRule() ; + + /** + * Gets the the attributes which can be used with the matching rule in an + * extensible match assertion. + * + * @return the applicable attributes + */ + public AttributeType [] getApplicableAttributes() ; +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/NameForm.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/NameForm.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/NameForm.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Normalizer.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Normalizer.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Normalizer.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import javax.naming.NamingException ; Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClass.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClass.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClass.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClassTypeEnum.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClassTypeEnum.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/ObjectClassTypeEnum.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import java.util.Map ; Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/RegexSyntaxChecker.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/RegexSyntaxChecker.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/RegexSyntaxChecker.java Sat Sep 25 21:51:13 2004 @@ -1,141 +1,141 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -import javax.naming.NamingException ; -import javax.naming.directory.InvalidAttributeValueException ; - -import org.apache.oro.text.perl.Perl5Util ; - - -/** - * A SyntaxChecker implemented using Perl5 regular expressions to constrain - * values. - * - * @author Alex Karasulu - * @author $Author$ - * @version $Rev$ - */ -public class RegexSyntaxChecker - implements SyntaxChecker -{ - /** the oid of the syntax checked */ - private final String m_oid ; - /** the set of regular expressions */ - private final String [] m_expressions ; - /** the Perl5 regex utilities */ - private final Perl5Util m_perl = new Perl5Util() ; - - - /** - * Creates a Syntax validator for a specific Syntax using Perl5 matching - * rules for validation. - * - * @param a_oid the oid of the Syntax values checked - * @param a_matchExprArray the array of matching expressions - */ - public RegexSyntaxChecker( String a_oid, String [] a_matchExprArray ) - { - m_expressions = a_matchExprArray ; - m_oid = a_oid ; - } - - - /** - * @see org.apache.eve.schema.SyntaxChecker#getSyntaxOid() - */ - public String getSyntaxOid() - { - return m_oid ; - } - - - /** - * @see org.apache.eve.schema.SyntaxChecker#isValidSyntax(java.lang.Object) - */ - public boolean isValidSyntax( Object a_value ) - { - String l_str = null ; - boolean l_match = true ; - - if ( a_value instanceof String ) - { - l_str = ( String ) a_value ; - } - - for ( int ii = 0; ii < m_expressions.length; ii++ ) - { - l_match = l_match && m_perl.match( m_expressions[ii], l_str ) ; - if ( ! l_match ) - { - break ; - } - } - - return l_match ; - } - - - /** - * @see org.apache.eve.schema.SyntaxChecker#assertSyntax(java.lang.Object) - */ - public void assertSyntax( Object a_value ) throws NamingException - { - if ( isValidSyntax( a_value ) ) - { - return ; - } - - throw new InvalidAttributeValueException( a_value - + " does not conform to the syntax specified by " - + m_oid ) ; - } -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +import javax.naming.NamingException ; +import javax.naming.directory.InvalidAttributeValueException ; + +import org.apache.oro.text.perl.Perl5Util ; + + +/** + * A SyntaxChecker implemented using Perl5 regular expressions to constrain + * values. + * + * @author Alex Karasulu + * @author $Author$ + * @version $Rev$ + */ +public class RegexSyntaxChecker + implements SyntaxChecker +{ + /** the oid of the syntax checked */ + private final String m_oid ; + /** the set of regular expressions */ + private final String [] m_expressions ; + /** the Perl5 regex utilities */ + private final Perl5Util m_perl = new Perl5Util() ; + + + /** + * Creates a Syntax validator for a specific Syntax using Perl5 matching + * rules for validation. + * + * @param a_oid the oid of the Syntax values checked + * @param a_matchExprArray the array of matching expressions + */ + public RegexSyntaxChecker( String a_oid, String [] a_matchExprArray ) + { + m_expressions = a_matchExprArray ; + m_oid = a_oid ; + } + + + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#getSyntaxOid() + */ + public String getSyntaxOid() + { + return m_oid ; + } + + + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#isValidSyntax(java.lang.Object) + */ + public boolean isValidSyntax( Object a_value ) + { + String l_str = null ; + boolean l_match = true ; + + if ( a_value instanceof String ) + { + l_str = ( String ) a_value ; + } + + for ( int ii = 0; ii < m_expressions.length; ii++ ) + { + l_match = l_match && m_perl.match( m_expressions[ii], l_str ) ; + if ( ! l_match ) + { + break ; + } + } + + return l_match ; + } + + + /** + * @see org.apache.ldap.common.schema.SyntaxChecker#assertSyntax(java.lang.Object) + */ + public void assertSyntax( Object a_value ) throws NamingException + { + if ( isValidSyntax( a_value ) ) + { + return ; + } + + throw new InvalidAttributeValueException( a_value + + " does not conform to the syntax specified by " + + m_oid ) ; + } +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SchemaObject.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SchemaObject.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SchemaObject.java Sat Sep 25 21:51:13 2004 @@ -1,69 +1,69 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" - and "Apache Software Foundation" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation. For more information on the - Apache Software Foundation, please see . - -*/ -package org.apache.eve.schema ; - - -/** - * Most schema objects have some common attributes. This super interface - * represents the minimum set of properties exposed by a SchemaObject. - * - * @author Alex Karasulu - * @author $LastChangedBy$ - * @version $LastChangedRevision$ - */ -public interface SchemaObject -{ - /** - * Gets a short description about this SchemaObject. - * - * @return a short description about this SchemaObject - */ - String getDescription() ; -} +/* + + ============================================================================ + The Apache Software License, Version 1.1 + ============================================================================ + + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if any, must + include the following acknowledgment: "This product includes software + developed by the Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" + and "Apache Software Foundation" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache", nor may + "Apache" appear in their name, without prior written permission of the + Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Apache Software Foundation. For more information on the + Apache Software Foundation, please see . + +*/ +package org.apache.ldap.common.schema ; + + +/** + * Most schema objects have some common attributes. This super interface + * represents the minimum set of properties exposed by a SchemaObject. + * + * @author Alex Karasulu + * @author $LastChangedBy$ + * @version $LastChangedRevision$ + */ +public interface SchemaObject +{ + /** + * Gets a short description about this SchemaObject. + * + * @return a short description about this SchemaObject + */ + String getDescription() ; +} Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Syntax.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Syntax.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/Syntax.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; /** Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SyntaxChecker.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SyntaxChecker.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/SyntaxChecker.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import javax.naming.NamingException ; Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/UsageEnum.java ============================================================================== --- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/UsageEnum.java (original) +++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema/UsageEnum.java Sat Sep 25 21:51:13 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.eve.schema ; +package org.apache.ldap.common.schema ; import java.util.Map ;