directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r431658 - in /directory/sandbox/akarasulu/apacheds-2.0/schema: descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/
Date Tue, 15 Aug 2006 18:26:52 GMT
Author: akarasulu
Date: Tue Aug 15 11:26:51 2006
New Revision: 431658

URL: http://svn.apache.org/viewvc?rev=431658&view=rev
Log:
major changes to follow rfc 4512 wording better

Added:
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeTypeDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeType.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ComparatorDescription.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRuleDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRuleDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUseDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUse.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameFormDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameForm.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NamedSchemaObject.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NormalizerDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Normalizer.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClassDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClass.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObsoletableSchemaObject.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/RegisteredSchemaObject.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxCheckerDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxChecker.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxDescription.java
      - copied, changed from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Syntax.java
Removed:
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeType.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRule.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUse.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameForm.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Normalizer.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClass.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/OidObject.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Syntax.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxChecker.java
Modified:
    directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SchemaObject.java
    directory/sandbox/akarasulu/apacheds-2.0/schema/normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/NoOpNormalizer.java

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeTypeDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeType.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeTypeDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeTypeDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeType.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeType.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/AttributeTypeDescription.java
Tue Aug 15 11:26:51 2006
@@ -126,7 +126,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 379008 $
  */
-public interface AttributeType extends OidObject
+public interface AttributeTypeDescription extends RegisteredSchemaObject, 
+    NamedSchemaObject, ObsoletableSchemaObject
 {
     public enum Usage { USERAPPLICATIONS, DIRECTORYOPERATION, DISTRIBUTEDOPERATION, DSAOPERATION
}
     
@@ -170,7 +171,7 @@
      * @throws NamingException
      *             if there is a failure to resolve the superior
      */
-    AttributeType getSuperior() throws NamingException;
+    AttributeTypeDescription getSuperior() throws NamingException;
 
 
     /**
@@ -180,7 +181,7 @@
      * @throws NamingException
      *             if there is a failure to resolve the syntax
      */
-    Syntax getSyntax() throws NamingException;
+    SyntaxDescription getSyntaxDescription() throws NamingException;
 
 
     /**
@@ -198,7 +199,7 @@
      * @throws NamingException
      *             if there is a failure to resolve the matchingRule
      */
-    MatchingRule getEquality() throws NamingException;
+    MatchingRuleDescription getEquality() throws NamingException;
 
 
     /**
@@ -208,7 +209,7 @@
      * @throws NamingException
      *             if there is a failure to resolve the matchingRule
      */
-    MatchingRule getOrdering() throws NamingException;
+    MatchingRuleDescription getOrdering() throws NamingException;
 
 
     /**
@@ -218,5 +219,5 @@
      * @throws NamingException
      *             if there is a failure to resolve the matchingRule
      */
-    MatchingRule getSubstr() throws NamingException;
+    MatchingRuleDescription getSubstr() throws NamingException;
 }

Added: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ComparatorDescription.java?rev=431658&view=auto
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ComparatorDescription.java
(added)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ComparatorDescription.java
Tue Aug 15 11:26:51 2006
@@ -0,0 +1,33 @@
+/*
+ *   Copyright 2006 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.directory.server2.schema.descriptions;
+
+
+import java.util.Comparator;
+
+
+/**
+ * A Comparator SchemaObject used to determine the order of values while 
+ * performing attribute value assertions.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface ComparatorDescription extends SchemaObject, Comparator
+{
+    String getMatchingRuleDescriptionOid();
+}

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRuleDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRule.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRuleDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRuleDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRule.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRule.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITContentRuleDescription.java
Tue Aug 15 11:26:51 2006
@@ -107,7 +107,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface DITContentRule extends OidObject
+public interface DITContentRuleDescription extends RegisteredSchemaObject,
+    NamedSchemaObject, ObsoletableSchemaObject
 {
     /**
      * Gets the STRUCTURAL ObjectClass this DITContentRule specifies attributes
@@ -116,7 +117,7 @@
      * @return the ObjectClass this DITContentRule specifies attributes for
      * @throws NamingException if there is a failure resolving the object
      */
-    ObjectClass getObjectClass() throws NamingException;
+    ObjectClassDescription getObjectClass() throws NamingException;
 
 
     /**
@@ -126,7 +127,7 @@
      * @return the extra AUXILIARY ObjectClasses
      * @throws NamingException if there is a failure resolving the object
      */
-    List<ObjectClass> getAuxObjectClasses() throws NamingException;
+    List<ObjectClassDescription> getAuxObjectClasses() throws NamingException;
 
 
     /**
@@ -136,7 +137,7 @@
      * @return the AttributeTypes of attributes that must be included in entries
      * @throws NamingException if there is a failure resolving the object
      */
-    List<AttributeType> getMustNames() throws NamingException;
+    List<AttributeTypeDescription> getMustNames() throws NamingException;
 
 
     /**
@@ -146,7 +147,7 @@
      * @return the AttributeTypes of attributes that may be included in entries
      * @throws NamingException if there is a failure resolving the object
      */
-    List<AttributeType> getMayNames() throws NamingException;
+    List<AttributeTypeDescription> getMayNames() throws NamingException;
 
 
     /**
@@ -156,5 +157,5 @@
      * @return the AttributeTypes of attributes that are excluded in entries
      * @throws NamingException if there is a failure resolving the object
      */
-    List <AttributeType> getNotNames() throws NamingException;
+    List <AttributeTypeDescription> getNotNames() throws NamingException;
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRuleDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRule.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRuleDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRuleDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRule.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRule.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/DITStructureRuleDescription.java
Tue Aug 15 11:26:51 2006
@@ -41,7 +41,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface DITStructureRule extends OidObject
+public interface DITStructureRuleDescription extends RegisteredSchemaObject,
+    NamedSchemaObject, ObsoletableSchemaObject
 {
     /**
      * The nameForm associating this ditStructureRule with a structural
@@ -51,7 +52,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    NameForm getNameForm() throws NamingException;
+    NameFormDescription getNameForm() throws NamingException;
 
 
     /**
@@ -63,5 +64,5 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<DITStructureRule> getSuperClasses() throws NamingException;
+    List<DITStructureRuleDescription> getSuperClasses() throws NamingException;
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRule.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRule.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRule.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleDescription.java
Tue Aug 15 11:26:51 2006
@@ -18,7 +18,6 @@
 
 
 import javax.naming.NamingException;
-import java.util.Comparator;
 
 
 /**
@@ -65,7 +64,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MatchingRule extends OidObject
+public interface MatchingRuleDescription extends RegisteredSchemaObject,
+    NamedSchemaObject, ObsoletableSchemaObject
 {
     /**
      * Gets the SyntaxImpl used by this MatchingRule.
@@ -73,7 +73,7 @@
      * @return the SyntaxImpl of this MatchingRule
      * @throws NamingException if there is a failure resolving the object
      */
-    Syntax getSyntax() throws NamingException;
+    SyntaxDescription getSyntaxDescription() throws NamingException;
 
 
     /**
@@ -83,7 +83,7 @@
      * @return the ordering Comparator
      * @throws NamingException if there is a failure resolving the object
      */
-    Comparator getComparator() throws NamingException;
+    ComparatorDescription getComparatorDescription() throws NamingException;
 
 
     /**
@@ -93,5 +93,5 @@
      * @return the ordering Comparator
      * @throws NamingException if there is a failure resolving the object
      */
-    Normalizer getNormalizer() throws NamingException;
+    NormalizerDescription getNormalizerDescription() throws NamingException;
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUseDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUse.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUseDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUseDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUse.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUse.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/MatchingRuleUseDescription.java
Tue Aug 15 11:26:51 2006
@@ -60,7 +60,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MatchingRuleUse extends OidObject
+public interface MatchingRuleUseDescription extends NamedSchemaObject, 
+    ObsoletableSchemaObject
 {
     /**
      * Gets the matchingRule this MatchingRuleUse definition applies to.
@@ -68,7 +69,7 @@
      * @return the matchingRule
      * @throws NamingException if there is a failure resolving the object
      */
-    public MatchingRule getMatchingRule() throws NamingException;
+    public MatchingRuleDescription getMatchingRule() throws NamingException;
 
 
     /**
@@ -78,5 +79,5 @@
      * @return the applicable attributes
      * @throws NamingException if there is a failure resolving the object
      */
-    public List<AttributeType> getApplicableAttributes() throws NamingException;
+    public List<AttributeTypeDescription> getApplicableAttributes() throws NamingException;
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameFormDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameForm.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameFormDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameFormDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameForm.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameForm.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NameFormDescription.java
Tue Aug 15 11:26:51 2006
@@ -40,7 +40,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface NameForm extends OidObject
+public interface NameFormDescription extends RegisteredSchemaObject,
+    ObsoletableSchemaObject, NamedSchemaObject
 {
     /**
      * Gets the STRUCTURAL ObjectClass this name form specifies naming
@@ -50,7 +51,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    ObjectClass getObjectClass() throws NamingException;
+    ObjectClassDescription getObjectClass() throws NamingException;
 
 
     /**
@@ -62,7 +63,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<AttributeType> getMustUse() throws NamingException;
+    List<AttributeTypeDescription> getMustUse() throws NamingException;
 
 
     /**
@@ -74,5 +75,5 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<AttributeType> getMaytUse() throws NamingException;
+    List<AttributeTypeDescription> getMaytUse() throws NamingException;
 }

Added: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NamedSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NamedSchemaObject.java?rev=431658&view=auto
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NamedSchemaObject.java
(added)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NamedSchemaObject.java
Tue Aug 15 11:26:51 2006
@@ -0,0 +1,47 @@
+/*
+ *   Copyright 2006 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.directory.server2.schema.descriptions;
+
+
+import java.util.List;
+
+
+/**
+ * SchemaObjects with short names.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface NamedSchemaObject extends SchemaObject
+{
+    /**
+     * Gets aliased names for this OidObject if any exists for it.
+     *
+     * @return the names for this OidObject
+     */
+    List<String> getNames();
+
+
+    /**
+     * Gets the first name in the set of short names for this SchemaObject if
+     * any exists for it.
+     *
+     * @return the first of the names for this SchemaObject or null if one does
+     *         not exist
+     */
+    String getName();
+}

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NormalizerDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Normalizer.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NormalizerDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NormalizerDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Normalizer.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Normalizer.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/NormalizerDescription.java
Tue Aug 15 11:26:51 2006
@@ -26,8 +26,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Normalizer
+public interface NormalizerDescription extends SchemaObject
 {
+    String getMatchingRuleDescriptionOid();
+    
     /**
      * Gets the normalized value.
      * 

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClassDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClass.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClassDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClassDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClass.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClass.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObjectClassDescription.java
Tue Aug 15 11:26:51 2006
@@ -35,7 +35,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface ObjectClass extends OidObject
+public interface ObjectClassDescription extends RegisteredSchemaObject, 
+    NamedSchemaObject, ObsoletableSchemaObject
 {
     public enum Type { ABSTRACT, AUXILLARY, STRUCTURAL }
     
@@ -46,7 +47,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<ObjectClass> getSuperClasses() throws NamingException;
+    List<ObjectClassDescription> getSuperClasses() throws NamingException;
 
 
     /**
@@ -66,7 +67,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<AttributeType> getMustList() throws NamingException;
+    List<AttributeTypeDescription> getMustList() throws NamingException;
 
 
     /**
@@ -78,5 +79,5 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    List<AttributeType> getMayList() throws NamingException;
+    List<AttributeTypeDescription> getMayList() throws NamingException;
 }

Added: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObsoletableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObsoletableSchemaObject.java?rev=431658&view=auto
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObsoletableSchemaObject.java
(added)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/ObsoletableSchemaObject.java
Tue Aug 15 11:26:51 2006
@@ -0,0 +1,37 @@
+/*
+ *   Copyright 2006 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.directory.server2.schema.descriptions;
+
+
+/**
+ * SchemaObjects that can be obsoleted.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface ObsoletableSchemaObject extends SchemaObject
+{
+    /**
+     * Gets whether or not this SchemaObject has been inactivated. All
+     * SchemaObjects except SyntaxDescriptions allow for this parameter within 
+     * their descriptions.  SyntaxDescriptions, and SyntaxCheckerDescriptions
+     * do not extend this interface.
+     * 
+     * @return true if inactive, false if active
+     */
+    boolean isObsolete();
+}

Added: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/RegisteredSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/RegisteredSchemaObject.java?rev=431658&view=auto
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/RegisteredSchemaObject.java
(added)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/RegisteredSchemaObject.java
Tue Aug 15 11:26:51 2006
@@ -0,0 +1,38 @@
+/*
+ *   Copyright 2006 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.directory.server2.schema.descriptions;
+
+
+/**
+ * A schema object with an OID and aliased names.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface RegisteredSchemaObject extends SchemaObject
+{
+    /**
+     * Gets usually what is the numeric object identifier assigned to this
+     * RegisteredSchemaObject. All schema objects except for MatchingRuleUses 
+     * have an OID assigned specifically to them. A MatchingRuleUse's OID really
+     * is the OID of its MatchingRule and not specific to the MatchingRuleUse.
+     * Hence MatchingRuleUse objects do not extend this interface. 
+     *
+     * @return a numeric OID for this RegisteredSchemaObject
+     */
+    String getNumericOid();
+}

Modified: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SchemaObject.java?rev=431658&r1=431657&r2=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SchemaObject.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SchemaObject.java
Tue Aug 15 11:26:51 2006
@@ -17,16 +17,28 @@
 package org.apache.directory.server2.schema.descriptions;
 
 
-import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 
 /**
- * A marker interface for SchemaObjects.
+ * The base interface for SchemaObjects.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface SchemaObject extends Serializable
+public interface SchemaObject
 {
+    /**
+     * Gets a short description about this SchemaObject.
+     *
+     * @return a short description about this SchemaObject
+     */
+    String getDescription();
+
     
+    /**
+     * Gets the extensions associated with this SchemaObject.
+     */
+    Map<String,List<String>> getExtensions();
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxCheckerDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxChecker.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxCheckerDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxCheckerDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxChecker.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxChecker.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxCheckerDescription.java
Tue Aug 15 11:26:51 2006
@@ -22,37 +22,36 @@
 
 /**
  * Used to validate values of a particular syntax.  This interface does not
- * correlate to any LDAP or X.500 construct. It has been created as a means to
+ * correlate to any LDAP or X.500 construct.  It has been created as a means to
  * enforce a syntax within the server.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface SyntaxChecker extends SchemaObject
+public interface SyntaxCheckerDescription extends SchemaObject
 {
     /**
-     * Gets the OID of the attribute syntax.
+     * Gets the OID of the syntax this checker verifies.
      * 
      * @return the object identifier of the Syntax this SyntaxChecker validates
      */
-    String getSyntaxOid();
+    String getSyntaxDescriptionNumericOid();
 
 
     /**
-     * Determines if the attribute's value conforms to the attribute syntax.
+     * Determines if a value conforms to a syntax.
      * 
-     * @param value the value of some attribute with the syntax
+     * @param value the value with the syntax
      * @return true if the value is in the valid syntax, false otherwise
      */
     boolean isValidSyntax( Object value );
 
 
     /**
-     * Asserts whether or not the attribute's value conforms to the attribute
-     * syntax.
+     * Asserts whether or not the value conforms to the syntax.
      * 
-     * @param value the value of some attribute with the syntax
-     * @throws NamingException if the value does not conform to the attribute syntax.
+     * @param value the value of with the syntax
+     * @throws NamingException if the value does not conform to the syntax.
      */
     void assertSyntax( Object value ) throws NamingException;
 }

Copied: directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxDescription.java
(from r431600, directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Syntax.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxDescription.java?p2=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxDescription.java&p1=directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Syntax.java&r1=431600&r2=431658&rev=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/Syntax.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/descriptions/src/main/java/org/apache/directory/server2/schema/descriptions/SyntaxDescription.java
Tue Aug 15 11:26:51 2006
@@ -54,10 +54,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Syntax extends OidObject
+public interface SyntaxDescription extends RegisteredSchemaObject
 {
     /**
-     * Gets whether or not the Syntax is human readible.
+     * Gets whether or not the SyntaxDescription is human readible.
      * 
      * @return true if the syntax can be interpretted by humans, false otherwise
      */
@@ -65,10 +65,10 @@
 
 
     /**
-     * Gets the SyntaxChecker used to validate values in accordance with this
-     * Syntax.
+     * Gets the SyntaxCheckerDescription used to validate values in accordance 
+     * with this SyntaxDescription.
      * 
-     * @return the SyntaxChecker
+     * @return the SyntaxCheckerDescription associated with this SyntaxDescription
      */
-    SyntaxChecker getSyntaxChecker() throws NamingException;
+    SyntaxCheckerDescription getSyntaxCheckerDescription() throws NamingException;
 }

Modified: directory/sandbox/akarasulu/apacheds-2.0/schema/normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/schema/normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/NoOpNormalizer.java?rev=431658&r1=431657&r2=431658&view=diff
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/schema/normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/NoOpNormalizer.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/schema/normalizers/src/main/java/org/apache/directory/server2/schema/normalizers/NoOpNormalizer.java
Tue Aug 15 11:26:51 2006
@@ -19,7 +19,7 @@
 
 import java.io.Serializable;
 
-import org.apache.directory.server2.schema.descriptions.Normalizer;
+import org.apache.directory.server2.schema.descriptions.NormalizerDescription;
 
 
 /**
@@ -28,7 +28,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 379008 $
  */
-public class NoOpNormalizer implements Normalizer, Serializable
+public class NoOpNormalizer implements NormalizerDescription, Serializable
 {
     static final long serialVersionUID = -7817763636668562489L;
 
@@ -39,7 +39,7 @@
      * @param value
      *            any value
      * @return the value argument returned as-is
-     * @see org.apache.directory.shared.ldap.schema.Normalizer#normalize(java.lang.Object)
+     * @see org.apache.directory.shared.ldap.schema.NormalizerDescription#normalize(java.lang.Object)
      */
     public Object normalize( Object value )
     {



Mime
View raw message