You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/06 23:05:16 UTC

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

Author: sseifert
Date: Tue Dec  6 23:05:16 2016
New Revision: 1772995

URL: http://svn.apache.org/viewvc?rev=1772995&view=rev
Log:
SLING-6364 make sure webconsole nameHint is included in metatype

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=1772995&r1=1772994&r2=1772995&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:05:16 2016
@@ -56,8 +56,7 @@ import org.osgi.service.metatype.annotat
            configurationPolicy=ConfigurationPolicy.REQUIRE,
            property={
                    Constants.SERVICE_DESCRIPTION + "=Sling Filesystem Resource Provider",
-                   Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
-                   "webconsole.configurationFactory.nameHint=Root paths: {" + ResourceProvider.PROPERTY_ROOT + "}"
+                   Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
            })
 @Designate(ocd=FsResourceProvider.Config.class, factory=true)
 public class FsResourceProvider extends ResourceProvider<Object> {
@@ -93,6 +92,11 @@ public class FsResourceProvider extends
                 description = "Location in the virtual resource tree where the " +
                 "filesystem resources are mapped in. This property must not be an empty string.")
         String provider_root();
+        
+        /**
+         * Internal Name hint for web console.
+         */
+        String webconsole_configurationFactory_nameHint() default "Root path: {" + ResourceProvider.PROPERTY_ROOT + "}";
     }
 
     // The location in the resource tree where the resources are mapped