Modified: directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml (original)
+++ directory/branches/apacheds/optimization/server-installers/src/main/installers/server.xml Tue Jul 11 17:26:43 2006
@@ -159,30 +159,69 @@
     </property>
   </bean>
   
-  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration">
+  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
     <property name="name"><value>example</value></property>
-    <property name="cacheSize"><value>5000</value></property>
+    <property name="cacheSize"><value>10000</value></property>
     <property name="suffix"><value>dc=example,dc=com</value></property>
+
+    <!--
+      Synchronization on writes does not wait for synch operations
+      to flush dirty pages.  Writes persist immediately to disk at 
+      a cost to performance with increased data integrity.  Otherwise
+      the periodic synch operation will flush dirty pages using the
+      synchPeriodMillis parameter in the main configuration.
+    -->
+    <property name="synchOnWrite"><value>false</value></property>
     <property name="indexedAttributes">
       <set>
-        <!-- Use attributeId strings for default index configuration -->
-        <value>dc</value>
-        <value>ou</value>
-        <value>krb5PrincipalName</value>
-        <value>uid</value>
-
-        <!-- 
-             If the partition is a BTree implementation then you can configure
-             indices to have custom cache sizes using the following bean to
-             specify the index and it's cache size.
-             
-             System indices may also be included here to override default cache
-             size values for btree based partitions.
-         -->
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.1</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.2</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.3</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.4</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.5</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.6</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.7</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
 
         <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>dc</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>ou</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>krb5PrincipalName</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>uid</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
           <property name="attributeId"><value>objectClass</value></property>
-          <property name="cacheSize"><value>5000</value></property>
+          <property name="cacheSize"><value>100</value></property>
         </bean>
       </set>
     </property>

Modified: directory/branches/apacheds/optimization/server-main/server.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-main/server.xml?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/server-main/server.xml (original)
+++ directory/branches/apacheds/optimization/server-main/server.xml Tue Jul 11 17:26:43 2006
@@ -159,30 +159,69 @@
     </property>
   </bean>
   
-  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration">
+  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
     <property name="name"><value>example</value></property>
-    <property name="cacheSize"><value>5000</value></property>
+    <property name="cacheSize"><value>10000</value></property>
     <property name="suffix"><value>dc=example,dc=com</value></property>
+
+    <!--
+      Synchronization on writes does not wait for synch operations
+      to flush dirty pages.  Writes persist immediately to disk at 
+      a cost to performance with increased data integrity.  Otherwise
+      the periodic synch operation will flush dirty pages using the
+      synchPeriodMillis parameter in the main configuration.
+    -->
+    <property name="synchOnWrite"><value>false</value></property>
     <property name="indexedAttributes">
       <set>
-        <!-- Use attributeId strings for default index configuration -->
-        <value>dc</value>
-        <value>ou</value>
-        <value>krb5PrincipalName</value>
-        <value>uid</value>
-
-        <!-- 
-             If the partition is a BTree implementation then you can configure
-             indices to have custom cache sizes using the following bean to
-             specify the index and it's cache size.
-             
-             System indices may also be included here to override default cache
-             size values for btree based partitions.
-         -->
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.1</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.2</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.3</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.4</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.5</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.6</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>1.2.6.1.4.1.18060.1.1.1.3.7</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
 
         <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>dc</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>ou</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>krb5PrincipalName</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId"><value>uid</value></property>
+          <property name="cacheSize"><value>100</value></property>
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
           <property name="attributeId"><value>objectClass</value></property>
-          <property name="cacheSize"><value>5000</value></property>
+          <property name="cacheSize"><value>100</value></property>
         </bean>
       </set>
     </property>

Modified: directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java (original)
+++ directory/branches/apacheds/optimization/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java Tue Jul 11 17:26:43 2006
@@ -20,7 +20,7 @@
 
 import org.apache.directory.server.configuration.MutableServerStartupConfiguration;
 import org.apache.directory.server.core.configuration.Configuration;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.core.configuration.SyncConfiguration;
 import org.apache.directory.server.jndi.ServerContextFactory;
@@ -303,8 +303,8 @@
         Set indexedAttrs;
         BasicAttribute attr;
         Set pcfgs = new HashSet();
-        MutableDirectoryPartitionConfiguration pcfg;
-        pcfg = new MutableDirectoryPartitionConfiguration();
+        MutablePartitionConfiguration pcfg;
+        pcfg = new MutablePartitionConfiguration();
 
         pcfg.setName( this.customRootPartitionName );
         pcfg.setSuffix( "dc=" + this.customRootPartitionName );

Modified: directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java (original)
+++ directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/MiscTest.java Tue Jul 11 17:26:43 2006
@@ -17,7 +17,7 @@
 package org.apache.directory.server;
 
 
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.ldap.message.Control;
@@ -72,7 +72,7 @@
         {
             Set partitions = new HashSet();
             partitions.addAll( configuration.getContextPartitionConfigurations() );
-            MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration();
+            MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
             partition.setSuffix( "dc=aPache,dc=org" );
             Attributes entry = new BasicAttributes( "dc", "aPache", true );
             Attribute oc = new BasicAttribute( "objectClass" );
@@ -93,7 +93,7 @@
             // create a partition to search
             Set partitions = new HashSet();
             partitions.addAll( configuration.getContextPartitionConfigurations() );
-            MutableDirectoryPartitionConfiguration partition = new MutableDirectoryPartitionConfiguration();
+            MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
             partition.setSuffix( "dc=apache,dc=org" );
             Attributes entry = new BasicAttributes( "dc", "apache", true );
             Attribute oc = new BasicAttribute( "objectClass" );

Modified: directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java?rev=421053&r1=421052&r2=421053&view=diff
==============================================================================
--- directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java (original)
+++ directory/branches/apacheds/optimization/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java Tue Jul 11 17:26:43 2006
@@ -30,7 +30,7 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 
@@ -54,10 +54,10 @@
         Set indexedAttrs;
         Set pcfgs = new HashSet();
 
-        MutableDirectoryPartitionConfiguration pcfg;
+        MutablePartitionConfiguration pcfg;
 
         // Add partition 'testing'
-        pcfg = new MutableDirectoryPartitionConfiguration();
+        pcfg = new MutablePartitionConfiguration();
         pcfg.setName( "testing" );
         pcfg.setSuffix( "ou=testing" );
 
@@ -80,7 +80,7 @@
         pcfgs.add( pcfg );
 
         // Add partition 'example'
-        pcfg = new MutableDirectoryPartitionConfiguration();
+        pcfg = new MutablePartitionConfiguration();
         pcfg.setName( "example" );
         pcfg.setSuffix( "dc=example" );
 
@@ -104,7 +104,7 @@
         pcfgs.add( pcfg );
 
         // Add partition 'MixedCase'
-        pcfg = new MutableDirectoryPartitionConfiguration();
+        pcfg = new MutablePartitionConfiguration();
         pcfg.setName( "mixedcase" );
         pcfg.setSuffix( "dc=MixedCase" );
 
@@ -280,10 +280,10 @@
     
     public void testBadPartition() throws Exception
     {
-        MutableDirectoryPartitionConfiguration pcfg;
+        MutablePartitionConfiguration pcfg;
 
         // Add partition 'test=testing'
-        pcfg = new MutableDirectoryPartitionConfiguration();
+        pcfg = new MutablePartitionConfiguration();
         pcfg.setName( "testing" );
         
         try