svn commit: r1306970 - /incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java

[rw...@apache.org]

Author: rwesten
Date: Thu Mar 29 16:35:20 2012
New Revision: 1306970

URL: http://svn.apache.org/viewvc?rev=1306970&view=rev
Log:
STANBOL-561: The path configured for the MainDatafileProvider is now relative to the ${sling.home} or if not present the current working directory.

Modified:
    incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java

Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java?rev=1306970&r1=1306969&r2=1306970&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java Thu Mar 29 16:35:20 2012
@@ -57,8 +57,10 @@ import org.slf4j.LoggerFactory;
 @Service
 @Property(name=Constants.SERVICE_RANKING, intValue=Integer.MAX_VALUE)
 public class MainDataFileProvider implements DataFileProvider, DataFileProviderLog {
-
-    @Property(value="sling/datafiles")
+    /**
+     * Relative to the "sling.home" or if not present the working directory.
+     */
+    @Property(value="datafiles")
     public static final String DATA_FILES_FOLDER_PROP = "data.files.folder";
 
     @Property(intValue=100)
@@ -78,7 +80,13 @@ public class MainDataFileProvider implem
     
     @Activate
     protected void activate(ComponentContext ctx) throws ConfigurationException {
-        dataFilesFolder = new File(requireProperty(ctx.getProperties(), DATA_FILES_FOLDER_PROP, String.class));
+        String folderName = requireProperty(ctx.getProperties(), DATA_FILES_FOLDER_PROP, String.class);
+        String slingHome = ctx.getBundleContext().getProperty("sling.home");
+        if(slingHome != null){
+            dataFilesFolder = new File(slingHome,folderName);
+        } else {
+            dataFilesFolder = new File(folderName);
+        }
         if(!dataFilesFolder.exists()){
             if(!dataFilesFolder.mkdirs()){
                 throw new ConfigurationException(DATA_FILES_FOLDER_PROP, "Unable to create the configured Directory "+dataFilesFolder);