directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r729660 - in /directory/apacheds/trunk: bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/ core-constants/src/main/java/org/apache/directory/server/constants/ core/src/main/java/org/apache/directory/serv...
Date Sat, 27 Dec 2008 19:32:09 GMT
Author: elecharny
Date: Sat Dec 27 11:32:09 2008
New Revision: 729660

URL: http://svn.apache.org/viewvc?rev=729660&view=rev
Log:
Revert the renaming back to apacheOneLevel

Modified:
    directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema
    directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml

Modified: directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
(original)
+++ directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
Sat Dec 27 11:32:09 2008
@@ -63,7 +63,7 @@
      * schema/apacheNdn.db => SYSTEM_INDEX
      * schema/apacheExistance.db => SYSTEM_INDEX
      * schema/apacheAlias.db => SYSTEM_INDEX
-     * schema/apacheHierarchy.db => SYSTEM_INDEX
+     * schema/apacheOneLevel.db => SYSTEM_INDEX
      * schema/apacheUpdn.db => SYSTEM_INDEX
      * schema/objectClass.db => USER_INDEX
      * schema/ou.db => USER_INDEX

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
(original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
Sat Dec 27 11:32:09 2008
@@ -96,9 +96,9 @@
     String APACHE_EXISTANCE_AT                      = "apacheExistance";
     String APACHE_EXISTANCE_OID                     = "1.3.6.1.4.1.18060.0.4.1.2.3";
     
-    // ApacheHierarchy
-    String APACHE_HIERARCHY_AT                      = "apacheHierarchy";
-    String APACHE_HIERARCHY_OID                     = "1.3.6.1.4.1.18060.0.4.1.2.4";
+    // ApacheOneLevel
+    String APACHE_ONE_LEVEL_AT                      = "apacheOneLevel";
+    String APACHE_ONE_LEVEL_OID                     = "1.3.6.1.4.1.18060.0.4.1.2.4";
     
     // ApacheOneAlias
     String APACHE_ONE_ALIAS_AT                      = "apacheOneAlias";

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Sat Dec 27 11:32:09 2008
@@ -68,7 +68,7 @@
         Set<String> set = new HashSet<String>();
         set.add( ApacheSchemaConstants.APACHE_ALIAS_OID );
         set.add( ApacheSchemaConstants.APACHE_EXISTANCE_OID );
-        set.add( ApacheSchemaConstants.APACHE_HIERARCHY_OID );
+        set.add( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID );
         set.add( ApacheSchemaConstants.APACHE_N_DN_OID );
         set.add( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID );
         set.add( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
Sat Dec 27 11:32:09 2008
@@ -36,7 +36,6 @@
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexNotFoundException;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
 import org.apache.directory.server.xdbm.search.impl.DefaultOptimizer;
 import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine;
@@ -216,7 +215,7 @@
                 {
                     store.setPresenceIndex( ( Index<String,ServerEntry> ) index );
                 }
-                else if ( oid.equals( ApacheSchemaConstants.APACHE_HIERARCHY_OID ) )
+                else if ( oid.equals( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID ) )
                 {
                     store.setOneLevelIndex( ( Index<Long,ServerEntry> ) index );
                 }

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
Sat Dec 27 11:32:09 2008
@@ -323,9 +323,9 @@
         if ( oneLevelIdx == null )
         {
             oneLevelIdx = new JdbmIndex<Long,E>();
-            oneLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_HIERARCHY_OID );
-            systemIndices.put( ApacheSchemaConstants.APACHE_HIERARCHY_OID, oneLevelIdx );
-            oneLevelIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_HIERARCHY_OID
), workingDirectory );
+            oneLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID );
+            systemIndices.put( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID, oneLevelIdx );
+            oneLevelIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID
), workingDirectory );
         }
 
         if ( oneAliasIdx == null )

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?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema Sat Dec 27 11:32:09
2008
@@ -25,7 +25,7 @@
 #              | 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.4  | apacheOneLevel  |
 #              | 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     |
@@ -58,8 +58,8 @@
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
-attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.4 NAME 'apacheHierarchy'
-    DESC 'Index attribute used to track the DIT hierarchy'
+attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.4 NAME 'apacheOneLevel'
+    DESC 'Index attribute used to track one level searches'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION
@@ -73,14 +73,14 @@
     USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.6 NAME 'apacheSubAlias'
-    DESC 'Index attribute used to track single level aliases'
+    DESC 'Index attribute used to track sub level aliases'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION
     USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.43 NAME 'apacheSubLevel'
-    DESC 'Index attribute used to track single level aliases'
+    DESC 'Index attribute used to track sub level searches'
     EQUALITY integerMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
     NO-USER-MODIFICATION

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml?rev=729660&r1=729659&r2=729660&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml Sat Dec
27 11:32:09 2008
@@ -38,7 +38,7 @@
           <jdbmIndex attributeId="apacheNdn" cacheSize="100"/>
           <jdbmIndex attributeId="apacheUpdn" cacheSize="100"/>
           <jdbmIndex attributeId="apacheExistance" cacheSize="100"/>
-          <jdbmIndex attributeId="apacheHierarchy" cacheSize="100"/>
+          <jdbmIndex attributeId="apacheOneLevel" cacheSize="100"/>
           <jdbmIndex attributeId="apacheOneAlias" cacheSize="10"/>
           <jdbmIndex attributeId="apacheSubAlias" cacheSize="10"/>
           <jdbmIndex attributeId="apacheAlias" cacheSize="10"/>
@@ -59,7 +59,7 @@
           <jdbmIndex attributeId="apacheNdn" cacheSize="100"/>
           <jdbmIndex attributeId="apacheUpdn" cacheSize="100"/>
           <jdbmIndex attributeId="apacheExistance" cacheSize="100"/>
-          <jdbmIndex attributeId="apacheHierarchy" cacheSize="100"/>
+          <jdbmIndex attributeId="apacheOneLevel" cacheSize="100"/>
           <jdbmIndex attributeId="apacheOneAlias" cacheSize="10"/>
           <jdbmIndex attributeId="apacheSubAlias" cacheSize="10"/>
           <jdbmIndex attributeId="apacheAlias" cacheSize="10"/>



Mime
View raw message