You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/07/24 12:50:06 UTC
svn commit: r1150334 - in /directory/apacheds/trunk:
service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
service/src/main/java/org/apache/directory/server/ApacheDsService.java
Author: seelmann
Date: Sun Jul 24 10:50:05 2011
New Revision: 1150334
URL: http://svn.apache.org/viewvc?rev=1150334&view=rev
Log:
Moved initialization of schema partition to ApacheDsService
Modified:
directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?rev=1150334&r1=1150333&r2=1150334&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java Sun Jul 24 10:50:05 2011
@@ -1259,10 +1259,6 @@ public class ServiceBuilder
// The schemaManager
directoryService.setSchemaManager( schemaManager );
- // The schema partition
- SchemaPartition schemaPartition = new SchemaPartition( schemaManager );
- directoryService.setSchemaPartition( schemaPartition );
-
// MUST attributes
// DirectoryService ID
directoryService.setInstanceId( directoryServiceBean.getDirectoryServiceId() );
Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1150334&r1=1150333&r2=1150334&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sun Jul 24 10:50:05 2011
@@ -284,8 +284,10 @@ public class ApacheDsService
DirectoryService directoryService = ServiceBuilder.createDirectoryService( directoryServiceBean,
instanceLayout, schemaManager );
- SchemaPartition schemaPartition = directoryService.getSchemaPartition();
+ // The schema partition
+ SchemaPartition schemaPartition = new SchemaPartition( schemaManager );
schemaPartition.setWrappedPartition( schemaLdifPartition );
+ directoryService.setSchemaPartition( schemaPartition );
directoryService.addPartition( configPartition );