directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r893348 - /directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
Date Tue, 22 Dec 2009 23:27:09 GMT
Author: elecharny
Date: Tue Dec 22 23:27:09 2009
New Revision: 893348

URL: http://svn.apache.org/viewvc?rev=893348&view=rev
Log:
o Used a LdifLoader instead of a Jar loader
o Minor cleanup

Modified:
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=893348&r1=893347&r2=893348&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
Tue Dec 22 23:27:09 2009
@@ -55,9 +55,11 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.apache.directory.shared.schema.DefaultSchemaManager;
 import org.apache.directory.shared.schema.loader.ldif.JarLdifSchemaLoader;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
 
 
 /**
@@ -105,10 +107,11 @@
             // 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();
 
             schemaPartition.setWrappedPartition( ldifPartition );
 
-            JarLdifSchemaLoader loader = new JarLdifSchemaLoader();
+            SchemaLoader loader = new LdifSchemaLoader( schemaRepository );
 
             SchemaManager schemaManager = new DefaultSchemaManager( loader );
             service.setSchemaManager( schemaManager );
@@ -124,8 +127,6 @@
 
             schemaPartition.setSchemaManager( schemaManager );
 
-            extractor.extractOrCopy();
-
             service.getChangeLog().setEnabled( true );
 
             // change the working directory to something that is unique
@@ -147,7 +148,6 @@
 
             service.setSystemPartition( systemPartition );
             service.setAccessControlEnabled( true );
-            AutzIntegUtils.service = service;
         }
     }
 



Mime
View raw message