directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r504750 - in /directory/apacheds/trunk: constants/src/main/java/org/apache/directory/server/constants/ constants/src/main/java/org/apache/directory/server/core/constants/ core/src/main/java/org/apache/directory/server/core/schema/ schema-bo...
Date Thu, 08 Feb 2007 00:10:12 GMT
Author: akarasulu
Date: Wed Feb  7 16:10:11 2007
New Revision: 504750

URL: http://svn.apache.org/viewvc?view=rev&rev=504750
Log:
fixing some constants, adding new apache schema constants, and moving over new schema elements
for subentries into apache schmea

Added:
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
Removed:
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/core/constants/
Modified:
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
    directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema
    directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema

Added: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?view=auto&rev=504750
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
(added)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
Wed Feb  7 16:10:11 2007
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.constants;
+
+
+/**
+ * Constants from the Apache schema.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface ApacheSchemaConstants
+{
+    String COMPARATORS_AT = "comparators";
+    String NORMALIZERS_AT = "normalizers";
+    String SYNTAX_CHECKERS_AT = "syntaxCheckers";
+
+}

Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
Wed Feb  7 16:10:11 2007
@@ -28,8 +28,8 @@
  */
 public interface CoreSchemaConstants
 {
-    public static final String SCHEMA_NAME = "core";
+    String SCHEMA_NAME = "core";
 
-    public static final String OU_AT = "ou";
-    public static final String ORGANIZATIONAL_UNIT_OC = "organizationalUnit";
+    String OU_AT = "ou";
+    String ORGANIZATIONAL_UNIT_OC = "organizationalUnit";
 }

Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
Wed Feb  7 16:10:11 2007
@@ -28,47 +28,52 @@
  */
 public interface MetaSchemaConstants
 {
-    public static final String SCHEMA_NAME = "apachemeta";
+    String SCHEMA_NAME = "apachemeta";
 
-    public static final String META_TOP_OC = "metaTop";
-    public static final String META_SCHEMA_OC = "metaSchema";
-    public static final String META_OBJECT_CLASS_OC = "metaObjectClass";
-    public static final String META_ATTRIBUTE_TYPE_OC = "metaAttributeType";
-    public static final String META_MATCHING_RULE_OC = "metaMatchingRule";
-    public static final String META_NORMALIZER_OC = "metaNormalizer";
-    public static final String META_SYNTAX_OC = "metaSyntax";
-    public static final String META_SYNTAX_CHECKER_OC = "metaSyntaxChecker";
-    public static final String META_COMPARATOR_OC = "metaComparator";
-    public static final String META_NAME_FORM_OC = "metaNameForm";
-    public static final String META_DIT_CONTENT_RULE_OC = "metaDITContentRule";
-
-    public static final String M_SUP_OBJECT_CLASS_AT = "m-supObjectClass";
-    public static final String M_BYTECODE_AT = "m-bytecode";
-    public static final String M_FQCN_AT = "m-fqcn";
-    public static final String M_DEPENDENCIES_AT = "m-dependencies";
-    public static final String M_DISABLED_AT = "m-disabled";
-    public static final String M_DESCRIPTION_AT = "m-description";
-    public static final String M_OBSOLETE_AT = "m-obsolete";
-    public static final String M_NAME_AT = "m-name";
-    public static final String M_OID_AT = "m-oid";
-    public static final String M_OC_AT = "m-oc";
-    public static final String M_AUX_AT = "m-aux";
-    public static final String M_USAGE_AT = "m-usage";
-    public static final String M_NO_USER_MODIFICATION_AT = "m-noUserModification";
-    public static final String M_SINGLE_VALUE_AT = "m-singleValue";
-    public static final String M_COLLECTIVE_AT = "m-collective";
-    public static final String M_SUBSTR_AT = "m-substr";
-    public static final String M_SUP_ATTRIBUTE_TYPE_AT = "m-supAttributeType";
-    public static final String M_ORDERING_AT = "m-ordering";
-    public static final String M_EQUALITY_AT = "m-equality";
-    public static final String M_SYNTAX_AT = "m-syntax";
-    public static final String M_MUST_AT = "m-must";
-    public static final String M_MAY_AT = "m-may";
-    public static final String M_TYPE_OBJECT_CLASS_AT = "m-typeObjectClass";
+    // -- objectClass names --
     
-    public static final String X_HUMAN_READIBLE_AT = "x-humanReadible";
+    String META_TOP_OC = "metaTop";
+    String META_SCHEMA_OC = "metaSchema";
+    String META_OBJECT_CLASS_OC = "metaObjectClass";
+    String META_ATTRIBUTE_TYPE_OC = "metaAttributeType";
+    String META_MATCHING_RULE_OC = "metaMatchingRule";
+    String META_NORMALIZER_OC = "metaNormalizer";
+    String META_SYNTAX_OC = "metaSyntax";
+    String META_SYNTAX_CHECKER_OC = "metaSyntaxChecker";
+    String META_COMPARATOR_OC = "metaComparator";
+    String META_NAME_FORM_OC = "metaNameForm";
+    String META_DIT_CONTENT_RULE_OC = "metaDITContentRule";
 
-    public static final String COMPARATORS_AT = "comparators";
-    public static final String NORMALIZERS_AT = "normalizers";
-    public static final String SYNTAX_CHECKERS_AT = "syntaxCheckers";
+    // -- attributeType names --
+    
+    String M_SUP_OBJECT_CLASS_AT = "m-supObjectClass";
+    String M_BYTECODE_AT = "m-bytecode";
+    String M_FQCN_AT = "m-fqcn";
+    String M_DEPENDENCIES_AT = "m-dependencies";
+    String M_DISABLED_AT = "m-disabled";
+    String M_DESCRIPTION_AT = "m-description";
+    String M_OBSOLETE_AT = "m-obsolete";
+    String M_NAME_AT = "m-name";
+    String M_OID_AT = "m-oid";
+    String M_OC_AT = "m-oc";
+    String M_AUX_AT = "m-aux";
+    String M_USAGE_AT = "m-usage";
+    String M_NO_USER_MODIFICATION_AT = "m-noUserModification";
+    String M_SINGLE_VALUE_AT = "m-singleValue";
+    String M_COLLECTIVE_AT = "m-collective";
+    String M_SUBSTR_AT = "m-substr";
+    String M_SUP_ATTRIBUTE_TYPE_AT = "m-supAttributeType";
+    String M_ORDERING_AT = "m-ordering";
+    String M_EQUALITY_AT = "m-equality";
+    String M_SYNTAX_AT = "m-syntax";
+    String M_MUST_AT = "m-must";
+    String M_MAY_AT = "m-may";
+    String M_TYPE_OBJECT_CLASS_AT = "m-typeObjectClass";
+    String X_HUMAN_READIBLE_AT = "x-humanReadible";
+    
+    // -- schema extensions & values --
+    
+    String X_SCHEMA = "X-SCHEMA";
+    String X_IS_HUMAN_READABLE = "X-IS-HUMAN-READABLE";
+    String SCHEMA_OTHER = "other";
 }

Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
Wed Feb  7 16:10:11 2007
@@ -28,21 +28,21 @@
  */
 public interface SystemSchemaConstants
 {
-    public static final String SCHEMA_NAME = "system";
+    String SCHEMA_NAME = "system";
 
-    public static final String CN_AT = "cn";
-    public static final String OBJECT_CLASS_AT = "objectClass";
-    public static final String CREATORS_NAME_AT = "creatorsName";
-    public static final String CREAT_TIMESTAMP_AT = "createTimestamp";
-    public static final String MODIFY_TIMESTAMP_AT = "modifyTimestamp";
-    public static final String MODIFIERS_NAME_AT = "modifiersName";
+    String CN_AT = "cn";
+    String OBJECT_CLASS_AT = "objectClass";
+    String CREATORS_NAME_AT = "creatorsName";
+    String CREAT_TIMESTAMP_AT = "createTimestamp";
+    String MODIFY_TIMESTAMP_AT = "modifyTimestamp";
+    String MODIFIERS_NAME_AT = "modifiersName";
 
-    public static final String LDAP_SYNTAXES_AT = "ldapSyntaxes";
-    public static final String MATCHING_RULES_AT = "matchingRules";
-    public static final String ATTRIBUTE_TYPES_AT = "attributeTypes";
-    public static final String OBJECT_CLASSES_AT = "objectClasses";
-    public static final String MATCHING_RULE_USE_AT = "matchingRuleUse";
-    public static final String DIT_STRUCTURE_RULES_AT = "ditStructureRules";
-    public static final String DIT_CONTENT_RULES_AT = "ditContentRules";
-    public static final String NAME_FORMS_AT = "nameForms";
+    String LDAP_SYNTAXES_AT = "ldapSyntaxes";
+    String MATCHING_RULES_AT = "matchingRules";
+    String ATTRIBUTE_TYPES_AT = "attributeTypes";
+    String OBJECT_CLASSES_AT = "objectClasses";
+    String MATCHING_RULE_USE_AT = "matchingRuleUse";
+    String DIT_STRUCTURE_RULES_AT = "ditStructureRules";
+    String DIT_CONTENT_RULES_AT = "ditContentRules";
+    String NAME_FORMS_AT = "nameForms";
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
Wed Feb  7 16:10:11 2007
@@ -26,6 +26,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 
+import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -75,10 +76,6 @@
     private static final String[] EMPTY = new String[0];
     private static final Integer[] EMPTY_INT_ARRAY = new Integer[0];
 
-    // TODO put these into an interface in the apacheds-constants project 
-    private static final String X_SCHEMA = "X-SCHEMA";
-    private static final Object X_IS_HUMAN_READABLE = "X-IS-HUMAN-READABLE";
-
     private static final ComparatorDescription[] EMPTY_COMPARATORS = new ComparatorDescription[0];
     private static final NormalizerDescription[] EMPTY_NORMALIZERS = new NormalizerDescription[0];
     private static final SyntaxCheckerDescription[] EMPTY_SYNTAX_CHECKERS = new SyntaxCheckerDescription[0];
@@ -620,7 +617,7 @@
      */
     private boolean isHumanReadable( LdapSyntaxDescription desc )
     {
-        List<String> values = desc.getExtensions().get( X_IS_HUMAN_READABLE );
+        List<String> values = desc.getExtensions().get( MetaSchemaConstants.X_IS_HUMAN_READABLE
);
         
         if ( values == null || values.size() == 0 )
         {
@@ -650,7 +647,7 @@
      */
     private String getSchema( AbstractSchemaDescription desc ) 
     {
-        List<String> values = desc.getExtensions().get( X_SCHEMA );
+        List<String> values = desc.getExtensions().get( MetaSchemaConstants.X_SCHEMA
);
         
         if ( values == null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
Wed Feb  7 16:10:11 2007
@@ -54,9 +54,6 @@
 {
     private static final String OU_OID = "2.5.4.11";
 
-    private static final String SCHEMA_OTHER = "other";
-    private static final Object X_SCHEMA = "X-SCHEMA";
-
     private final PartitionSchemaLoader loader;
     private final SchemaEntityFactory factory;
     private final Registries targetRegistries;
@@ -142,11 +139,11 @@
     public void add( ComparatorDescription comparatorDescription ) throws NamingException
     {
         Comparator comparator = factory.getComparator( comparatorDescription, targetRegistries
);
-        String schemaName = SCHEMA_OTHER;
+        String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
         
-        if ( comparatorDescription.getExtensions().get( X_SCHEMA ) != null )
+        if ( comparatorDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ) !=
null )
         {
-            schemaName = ( String ) comparatorDescription.getExtensions().get( X_SCHEMA ).get(
0 );
+            schemaName = ( String ) comparatorDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA
).get( 0 );
         }
         
         Schema schema = loader.getSchema( schemaName );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
Wed Feb  7 16:10:11 2007
@@ -53,9 +53,6 @@
 {
     private static final String OU_OID = "2.5.4.11";
 
-    private static final String SCHEMA_OTHER = "other";
-    private static final Object X_SCHEMA = "X-SCHEMA";
-
     private final PartitionSchemaLoader loader;
     private final SchemaEntityFactory factory;
     private final Registries targetRegistries;
@@ -141,11 +138,11 @@
     public void add( NormalizerDescription normalizerDescription ) throws NamingException
     {
         Normalizer normalizer = factory.getNormalizer( normalizerDescription, targetRegistries
);
-        String schemaName = SCHEMA_OTHER;
+        String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
         
-        if ( normalizerDescription.getExtensions().get( X_SCHEMA ) != null )
+        if ( normalizerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ) !=
null )
         {
-            schemaName = ( String ) normalizerDescription.getExtensions().get( X_SCHEMA ).get(
0 );
+            schemaName = ( String ) normalizerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA
).get( 0 );
         }
         
         Schema schema = loader.getSchema( schemaName );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
Wed Feb  7 16:10:11 2007
@@ -54,9 +54,6 @@
 {
     private static final String OU_OID = "2.5.4.11";
 
-    private static final String SCHEMA_OTHER = "other";
-    private static final Object X_SCHEMA = "X-SCHEMA";
-
     private final PartitionSchemaLoader loader;
     private final SchemaEntityFactory factory;
     private final Registries targetRegistries;
@@ -141,11 +138,12 @@
     public void add( SyntaxCheckerDescription syntaxCheckerDescription ) throws NamingException
     {
         SyntaxChecker syntaxChecker = factory.getSyntaxChecker( syntaxCheckerDescription,
targetRegistries );
-        String schemaName = SCHEMA_OTHER;
+        String schemaName = MetaSchemaConstants.SCHEMA_OTHER;
         
-        if ( syntaxCheckerDescription.getExtensions().get( X_SCHEMA ) != null )
+        if ( syntaxCheckerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA )
!= null )
         {
-            schemaName = ( String ) syntaxCheckerDescription.getExtensions().get( X_SCHEMA
).get( 0 );
+            schemaName = ( String ) syntaxCheckerDescription.getExtensions()
+                .get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
         }
         
         Schema schema = loader.getSchema( schemaName );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
Wed Feb  7 16:10:11 2007
@@ -31,6 +31,7 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 
+import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.constants.CoreSchemaConstants;
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.constants.SystemSchemaConstants;
@@ -115,8 +116,6 @@
         "metaDITContentRule",
         "metaNameForm"
     };
-    private static final Object X_SCHEMA = null;
-    private static final String SCHEMA_OTHER = null;
 
     private final PartitionSchemaLoader loader;
     private final MetaSchemaHandler metaSchemaHandler;
@@ -192,13 +191,13 @@
         
         OidRegistry oidRegistry = globalRegistries.getOidRegistry();
         
-        comparatorsOid = oidRegistry.getOid( MetaSchemaConstants.COMPARATORS_AT );
+        comparatorsOid = oidRegistry.getOid( ApacheSchemaConstants.COMPARATORS_AT );
         opAttr2handlerIndex.put( comparatorsOid, new Integer( COMPARATOR_INDEX ) );
         
-        normalizersOid = oidRegistry.getOid( MetaSchemaConstants.NORMALIZERS_AT );
+        normalizersOid = oidRegistry.getOid( ApacheSchemaConstants.NORMALIZERS_AT );
         opAttr2handlerIndex.put( normalizersOid, new Integer( NORMALIZER_INDEX ) );
         
-        syntaxCheckersOid = oidRegistry.getOid( MetaSchemaConstants.SYNTAX_CHECKERS_AT );
+        syntaxCheckersOid = oidRegistry.getOid( ApacheSchemaConstants.SYNTAX_CHECKERS_AT
);
         opAttr2handlerIndex.put( syntaxCheckersOid, new Integer( SYNTAX_CHECKER_INDEX ) );
         
         ldapSyntaxesOid = oidRegistry.getOid( SystemSchemaConstants.LDAP_SYNTAXES_AT );
@@ -773,12 +772,12 @@
     
     public String getSchema( AbstractSchemaDescription desc ) 
     {
-        if ( desc.getExtensions().containsKey( X_SCHEMA ) )
+        if ( desc.getExtensions().containsKey( MetaSchemaConstants.X_SCHEMA ) )
         {
-            return desc.getExtensions().get( X_SCHEMA ).get( 0 );
+            return desc.getExtensions().get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
         }
         
-        return SCHEMA_OTHER;
+        return MetaSchemaConstants.SCHEMA_OTHER;
     }
     
 

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema Wed Feb  7 16:10:11
2007
@@ -288,3 +288,44 @@
 # End of Mitosis Related
 # ======================
 
+# =======================
+# Schema Subentry Related
+# =======================
+
+#         | 1.3.6.1.4.1.18060.0.4.1.2.32 | comparators                 |
+#         | 1.3.6.1.4.1.18060.0.4.1.2.33 | normalizers                 |
+#         | 1.3.6.1.4.1.18060.0.4.1.2.34 | syntaxCheckers              |
+
+
+#
+# These operational attributes need a syntax!
+#
+
+# --- comparators AttributeType -----------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.32 NAME 'comparators'
+    DESC 'A multivalued comparator description attribute'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+    USAGE directoryOperation
+)
+
+# --- normalizers AttributeType -----------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.33 NAME 'normalizers'
+    DESC 'A multivalued normalizer description attribute'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+    USAGE directoryOperation
+)
+
+# --- syntaxCheckers AttributeType -----------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.34 NAME 'syntaxCheckers'
+    DESC 'A multivalued syntaxCheckers description attribute'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+    USAGE directoryOperation
+)
+
+# ===========================
+# END Schema Subentry Related
+# ===========================
+

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema?view=diff&rev=504750&r1=504749&r2=504750
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema Wed Feb  7
16:10:11 2007
@@ -73,9 +73,6 @@
 #         | 1.3.6.1.4.1.18060.0.4.0.2.34 | x-humanReadible             |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.37 | m-disabled                  |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.38 | m-dependencies              |
-#         | 1.3.6.1.4.1.18060.0.4.0.2.39 | comparators                 |
-#         | 1.3.6.1.4.1.18060.0.4.0.2.40 | normalizers                 |
-#         | 1.3.6.1.4.1.18060.0.4.0.2.41 | syntaxCheckers              |
 #         +------------------------------+-----------------------------+
 #
 #         +------------------------------+-----------------------------+
@@ -565,33 +562,5 @@
     DESC 'The dependencies of a schema: other schema names.'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
-#
-# These operational attributes need a syntax!
-#
-
-# --- comparators AttributeType -----------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.39 NAME 'comparators'
-    DESC 'A multivalued comparator description attribute'
-    EQUALITY caseIgnoreMatch
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-    USAGE directoryOperation
-)
-
-# --- normalizers AttributeType -----------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.40 NAME 'normalizers'
-    DESC 'A multivalued normalizer description attribute'
-    EQUALITY caseIgnoreMatch
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-    USAGE directoryOperation
-)
-
-# --- syntaxCheckers AttributeType -----------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.41 NAME 'syntaxCheckers'
-    DESC 'A multivalued syntaxCheckers description attribute'
-    EQUALITY caseIgnoreMatch
-    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-    USAGE directoryOperation
 )
 



Mime
View raw message