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

[ss...@apache.org]

Author: sseifert
Date: Tue Dec  6 23:02:24 2016
New Revision: 1772994

URL: http://svn.apache.org/viewvc?rev=1772994&view=rev
Log:
SLING-6364 rename config property back to provider.root because this is expected for an resource provider

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=1772994&r1=1772993&r2=1772994&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 23:02:24 2016
@@ -92,7 +92,7 @@ public class FsResourceProvider extends
         @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();
+        String provider_root();
     }
 
     // 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_roots();
+        String providerRoot = config.provider_root();
         if (providerRoot == null || providerRoot.length() == 0) {
             throw new IllegalArgumentException("provider.root property must be set");
         }