directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1051330 - in /directory/apacheds/branches/apacheds-AP/service-builder: ./ src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Date Tue, 21 Dec 2010 00:15:28 GMT
Author: elecharny
Date: Tue Dec 21 00:15:28 2010
New Revision: 1051330

URL: http://svn.apache.org/viewvc?rev=1051330&view=rev
Log:
Merged back some modifs from trunk

Modified:
    directory/apacheds/branches/apacheds-AP/service-builder/   (props changed)
    directory/apacheds/branches/apacheds-AP/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java

Propchange: directory/apacheds/branches/apacheds-AP/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 00:15:28 2010
@@ -1 +1,2 @@
 /directory/apacheds/branches/antoine/service-builder:1038305-1044163
+/directory/apacheds/trunk/service-builder:1049007-1051328

Modified: directory/apacheds/branches/apacheds-AP/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?rev=1051330&r1=1051329&r2=1051330&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
(original)
+++ directory/apacheds/branches/apacheds-AP/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Tue Dec 21 00:15:28 2010
@@ -994,12 +994,12 @@ public class ServiceBuilder
         
         if ( jdbmIndexBean.getIndexWorkingDir() != null )
         {
-            index.setWkDirPath( new File( jdbmIndexBean.getIndexWorkingDir() ) );
+            index.setWkDirPath( new File( jdbmIndexBean.getIndexWorkingDir() ).toURI() );
         }
         else
         {
             // Set the Partition working dir as a default
-            index.setWkDirPath( new File( partition.getPartitionPath() ) );
+            index.setWkDirPath( partition.getPartitionPath() );
         }
                 
         return index;



Mime
View raw message