From directory-cvs-return-1539-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org Mon Sep 27 02:42:54 2004 Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 99897 invoked from network); 27 Sep 2004 02:42:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 27 Sep 2004 02:42:54 -0000 Received: (qmail 54594 invoked by uid 500); 27 Sep 2004 02:42:53 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 54538 invoked by uid 500); 27 Sep 2004 02:42:52 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 54510 invoked by uid 99); 27 Sep 2004 02:42:52 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 26 Sep 2004 19:42:48 -0700 Received: (qmail 99843 invoked by uid 65534); 27 Sep 2004 02:42:47 -0000 Date: 27 Sep 2004 02:42:47 -0000 Message-ID: <20040927024247.99840.qmail@minotaur.apache.org> From: akarasulu@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 47269 - incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/schema X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sun Sep 26 19:42:46 2004 New Revision: 47269 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: Commit changes ... o cleaned up formating removing a_, l_, m_ and space before ; o removed @author tags o swapped out full 1.1 license for the 2.0 license boiler plate 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -63,25 +30,25 @@ * Attribute Type definitions are written according to the ABNF: * * 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 + * 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 * * where: * [numericoid] is object identifier assigned to this attribute type; @@ -152,8 +119,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(AttributeType) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface AttributeType @@ -163,28 +130,28 @@ * * @return the object identifier for this AttributeType */ - String getOid() ; + String getOid(); /** * Gets the first name in the list of names for this AttributeTypeImpl. * * @return the first name in the list of names */ - String getName() ; + String getName(); /** * Gets all the names for this AttributeType. * * @return String names for this AttributeType */ - String[] getAllNames() ; + String[] getAllNames(); /** * Gets a description for this AttributeType. * * @return the verbal description */ - String getDescription() ; + String getDescription(); /** * Gets whether or not this AttributeType is single-valued. @@ -192,75 +159,75 @@ * @return true if only one value can exist for this AttributeType, false * otherwise */ - boolean isSingleValue() ; + boolean isSingleValue(); /** * Gets whether or not this AttributeType can be modified by a user. * * @return true if users can modify it, false if only the directory can. */ - boolean isCanUserModify() ; + boolean isCanUserModify(); /** * Gets whether or not this AttributeType is a collective attribute. * * @return true if the attribute is collective, false otherwise */ - boolean isCollective() ; + boolean isCollective(); /** * Gets whether or not this AttributeType is obsolete. * * @return true if obsolete, false if not. */ - boolean isObsolete() ; + boolean isObsolete(); /** * Determines the usage for this AttributeType. * * @return a type safe UsageEnum */ - UsageEnum getUsage() ; + UsageEnum getUsage(); /** * Gets the name of the superior class for this AttributeType. * * @return the super class for this AttributeType */ - AttributeType getSuperior() ; + AttributeType getSuperior(); /** * The Syntax for this AttributeType's values. * * @return the value syntax */ - Syntax getSyntax() ; + Syntax getSyntax(); /** * Gets a length limit for this AttributeType. * * @return the length of the attribute */ - int getLength() ; + int getLength(); /** * Gets the MatchingRule for this AttributeType used for equality matching. * * @return the equality matching rule */ - MatchingRule getEquality() ; + MatchingRule getEquality(); /** * Gets the MatchingRule for this AttributeType used for ordering. * * @return the ordering matching rule */ - MatchingRule getOrdering() ; + MatchingRule getOrdering(); /** * Gets the MatchingRule for this AttributeType used for substring matching. * * @return the substring matching rule */ - MatchingRule getSubstr() ; + MatchingRule getSubstr(); } 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 Sun Sep 26 19:42:46 2004 @@ -1,71 +1,37 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; -import javax.naming.NamingException ; +import javax.naming.NamingException; /** * A binary value (universal value acceptor) syntax checker. * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class BinarySyntaxChecker implements SyntaxChecker { /** - * @see org.apache.ldap.common.schema.SyntaxChecker#assertSyntax(java.lang.Object) + * @see org.apache.ldap.common.schema.SyntaxChecker#assertSyntax(Object) */ - public void assertSyntax( Object a_value ) throws NamingException + public void assertSyntax( Object value ) throws NamingException { // do nothing because everything is valid } @@ -76,15 +42,15 @@ */ public String getSyntaxOid() { - return "1.3.6.1.4.1.1466.115.121.1.5" ; + return "1.3.6.1.4.1.1466.115.121.1.5"; } /** - * @see org.apache.ldap.common.schema.SyntaxChecker#isValidSyntax(java.lang.Object) + * @see org.apache.ldap.common.schema.SyntaxChecker#isValidSyntax(Object) */ - public boolean isValidSyntax( Object a_value ) + public boolean isValidSyntax( Object value ) { - return true ; + 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -101,15 +68,15 @@ * DIT content rule descriptions are written according to the ABNF: * * DITContentRuleDescription = LPAREN WSP - * numericoid ; object identifier - * [ SP "NAME" SP qdescrs ] ; short names (descriptors) - * [ SP "DESC" SP qdstring ] ; description - * [ SP "OBSOLETE" ] ; not active - * [ SP "AUX" SP oids ] ; auxiliary object classes - * [ SP "MUST" SP oids ] ; attribute types - * [ SP "MAY" SP oids ] ; attribute types - * [ SP "NOT" SP oids ] ; attribute types - * extensions WSP RPAREN ; extensions + * numericoid ; object identifier + * [ SP "NAME" SP qdescrs ] ; short names (descriptors) + * [ SP "DESC" SP qdstring ] ; description + * [ SP "OBSOLETE" ] ; not active + * [ SP "AUX" SP oids ] ; auxiliary object classes + * [ SP "MUST" SP oids ] ; attribute types + * [ SP "MAY" SP oids ] ; attribute types + * [ SP "NOT" SP oids ] ; attribute types + * extensions WSP RPAREN ; extensions * * where: * @@ -133,8 +100,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(DITContentRule) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface DITContentRule @@ -144,28 +111,28 @@ * * @return a description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the DITContentRule. * * @return a short name. */ - String getName() ; + String getName(); /** * Gets the oid for this DITContentRule. * * @return the object identifier */ - String getOid() ; + String getOid(); /** * Gets whether or not this DITContentRule is obsolete. * * @return true if obsolete, false if not. */ - boolean isObsolete() ; + boolean isObsolete(); /** * Gets the STRUCTURAL ObjectClass this DITContentRule specifies attributes @@ -173,7 +140,7 @@ * * @return the ObjectClass this DITContentRule specifies attributes for */ - ObjectClass getObjectClass() ; + ObjectClass getObjectClass(); /** * Gets all the AUXILLARY ObjectClasses this DITContentRule specifies for the @@ -181,7 +148,7 @@ * * @return the extra AUXILLARY ObjectClasses */ - ObjectClass[] getAuxObjectClasses() ; + ObjectClass[] getAuxObjectClasses(); /** * Gets all the AttributeTypes of the "must" attribute names this @@ -189,7 +156,7 @@ * * @return the AttributeTypes of attributes that must be included in entries */ - AttributeType[] getMustNames() ; + AttributeType[] getMustNames(); /** * Gets all the AttributeTypes of the "may" attribute names this DITContentRule @@ -197,7 +164,7 @@ * * @return the AttributeTypes of attributes that may be included in entries */ - AttributeType[] getMayNames() ; + AttributeType[] getMayNames(); /** * Gets all the AttributeTypes of the "not" attribute names this DITContentRule @@ -205,5 +172,5 @@ * * @return the AttributeTypes of attributes that are excluded in entries */ - AttributeType[] getNotNames() ; + AttributeType[] getNotNames(); } 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -66,13 +33,13 @@ * DIT structure rule descriptions are written according to the ABNF: * * DITStructureRuleDescription = LPAREN WSP - * ruleid ; rule identifier - * [ SP "NAME" SP qdescrs ] ; short names (descriptors) - * [ SP "DESC" SP qdstring ] ; description - * [ SP "OBSOLETE" ] ; not active - * SP "FORM" SP oid ; NameForm - * [ SP "SUP" ruleids ] ; superior rules - * extensions WSP RPAREN ; extensions + * ruleid ; rule identifier + * [ SP "NAME" SP qdescrs ] ; short names (descriptors) + * [ SP "DESC" SP qdstring ] ; description + * [ SP "OBSOLETE" ] ; not active + * SP "FORM" SP oid ; NameForm + * [ SP "SUP" ruleids ] ; superior rules + * extensions WSP RPAREN ; extensions * * ruleids = ruleid / ( LPAREN WSP ruleidlist WSP RPAREN ) * @@ -101,8 +68,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(DITStructureRule) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface DITStructureRule @@ -112,28 +79,28 @@ * * @return a description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the DITStructureRule. * * @return a short name. */ - String getName() ; + String getName(); /** * Gets the oid for this DITStructureRule. * * @return the object identifier */ - String getOid() ; + String getOid(); /** * Gets whether or not this DITStructureRule is obsolete. * * @return true if obsolete, false if not. */ - boolean isObsolete() ; + boolean isObsolete(); /** * The nameForm associating this ditStructureRule with a structural @@ -141,7 +108,7 @@ * * @return the nameForm for the structural objectClass */ - NameForm getNameForm() ; + NameForm getNameForm(); /** * Gets a collection of all the superior StructureRules. The difference @@ -150,5 +117,5 @@ * * @return the chain of StructureRules */ - DITStructureRule [] getSuperClasses() ; + DITStructureRule [] getSuperClasses(); } 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 Sun Sep 26 19:42:46 2004 @@ -1,52 +1,19 @@ /* - - ============================================================================ - 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 . - -*/ + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema ; @@ -56,9 +23,8 @@ /** * The default MatchingRule implementation. * - * @author Alex Karasulu - * @author $LastChangedBy$ - * @version $LastChangedRevision$ + * @author Apache Directory Project + * @version $Rev$ */ public class DefaultMatchingRule implements MatchingRule { 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 Sun Sep 26 19:42:46 2004 @@ -1,60 +1,26 @@ /* - - ============================================================================ - 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 . - -*/ + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema ; /** * Default Syntax implementation. * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class DefaultSyntax implements Syntax 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 Sun Sep 26 19:42:46 2004 @@ -34,9 +34,7 @@ *
  • Syntax
    • * * - * @todo possibly add xml descriptor generation functions - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class DescriptionUtils 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 Sun Sep 26 19:42:46 2004 @@ -1,56 +1,23 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; -import java.util.Comparator ; +import java.util.Comparator; /** @@ -78,12 +45,12 @@ * Matching rule definitions are written according to the ABNF: * * MatchingRuleDescription = LPAREN WSP - * numericoid ; object identifier - * [ SP "NAME" SP qdescrs ] ; short names (descriptors) - * [ SP "DESC" SP qdstring ] ; description - * [ SP "OBSOLETE" ] ; not active - * SP "SYNTAX" SP numericoid ; assertion syntax - * extensions WSP RPAREN ; extensions + * numericoid ; object identifier + * [ SP "NAME" SP qdescrs ] ; short names (descriptors) + * [ SP "DESC" SP qdstring ] ; description + * [ SP "OBSOLETE" ] ; not active + * SP "SYNTAX" SP numericoid ; assertion syntax + * extensions WSP RPAREN ; extensions * * where: * [numericoid] is object identifier assigned to this matching rule; @@ -100,8 +67,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(MatchingRule) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface MatchingRule @@ -111,35 +78,35 @@ * * @return a long description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the MatchingRule. * * @return a short name */ - String getName() ; + String getName(); /** * Gets the oid for this MatchingRule. * * @return the object identifier */ - String getOid() ; + String getOid(); /** * Gets the SyntaxImpl used by this MatchingRule. * * @return the SyntaxImpl of this MatchingRule */ - Syntax getSyntax() ; + Syntax getSyntax(); /** * Gets whether or not this MatchingRule has been obsoleted for another. * * @return true if it is obsolete false otherwise */ - boolean isObsolete() ; + boolean isObsolete(); /** * Gets the Comparator enabling the use of this MatchingRule for ORDERING @@ -147,7 +114,7 @@ * * @return the ordering Comparator */ - Comparator getComparator() ; + Comparator getComparator(); /** * Gets the Normalizer enabling the use of this MatchingRule for EQUALITY @@ -155,5 +122,5 @@ * * @return the ordering Comparator */ - Normalizer getNormalizer() ; + Normalizer getNormalizer(); } 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 Sun Sep 26 19:42:46 2004 @@ -33,9 +33,8 @@ *
  • SUBSTRING
    • * * - * @author Alex Karasulu - * @author $Author: akarasulu $ - * @version $Rev: 1449 $ + * @author Apache Directory Project + * @version $Rev$ */ public class MatchingRuleEnum extends ValuedEnum { 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -63,12 +30,12 @@ * 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 + * 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 @@ -102,8 +69,8 @@ * @see * ldapbis [SYNTAXES] - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface MatchingRuleUse @@ -113,28 +80,28 @@ * * @return a long description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the MatchingRuleUse. * * @return a short name */ - String getName() ; + String getName(); /** * Gets whether or not this MatchingRuleUse has been obsoleted for another. * * @return true if it is obsolete false otherwise */ - boolean isObsolete() ; + boolean isObsolete(); /** * Gets the matchingRule this MatchingRuleUse definition applies to. * * @return the matchingRule */ - public MatchingRule getMatchingRule() ; + public MatchingRule getMatchingRule(); /** * Gets the the attributes which can be used with the matching rule in an @@ -142,5 +109,5 @@ * * @return the applicable attributes */ - public AttributeType [] getApplicableAttributes() ; + 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -81,14 +48,14 @@ * Name form descriptions are written according to the ABNF: * * NameFormDescription = LPAREN WSP - * numericoid ; object identifier - * [ SP "NAME" SP qdescrs ] ; short names (descriptors) - * [ SP "DESC" SP qdstring ] ; description - * [ SP "OBSOLETE" ] ; not active - * SP "OC" SP oid ; structural object class - * SP "MUST" SP oids ; attribute types - * [ SP "MAY" SP oids ] ; attribute types - * extensions WSP RPAREN ; extensions + * numericoid ; object identifier + * [ SP "NAME" SP qdescrs ] ; short names (descriptors) + * [ SP "DESC" SP qdstring ] ; description + * [ SP "OBSOLETE" ] ; not active + * SP "OC" SP oid ; structural object class + * SP "MUST" SP oids ; attribute types + * [ SP "MAY" SP oids ] ; attribute types + * extensions WSP RPAREN ; extensions * * where: * @@ -111,8 +78,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(NameForm) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface NameForm @@ -122,28 +89,28 @@ * * @return a description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the NameForm. * * @return a short name. */ - String getName() ; + String getName(); /** * Gets the oid for this NameForm. * * @return the object identifier */ - String getOid() ; + String getOid(); /** * Gets whether or not this NameForm is obsolete. * * @return true if obsolete, false if not. */ - boolean isObsolete() ; + boolean isObsolete(); /** * Gets the STRUCTURAL ObjectClass this name form specifies naming @@ -151,7 +118,7 @@ * * @return the ObjectClass this NameForm is for */ - ObjectClass getObjectClass() ; + ObjectClass getObjectClass(); /** * Gets all the AttributeTypes of the attributes this NameForm specifies as @@ -160,7 +127,7 @@ * * @return the AttributeTypes of the must use attributes */ - AttributeType [] getMustUse() ; + AttributeType [] getMustUse(); /** * Gets all the AttributeTypes of the attribute this NameForm specifies as @@ -169,5 +136,5 @@ * * @return the AttributeTypes of the may use attributes */ - AttributeType [] getMaytUse() ; + AttributeType [] getMaytUse(); } 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 Sun Sep 26 19:42:46 2004 @@ -1,52 +1,19 @@ /* - - ============================================================================ - 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 . - -*/ + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema ; @@ -56,8 +23,7 @@ /** * Converts attribute values to a canonical form. * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public interface Normalizer @@ -65,9 +31,9 @@ /** * Gets the normalized value. * - * @param a_value the value to normalize - * @return the normalized form for a_value + * @param value the value to normalize + * @return the normalized form for a value * @throws NamingException if an error results during normalization */ - Object normalize( Object a_value ) throws NamingException ; + Object normalize( Object value ) throws 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 Sun Sep 26 19:42:46 2004 @@ -1,53 +1,20 @@ /* - - ============================================================================ - 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 ; + * Copyright 2004 The Apache Software Foundation + * + * Licensed 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.ldap.common.schema; /** @@ -59,14 +26,14 @@ * Object Class definitions are written according to the ABNF: * * ObjectClassDescription = LPAREN WSP - * numericoid ; object identifier - * [ SP "NAME" SP qdescrs ] ; short names (descriptors) - * [ SP "DESC" SP qdstring ] ; description - * [ SP "OBSOLETE" ] ; not active - * [ SP "SUP" SP oids ] ; superior object classes - * [ SP kind ] ; kind of class - * [ SP "MUST" SP oids ] ; attribute types - * [ SP "MAY" SP oids ] ; attribute types + * numericoid ; object identifier + * [ SP "NAME" SP qdescrs ] ; short names (descriptors) + * [ SP "DESC" SP qdstring ] ; description + * [ SP "OBSOLETE" ] ; not active + * [ SP "SUP" SP oids ] ; superior object classes + * [ SP kind ] ; kind of class + * [ SP "MUST" SP oids ] ; attribute types + * [ SP "MAY" SP oids ] ; attribute types * extensions WSP RPAREN * * kind = "ABSTRACT" / "STRUCTURAL" / "AUXILIARY" @@ -90,8 +57,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(ObjectClass) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface ObjectClass @@ -101,42 +68,42 @@ * * @return a verbal description */ - String getDescription() ; + String getDescription(); /** * Gets the object identifier for this ObjectClass definition. * * @return the OID for this ObjectClass */ - String getOid() ; + String getOid(); /** * Gets the human readable name of this ObjectClass. * * @return the name of this ObjectClass */ - String getName() ; + String getName(); /** * Gets whether or not this NameForm is obsolete. * * @return true if obsolete, false if not. */ - boolean isObsolete() ; + boolean isObsolete(); /** * Gets the superclasses of this ObjectClass. * * @return the superclasses */ - ObjectClass [] getSuperClasses() ; + ObjectClass [] getSuperClasses(); /** * Gets the type of this ObjectClass as a type safe enum. * * @return the ObjectClass type as an enum */ - ObjectClassTypeEnum getType() ; + ObjectClassTypeEnum getType(); /** * Gets the AttributeTypes whose attributes must be present within an entry @@ -145,7 +112,7 @@ * @return the AttributeTypes of attributes that must be within entries of * this ObjectClass */ - AttributeType [] getMustList() ; + AttributeType [] getMustList(); /** * Gets the AttributeTypes whose attributes may be present within an entry @@ -154,5 +121,5 @@ * @return the AttributeTypes of attributes that may be within entries of * this ObjectClass */ - AttributeType [] getMayList() ; + AttributeType [] getMayList(); } 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 Sun Sep 26 19:42:46 2004 @@ -33,8 +33,7 @@ *
  • STRUCTURAL
    • * * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class ObjectClassTypeEnum extends ValuedEnum 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 Sun Sep 26 19:42:46 2004 @@ -27,8 +27,7 @@ * A SyntaxChecker implemented using Perl5 regular expressions to constrain * values. * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class RegexSyntaxChecker 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 Sun Sep 26 19:42:46 2004 @@ -47,16 +47,15 @@ Apache Software Foundation, please see . */ -package org.apache.ldap.common.schema ; +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$ + * @author Apache Directory Project + * @version $Rev$ */ public interface SchemaObject { @@ -65,5 +64,5 @@ * * @return a short description about this SchemaObject */ - String getDescription() ; + 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 Sun Sep 26 19:42:46 2004 @@ -47,7 +47,7 @@ Apache Software Foundation, please see . */ -package org.apache.ldap.common.schema ; +package org.apache.ldap.common.schema; /** @@ -74,9 +74,9 @@ * LDAP syntax definitions are written according to the ABNF: * * SyntaxDescription = LPAREN WSP - * numericoid ; object identifier - * [ SP "DESC" SP qdstring ] ; description - * extensions WSP RPAREN ; extensions + * numericoid ; object identifier + * [ SP "DESC" SP qdstring ] ; description + * extensions WSP RPAREN ; extensions * * where: * [numericoid] is object identifier assigned to this LDAP syntax; @@ -90,8 +90,8 @@ * "http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-09.txt"> * ldapbis [MODELS] * @see DescriptionUtils#getDescription(Syntax) - * @author Alex Karasulu - * @author $Author$ + * + * @author Apache Directory Project * @version $Rev$ */ public interface Syntax @@ -101,28 +101,28 @@ * * @return true if the syntax can be interpretted by humans, false otherwise */ - boolean isHumanReadable() ; + boolean isHumanReadable(); /** * Gets a description of this Syntax. * * @return a description */ - String getDescription() ; + String getDescription(); /** * Gets a short descriptive name for the Syntax. * * @return a short name */ - String getName() ; + String getName(); /** * Gets the oid for this Syntax. * * @return the object identifier */ - String getOid() ; + String getOid(); /** * Gets the SyntaxChecker used to validate values in accordance with this @@ -130,5 +130,5 @@ * * @return the SyntaxChecker */ - SyntaxChecker getSyntaxChecker() ; + SyntaxChecker getSyntaxChecker(); } 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 Sun Sep 26 19:42:46 2004 @@ -58,8 +58,7 @@ * correlate to any LDAP or X.500 construct. It has been created as a means * to enforce a syntax within the Eve server. * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public interface SyntaxChecker 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 Sun Sep 26 19:42:46 2004 @@ -34,8 +34,7 @@ *
  • dSAOperation
    • * * - * @author Alex Karasulu - * @author $Author$ + * @author Apache Directory Project * @version $Rev$ */ public class UsageEnum extends ValuedEnum