directory-commits mailing list archives

Author: elecharny
Date: Wed Sep  9 19:30:40 2009
New Revision: 813086

URL: http://svn.apache.org/viewvc?rev=813086&view=rev
Log:
Added jdbm-partition in the pom.xml file
Added schemaExtractor 

Modified:
    directory/apacheds/branches/apacheds-schema/core-integ/pom.xml
    directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java

Modified: directory/apacheds/branches/apacheds-schema/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/pom.xml?rev=813086&r1=813085&r2=813086&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/pom.xml Wed Sep  9 19:30:40 2009
@@ -56,7 +56,7 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
       <version>${pom.version}</version>
-      <scope>test</scope>
+      <!--scope>test</scope-->
     </dependency>  
 
     <dependency>

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java?rev=813086&r1=813085&r2=813086&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
Wed Sep  9 19:30:40 2009
@@ -34,6 +34,7 @@
 import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 
 
@@ -74,24 +75,10 @@
             
             ldifPartition.setWorkingDirectory( workingDirectory + "/schema" );
             
-            // Init the AvlPartition
-            //AvlPartition avlPartition = new AvlPartition();
-            //avlPartition.setId( "schema" );
-            //avlPartition.setSuffix( "ou=schema" );
-            //avlPartition.setRegistries( registries );
-            
-            // Inject the AvlPartition into the LdifPartition
-            //ldifPartition.setWrappedPartition( avlPartition );
-            
             // Extract the schema on disk (a brand new one) and load the registries
-            //File schemaRepository = new File( workingDirectory, "schema" );
-            //SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory
) );
-            //extractor.extractOrCopy();
-            //LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
-            //loader.loadAllEnabled( registries );
-
-            // Initialize the LdifPartition now that the registries are loaded
-            //ldifPartition.initialize();
+            File schemaRepository = new File( workingDirectory, "schema" );
+            SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory
) );
+            extractor.extractOrCopy();
             
             schemaPartition.setWrappedPartition( ldifPartition );
             schemaPartition.setRegistries( registries );