svn commit: r1771169 - in /sling/trunk/bundles/scripting: api/src/main/java/org/apache/sling/scripting/api/resolver/ api/src/main/java/org/apache/sling/scripting/api/resource/ core/src/main/java/org/apache/sling/scripting/core/impl/

[ra...@apache.org]

Author: radu
Date: Thu Nov 24 16:03:55 2016
New Revision: 1771169

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

* renamed org.apache.sling.scripting.api.resolver to org.apache.sling.scripting.api.resource

Added:
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
      - copied, changed from r1771164, sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/ScriptingResourceResolverProvider.java
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java
      - copied, changed from r1771164, sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/package-info.java
Removed:
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/ScriptingResourceResolverProvider.java
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/package-info.java
Modified:
    sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolver.java
    sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java

Copied: sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java (from r1771164, sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/ScriptingResourceResolverProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java?p2=sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java&p1=sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/ScriptingResourceResolverProvider.java&r1=1771164&r2=1771169&rev=1771169&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/ScriptingResourceResolverProvider.java (original)
+++ sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java Thu Nov 24 16:03:55 2016
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package org.apache.sling.scripting.api.resolver;
+package org.apache.sling.scripting.api.resource;
 
 import org.apache.sling.api.resource.ResourceResolver;
 

Copied: sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java (from r1771164, sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/package-info.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java?p2=sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java&p1=sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/package-info.java&r1=1771164&r2=1771169&rev=1771169&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resolver/package-info.java (original)
+++ sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java Thu Nov 24 16:03:55 2016
@@ -26,6 +26,6 @@
  * 2.11.0).</p>
  */
 @Version("1.0.0")
-package org.apache.sling.scripting.api.resolver;
+package org.apache.sling.scripting.api.resource;
 
 import org.osgi.annotation.versioning.Version;

Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolver.java?rev=1771169&r1=1771168&r2=1771169&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolver.java (original)
+++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolver.java Thu Nov 24 16:03:55 2016
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Log
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.scripting.api.resolver.ScriptingResourceResolverProvider;
+import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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=1771169&r1=1771168&r2=1771169&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 16:03:55 2016
@@ -22,7 +22,7 @@ import javax.servlet.ServletRequestListe
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.scripting.api.resolver.ScriptingResourceResolverProvider;
+import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;