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/23 22:32:04 UTC
svn commit: r1150216 -
/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Author: seelmann
Date: Sat Jul 23 20:32:03 2011
New Revision: 1150216
URL: http://svn.apache.org/viewvc?rev=1150216&view=rev
Log:
Fix NPE when starting up the ApacheDsService
Modified:
directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.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=1150216&r1=1150215&r2=1150216&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 Sat Jul 23 20:32:03 2011
@@ -74,6 +74,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.schema.SchemaPartition;
import org.apache.directory.server.integration.http.HttpServer;
import org.apache.directory.server.integration.http.WebApp;
import org.apache.directory.server.kerberos.kdc.KdcServer;
@@ -1259,6 +1260,10 @@ 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() );
Re: svn commit: r1150216 - /directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Posted by Alex Karasulu <ak...@apache.org>.
On Sun, Jul 24, 2011 at 1:21 PM, Kiran Ayyagari <ka...@apache.org> wrote:
> The right place is ApacheDsService
+1
Best Regards,
-- Alex
Re: svn commit: r1150216 - /directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Posted by Kiran Ayyagari <ka...@apache.org>.
The right place is ApacheDsService
On 24-Jul-2011 2:03 PM, "Stefan Seelmann" <se...@apache.org> wrote:
On Sat, Jul 23, 2011 at 11:02 PM, Emmanuel Lecharny <el...@gmail.com>
wrote:
> On 7/23/11 10:32 ...
I just checked Pierre-Arnaud's commit. He added the code to create the
SchemaPartition to ApacheDsService class while I added the code to
ServiceBuilder class. I'm not sure what's the better place.
> Btw, I'm wondering why we don't have a test that check that the server is
> correctly started...
...
Yes, that would be good.
Re: svn commit: r1150216 - /directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Posted by Pierre-Arnaud Marcelot <pa...@marcelot.net>.
Hi guys,
I just added a first basic test case (which might probably need further improvements).
See revision 1150724.
http://svn.apache.org/viewvc?rev=1150724&view=rev
Regards,
Pierre-Arnaud
On 24 juil. 2011, at 10:32, Stefan Seelmann wrote:
> On Sat, Jul 23, 2011 at 11:02 PM, Emmanuel Lecharny <el...@gmail.com> wrote:
>> On 7/23/11 10:32 PM, seelmann@apache.org wrote:
>>>
>>> Author: seelmann
>>> Date: Sat Jul 23 20:32:03 2011
>>> New Revision: 1150216
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1150216&view=rev
>>> Log:
>>> Fix NPE when starting up the ApacheDsService
>>
>> Rahhh, my bad. I'm pretty sure that Pierre-Arnaud fixed it and that I undid
>> his commit...
>
> I just checked Pierre-Arnaud's commit. He added the code to create the
> SchemaPartition to ApacheDsService class while I added the code to
> ServiceBuilder class. I'm not sure what's the better place.
>
>> Btw, I'm wondering why we don't have a test that check that the server is
>> correctly started...
>
> Yes, that would be good.
Re: svn commit: r1150216 - /directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Posted by Stefan Seelmann <se...@apache.org>.
On Sat, Jul 23, 2011 at 11:02 PM, Emmanuel Lecharny <el...@gmail.com> wrote:
> On 7/23/11 10:32 PM, seelmann@apache.org wrote:
>>
>> Author: seelmann
>> Date: Sat Jul 23 20:32:03 2011
>> New Revision: 1150216
>>
>> URL: http://svn.apache.org/viewvc?rev=1150216&view=rev
>> Log:
>> Fix NPE when starting up the ApacheDsService
>
> Rahhh, my bad. I'm pretty sure that Pierre-Arnaud fixed it and that I undid
> his commit...
I just checked Pierre-Arnaud's commit. He added the code to create the
SchemaPartition to ApacheDsService class while I added the code to
ServiceBuilder class. I'm not sure what's the better place.
> Btw, I'm wondering why we don't have a test that check that the server is
> correctly started...
Yes, that would be good.
Re: svn commit: r1150216 - /directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Posted by Emmanuel Lecharny <el...@gmail.com>.
On 7/23/11 10:32 PM, seelmann@apache.org wrote:
> Author: seelmann
> Date: Sat Jul 23 20:32:03 2011
> New Revision: 1150216
>
> URL: http://svn.apache.org/viewvc?rev=1150216&view=rev
> Log:
> Fix NPE when starting up the ApacheDsService
Rahhh, my bad. I'm pretty sure that Pierre-Arnaud fixed it and that I
undid his commit...
Thanks Stefan !
Btw, I'm wondering why we don't have a test that check that the server
is correctly started...
--
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com