svn commit: r1772990 - /sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java

[ss...@apache.org]

Author: sseifert
Date: Tue Dec  6 22:43:21 2016
New Revision: 1772990

URL: http://svn.apache.org/viewvc?rev=1772990&view=rev
Log:
SLING-6364 fix provider.roots config property name, and property labels/descriptions (patch provided by Sandro Boehme)

Modified:
    sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java

Modified: sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=1772990&r1=1772989&r2=1772990&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java (original)
+++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java Tue Dec  6 22:43:21 2016
@@ -71,9 +71,12 @@ public class FsResourceProvider extends
          * files and folders mapped into the resource tree (value is
          * "provider.file").
          */
-        @AttributeDefinition(name = "Provider Root",
-                description = "Location in the virtual resource tree where the " +
-                              "filesystem resources are mapped in. This property must not be an empty string.")
+        @AttributeDefinition(name = "Filesystem Root",
+                description = "Filesystem directory mapped to the virtual " +
+                        "resource tree. This property must not be an empty string. If the path is " +
+                        "relative it is resolved against sling.home or the current working directory. " +
+                        "The path may be a file or folder. If the path does not address an existing " +
+                        "file or folder, an empty folder is created.")
         String provider_file();
 
         /**
@@ -86,13 +89,10 @@ public class FsResourceProvider extends
              "(the default is 1000). If a change is detected, resource events are sent through the event admin.")
         long provider_checkinterval() default 1000;
 
-        @AttributeDefinition(name = "Filesystem Root",
-                description = "Filesystem directory mapped to the virtual " +
-                              "resource tree. This property must not be an empty string. If the path is " +
-                              "relative it is resolved against sling.home or the current working directory. " +
-                              "The path may be a file or folder. If the path does not address an existing " +
-                              "file or folder, an empty folder is created.")
-        String provider_root();
+        @AttributeDefinition(name = "Provider Root",
+                description = "Location in the virtual resource tree where the " +
+                "filesystem resources are mapped in. This property must not be an empty string.")
+        String provider_roots();
     }
 
     // The location in the resource tree where the resources are mapped
@@ -215,7 +215,7 @@ public class FsResourceProvider extends
     // ---------- SCR Integration
     @Activate
     protected void activate(BundleContext bundleContext, final Config config) {
-        String providerRoot = config.provider_root();
+        String providerRoot = config.provider_roots();
         if (providerRoot == null || providerRoot.length() == 0) {
             throw new IllegalArgumentException("provider.root property must be set");
         }