directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r481865 - in /directory/trunks/apacheds: core-unit/src/test/java/org/apache/directory/server/core/jndi/ core/src/main/java/org/apache/directory/server/core/partition/ core/src/main/java/org/apache/directory/server/core/partition/impl/btree/...
Date Sun, 03 Dec 2006 19:34:46 GMT
Author: akarasulu
Date: Sun Dec  3 11:34:44 2006
New Revision: 481865

URL: http://svn.apache.org/viewvc?view=rev&rev=481865
Log:
correcting issues with schema pertaining to DIRSERVER-790 here: https://issues.apache.org/jira/browse/DIRSERVER-790.
 It also involves the following OID reorganization: http://cwiki.apache.org/confluence/display/DIRxPMGT/OID+Assignment+Scheme

Modified:
    directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/trunks/apacheds/core/src/main/schema/apache.schema
    directory/trunks/apacheds/core/src/main/schema/apachedns.schema

Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
(original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
Sun Dec  3 11:34:44 2006
@@ -424,7 +424,7 @@
         String filter = "(|(2.5.4.11.1=testing*)(2.5.4.54=testing*)(2.5.4.10=testing*)" +
             "(2.5.4.6=testing*)(2.5.4.43=testing*)(2.5.4.7.1=testing*)(2.5.4.10.1=testing*)"
+
             "(2.5.4.44=testing*)(2.5.4.11=testing*)(2.5.4.4=testing*)(2.5.4.8.1=testing*)"
+
-            "(2.5.4.12=testing*)(1.2.6.1.4.1.18060.1.1.1.3.3=testing*)" +
+            "(2.5.4.12=testing*)(1.3.6.1.4.1.18060.0.4.1.2.3=testing*)" +
             "(2.5.4.7=testing*)(2.5.4.3=testing*)(2.5.4.8=testing*)(2.5.4.42=testing*))";
         NamingEnumeration list = sysRoot.search( "", filter, controls );
         while ( list.hasMore() )

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
Sun Dec  3 11:34:44 2006
@@ -28,20 +28,20 @@
  */
 public class Oid
 {
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.1) for _ndn op attrib */
-    public static final String NDN = "1.2.6.1.4.1.18060.1.1.1.3.1";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.2) for _updn op attrib */
-    public static final String UPDN = "1.2.6.1.4.1.18060.1.1.1.3.2";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.3) for _existance op attrib */
-    public static final String EXISTANCE = "1.2.6.1.4.1.18060.1.1.1.3.3";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.4) for _hierarchy op attrib */
-    public static final String HIERARCHY = "1.2.6.1.4.1.18060.1.1.1.3.4";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.5) for _oneAlias index */
-    public static final String ONEALIAS = "1.2.6.1.4.1.18060.1.1.1.3.5";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.6) for _subAlias index */
-    public static final String SUBALIAS = "1.2.6.1.4.1.18060.1.1.1.3.6";
-    /** Private OID (1.2.6.1.4.1.18060.1.1.1.3.7) for _alias index */
-    public static final String ALIAS = "1.2.6.1.4.1.18060.1.1.1.3.7";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.1) for _ndn op attrib */
+    public static final String NDN = "1.3.6.1.4.1.18060.0.4.1.2.1";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.2) for _updn op attrib */
+    public static final String UPDN = "1.3.6.1.4.1.18060.0.4.1.2.2";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.3) for _existance op attrib */
+    public static final String EXISTANCE = "1.3.6.1.4.1.18060.0.4.1.2.3";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.4) for _hierarchy op attrib */
+    public static final String HIERARCHY = "1.3.6.1.4.1.18060.0.4.1.2.4";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.5) for _oneAlias index */
+    public static final String ONEALIAS = "1.3.6.1.4.1.18060.0.4.1.2.5";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.6) for _subAlias index */
+    public static final String SUBALIAS = "1.3.6.1.4.1.18060.0.4.1.2.6";
+    /** Private OID (1.3.6.1.4.1.18060.0.4.1.2.7) for _alias index */
+    public static final String ALIAS = "1.3.6.1.4.1.18060.0.4.1.2.7";
 
 
     private Oid()

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
Sun Dec  3 11:34:44 2006
@@ -35,7 +35,7 @@
     private static final long serialVersionUID = 3257283621751633459L;
 
     private static final SerializableComparator BIG_INTEGER_COMPARATOR = new SerializableComparator(
-        "1.2.6.1.4.1.18060.1.1.1.2.2" )
+        "1.3.6.1.4.1.18060.0.4.1.1.2" )
     {
         private static final long serialVersionUID = 3690478030414165816L;
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
Sun Dec  3 11:34:44 2006
@@ -43,7 +43,7 @@
 {
     private static final StringComparator STRCOMP = new StringComparator();
     private static final SerializableComparator BIG_INTEGER_COMPARATOR = new SerializableComparator(
-        "1.2.6.1.4.1.18060.1.1.1.2.2" )
+        "1.3.6.1.4.1.18060.0.4.1.1.2" )
     {
         private static final long serialVersionUID = 4048791282048841016L;
 
@@ -54,7 +54,7 @@
         }
     };
     private static final SerializableComparator STRING_COMPARATOR = new SerializableComparator(
-        "1.2.6.1.4.1.18060.1.1.1.2.3" )
+        "1.3.6.1.4.1.18060.0.4.1.1.3" )
     {
         private static final long serialVersionUID = 3258689922792961845L;
 

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
Sun Dec  3 11:34:44 2006
@@ -56,17 +56,17 @@
     {
         Comparator comparator;
 
-        // For exactDnAsStringMatch -> 1.2.6.1.4.1.18060.1.1.1.2.1
+        // For exactDnAsStringMatch -> 1.3.6.1.4.1.18060.0.4.1.1.1
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.1", comparator );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.1", comparator );
 
-        // For bigIntegerMatch -> 1.2.6.1.4.1.18060.1.1.1.2.2
+        // For bigIntegerMatch -> 1.3.6.1.4.1.18060.0.4.1.1.2
         comparator = new BigIntegerComparator();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.2", comparator );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.2", comparator );
 
-        // For jdbmStringMatch -> 1.2.6.1.4.1.18060.1.1.1.2.3
+        // For jdbmStringMatch -> 1.3.6.1.4.1.18060.0.4.1.1.3
         comparator = new StringComparator();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.3", comparator );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.3", comparator );
 
     }
 }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
Sun Dec  3 11:34:44 2006
@@ -49,20 +49,20 @@
     public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
-
-        mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.1", registries );
+        
+        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.1", registries );
         mrule.setNames( new String[]
             { "exactDnAsStringMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.12" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.2", registries );
+        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.2", registries );
         mrule.setNames( new String[]
             { "bigIntegerMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.3", registries );
+        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.3", registries );
         mrule.setNames( new String[]
             { "jdbmStringMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
Sun Dec  3 11:34:44 2006
@@ -52,17 +52,17 @@
     {
         Normalizer normalizer;
 
-        // For exactDnAsStringMatch -> 1.2.6.1.4.1.18060.1.1.1.2.1
+        // For exactDnAsStringMatch -> 1.3.6.1.4.1.18060.0.4.1.1.1
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.1", normalizer );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.1", normalizer );
 
-        // For bigIntegerMatch -> 1.2.6.1.4.1.18060.1.1.1.2.2
+        // For bigIntegerMatch -> 1.3.6.1.4.1.18060.0.4.1.1.2
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.2", normalizer );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.2", normalizer );
 
-        // For jdbmStringMatch -> 1.2.6.1.4.1.18060.1.1.1.2.3
+        // For jdbmStringMatch -> 1.3.6.1.4.1.18060.0.4.1.1.3
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "1.2.6.1.4.1.18060.1.1.1.2.3", normalizer );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.18060.0.4.1.1.3", normalizer );
 
     }
 }

Modified: directory/trunks/apacheds/core/src/main/schema/apache.schema
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/schema/apache.schema?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/schema/apache.schema (original)
+++ directory/trunks/apacheds/core/src/main/schema/apache.schema Sun Dec  3 11:34:44 2006
@@ -5,18 +5,18 @@
 #              +-----------------------------+-----------------+
 #              |  Apache AttributeType OID   |      name       |
 #              +-----------------------------+-----------------+
-#              | 1.2.6.1.4.1.18060.1.1.1.3.1 | apacheNdn       |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.2 | apacheUpdn      |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.3 | apacheExistance |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.4 | apacheHierarchy |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.5 | apacheOneAlias  |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.6 | apacheSubAlias  |
-#              | 1.2.6.1.4.1.18060.1.1.1.3.7 | apacheAlias     |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.1 | apacheNdn       |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.2 | apacheUpdn      |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.3 | apacheExistance |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.4 | apacheHierarchy |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.5 | apacheOneAlias  |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.6 | apacheSubAlias  |
+#              | 1.3.6.1.4.1.18060.0.4.1.2.7 | apacheAlias     |
 #              +-----------------------------+-----------------+
 # =============================================================================
 
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.1 NAME 'apacheNdn'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.1 NAME 'apacheNdn'
     DESC 'Index attribute DN whose values are normalized based on schema'
     EQUALITY exactDnAsStringMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
@@ -24,7 +24,7 @@
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.2 NAME 'apacheUpdn'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.2 NAME 'apacheUpdn'
     DESC 'Index attribute for DN whose values are NOT normalized in any way'
     EQUALITY exactDnAsStringMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
@@ -32,7 +32,7 @@
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.3 NAME 'apacheExistance'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.3 NAME 'apacheExistance'
     DESC 'Index attribute used to track the existence of attributes'
     SUP name
     EQUALITY caseIgnoreMatch
@@ -40,28 +40,28 @@
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.4 NAME 'apacheHierarchy'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.4 NAME 'apacheHierarchy'
     DESC 'Index attribute used to track the DIT hierarchy'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.5 NAME 'apacheOnealias'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.5 NAME 'apacheOnealias'
     DESC 'Index attribute used to track single level aliases'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.6 NAME 'apacheSubalias'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.6 NAME 'apacheSubalias'
     DESC 'Index attribute used to track single level aliases'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.7 NAME 'apacheAlias'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.7 NAME 'apacheAlias'
     DESC 'asdf'
     SUP distinguishedName
     EQUALITY distinguishedNameMatch
@@ -70,19 +70,19 @@
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.9 NAME 'apacheSamType'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.9 NAME 'apacheSamType'
     DESC 'Single-use Authentication Mechanism type/vendor code'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.8 NAME 'prefNodeName'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.8 NAME 'prefNodeName'
     DESC 'Attribute to describe the name of a Java Preferences API node'
     EQUALITY caseExactMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
     SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.10 NAME 'autonomousAreaSubentry'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.10 NAME 'autonomousAreaSubentry'
     DESC 'Used to track a subentry associated with an autonomousArea'
     SUP distinguishedName
     EQUALITY distinguishedNameMatch
@@ -91,7 +91,7 @@
     NO-USER-MODIFICATION
     USAGE directoryOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.11 NAME 'accessControlSubentries'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.11 NAME 'accessControlSubentries'
     DESC 'Used to track a subentry associated with access control areas'
     SUP distinguishedName
     EQUALITY distinguishedNameMatch
@@ -99,114 +99,114 @@
     NO-USER-MODIFICATION
     USAGE directoryOperation )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.1 NAME 'prefNode'
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.1 NAME 'prefNode'
     SUP top
     STRUCTURAL
     MUST prefNodeName )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.12 NAME 'prescriptiveACI'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.12 NAME 'prescriptiveACI'
   DESC 'Access control information that applies to a set of entries'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
   USAGE directoryOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.13 NAME 'entryACI'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.13 NAME 'entryACI'
   DESC 'Access control information that applies to a single entry'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
   USAGE directoryOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.14 NAME 'subentryACI'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.14 NAME 'subentryACI'
   DESC 'Access control information that applies to a single subentry'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
   USAGE directoryOperation )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.2
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.2
     NAME 'accessControlSubentry'
     AUXILIARY 
     MUST prescriptiveACI )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.15
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.15
     NAME 'apacheServicePid'
 	DESC 'A string up to 256 characters in length'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.16
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.16
     NAME 'apacheServiceFactoryPid'
 	DESC 'A string up to 256 characters in length'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.3
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.3
     NAME 'apacheServiceConfiguration'
     SUP top
     STRUCTURAL
     MUST ( cn $ apacheServicePid )
     MAY ( apacheServiceFactoryPid ) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.4
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.4
     NAME 'apacheFactoryConfiguration'
     SUP top
     STRUCTURAL
     MUST ( cn $ apacheServicePid ) )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.17
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.17
     NAME 'apacheCatalogEntryName'
 	DESC 'A string up to 256 characters in length'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.18
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.18
     NAME 'apacheCatalogEntryBaseDn'
 	DESC 'A string up to 256 characters in length'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.5
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.5
     NAME 'apacheCatalogEntry'
     SUP top
     STRUCTURAL
     MUST ( cn $ apacheCatalogEntryBaseDn )
     MAY ( apacheCatalogEntryName ) )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.19
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.19
     NAME 'windowsFilePath'
 	DESC 'A windows file path where case does not make a difference'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.20
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.20
     NAME 'unixFilePath'
 	DESC 'A UNIX file path where case does make a difference'
 	EQUALITY caseExactIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.6
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.6
     NAME 'windowsFile'
     SUP top
     STRUCTURAL
     MUST ( windowsFilePath ) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.7
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.7
     NAME 'unixFile'
     SUP top
     STRUCTURAL
     MUST ( unixFilePath ) )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.21
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.21
     NAME 'fullyQualifiedJavaClassName'
     DESC 'The fully qualified name for a (Java) class'
 	 EQUALITY caseExactIA5Match
 	 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.22
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.22
     NAME 'javaClassByteCode'
 	 DESC 'The actual byte code for a (Java) class'
 	 SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.8
+objectclass ( 1.3.6.1.4.1.18060.0.4.1.3.8
     NAME 'javaClass'
     SUP top
     STRUCTURAL

Modified: directory/trunks/apacheds/core/src/main/schema/apachedns.schema
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/schema/apachedns.schema?view=diff&rev=481865&r1=481864&r2=481865
==============================================================================
--- directory/trunks/apacheds/core/src/main/schema/apachedns.schema (original)
+++ directory/trunks/apacheds/core/src/main/schema/apachedns.schema Sun Dec  3 11:34:44 2006
@@ -4,92 +4,88 @@
 #               +---------------------------+-----------------+
 #               |         Apache OID        |   description   |
 #               +---------------------------+-----------------+
-#               | 1.2.6.1.4.1.18060.1.1.2.1 | syntaxes        |
-#               | 1.2.6.1.4.1.18060.1.1.2.2 | matchingRules   |
-#               | 1.2.6.1.4.1.18060.1.1.2.3 | attributeTypes  |
-#               | 1.2.6.1.4.1.18060.1.1.2.4 | objectClasses   |
 #               +---------------------------+-----------------+
 # =============================================================================
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.1 NAME 'apacheDnsClass'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.1 NAME 'apacheDnsClass'
 	DESC 'The class of a resource record'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.2 NAME 'apacheDnsTtl'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.2 NAME 'apacheDnsTtl'
 	DESC 'An integer denoting time to live'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.3 NAME 'apacheDnsDomainName'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.3 NAME 'apacheDnsDomainName'
 	DESC 'A domain name represented as a sequence of labels'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.4 NAME 'apacheDnsCharacterString'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.4 NAME 'apacheDnsCharacterString'
 	DESC 'A string up to 256 characters in length'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.5 NAME 'apacheDnsIpAddress'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.5 NAME 'apacheDnsIpAddress'
 	DESC 'A 4 octet IP address'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.6 NAME 'apacheDnsSoaMName'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.6 NAME 'apacheDnsSoaMName'
 	DESC 'The domain name of the name server that was the primary source of data for this zone'
 	SUP apacheDnsDomainName SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.7 NAME 'apacheDnsSoaRName'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.7 NAME 'apacheDnsSoaRName'
 	DESC 'The domain name which specifies the mailbox of the person responsible for this zone'
 	SUP apacheDnsDomainName SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.8 NAME 'apacheDnsSoaSerial'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.8 NAME 'apacheDnsSoaSerial'
 	DESC 'The unsigned 32 bit version number of the original copy of the zone'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.9 NAME 'apacheDnsSoaRefresh'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.9 NAME 'apacheDnsSoaRefresh'
 	DESC 'A 32 bit time interval before the zone should be refreshed'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.10 NAME 'apacheDnsSoaRetry'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.10 NAME 'apacheDnsSoaRetry'
 	DESC 'A 32 bit time interval that should elapse before a failed refresh should be retired'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.11 NAME 'apacheDnsSoaExpire'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.11 NAME 'apacheDnsSoaExpire'
 	DESC 'A 32 bit time value that specifies the upper limit on the time interval that can elapse
before the zone is no longer authoritative'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.12 NAME 'apacheDnsSoaMinimum'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.12 NAME 'apacheDnsSoaMinimum'
 	DESC 'The unsigned 32 bit minimum TTL field that should be exported with any RR from this
zone.'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.13 NAME 'apacheDnsMxPreference'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.13 NAME 'apacheDnsMxPreference'
 	DESC 'An integer denoting the mail exchange preference'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.14 NAME 'apacheDnsServicePriority'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.14 NAME 'apacheDnsServicePriority'
 	DESC 'The unsigned 16 bit priority of this target host'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.15 NAME 'apacheDnsServiceWeight'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.15 NAME 'apacheDnsServiceWeight'
 	DESC 'The unsigned 16 bit weight specifying a relative weight for entries with the same
priority'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.2.3.16 NAME 'apacheDnsServicePort'
+attributetype ( 1.3.6.1.4.1.18060.0.4.2.2.16 NAME 'apacheDnsServicePort'
 	DESC 'The unsigned 16 bit port on this target host of this service'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.1
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.1
 	NAME 'apacheDnsAbstractRecord'
 	DESC 'An abstract DNS record objectClass used to build other specific structural objectclasses
for different record types'
 	SUP top
@@ -97,62 +93,62 @@
 	MUST cn
 	MAY ( apacheDnsTtl $ description ) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.2 
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.2 
 	NAME 'apacheDnsAddressRecord'
 	DESC 'An address A record'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsIpAddress )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.3 
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.3 
 	NAME 'apacheDnsPointerRecord'
 	DESC 'A pointer PTR record'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsDomainName )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.4
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.4
 	NAME 'apacheDnsNameServerRecord'
 	DESC 'A name server NS record'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsDomainName )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.5
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.5
 	NAME 'apacheDnsStartOfAuthorityRecord'
 	DESC 'A start of authority SOA record'
 	SUP apacheDnsAbstractRecord
 	MUST ( apacheDnsSoaMName $ apacheDnsSoaRName $ apacheDnsSoaMinimum )
 	MAY ( apacheDnsClass $ apacheDnsSoaSerial $ apacheDnsSoaRefresh $ apacheDnsSoaRetry $ apacheDnsSoaExpire
) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.6
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.6
 	NAME 'apacheDnsCanonicalNameRecord'
 	DESC 'A canonical name CNAME record'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsDomainName )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.7
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.7
 	NAME 'apacheDnsMailExchangeRecord'
 	DESC 'A mail exchange MX record'
 	SUP apacheDnsAbstractRecord 
 	MUST ( apacheDnsMxPreference $ apacheDnsDomainName ) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.8
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.8
 	NAME 'apacheDnsTextRecord'
 	DESC 'A text TXT record'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsCharacterString )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.9
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.9
 	NAME 'apacheDnsServiceRecord'
 	DESC 'A service SRV record'
 	SUP apacheDnsAbstractRecord 
 	MUST ( apacheDnsServicePriority $ apacheDnsServiceWeight $ apacheDnsServicePort $ apacheDnsDomainName
) )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.10
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.10
 	NAME 'apacheDnsReferralNameServer'
 	DESC 'A non-authoritative referral or delegation name server'
 	SUP apacheDnsAbstractRecord 
 	MUST apacheDnsDomainName )
 
-objectclass ( 1.2.6.1.4.1.18060.1.1.2.4.11
+objectclass ( 1.3.6.1.4.1.18060.0.4.2.3.11
 	NAME 'apacheDnsReferralAddress'
 	DESC 'A non-authoritative referral or glue address record'
 	SUP apacheDnsAbstractRecord 



Mime
View raw message