This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 741a449584e28fd00794a7180a17efff891f08d0 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Dec 6 22:43:21 2016 +0000 SLING-6364 fix provider.roots config property name, and property labels/descriptions (patch provided by Sandro Boehme) git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1772990 13f79535-47bb-0310-9956-ffa450edef68 --- .../fsprovider/internal/FsResourceProvider.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java index ef30e3d..ef49b77 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java @@ -71,9 +71,12 @@ public class FsResourceProvider extends ResourceProvider<Object> { * 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 ResourceProvider<Object> { "(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 ResourceProvider<Object> { // ---------- 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"); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
