svn commit: r1771148 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java

[ra...@apache.org]

Author: radu
Date: Thu Nov 24 14:16:49 2016
New Revision: 1771148

URL: http://svn.apache.org/viewvc?rev=1771148&view=rev
Log:
SLING-6165 - Expose a service for Sling Scripting that provides request-scoped Resource Resolvers for scripting dependencies

* renamed ScriptingResourceResolverFactory to ScriptingResourceResolverProvider to better reflect what this service does

Modified:
    sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java

Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java?rev=1771148&r1=1771147&r2=1771148&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java (original)
+++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java Thu Nov 24 14:16:49 2016
@@ -23,6 +23,7 @@ import org.apache.sling.api.resource.Log
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.scripting.api.resolver.ScriptingResourceResolverProvider;
+import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -33,9 +34,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Component(
-        name = "Apache Sling Scripting Resource Resolver Factory",
         service = {ScriptingResourceResolverProvider.class, ServletRequestListener.class},
-        configurationPid = "org.apache.sling.scripting.core.impl.ScriptingResourceResolverProviderImpl"
+        property = {
+                Constants.SERVICE_DESCRIPTION + "=Apache Sling Scripting Resource Resolver Provider",
+                Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
+        }
+
 )
 @Designate(
         ocd = ScriptingResourceResolverProviderImpl.Configuration.class
@@ -51,8 +55,8 @@ public class ScriptingResourceResolverPr
     private ResourceResolverFactory rrf;
 
     @ObjectClassDefinition(
-            name = "Apache Sling Scripting Resource Resolver Factory Configuration",
-            description = "The Apache Sling Scripting Resource Resolver Factory can be used by scripting bundles to obtain resource " +
+            name = "Apache Sling Scripting Resource Resolver Provider Configuration",
+            description = "The Apache Sling Scripting Resource Resolver Provider can be used by scripting bundles to obtain resource " +
                     "resolvers for solving scripting dependencies."
     )
     @interface Configuration {