svn commit: r796984 - in /sling/trunk: bundles/api/src/main/java/org/apache/sling/api/scripting/ bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/ contrib/scri...

[cz...@apache.org]

Author: cziegeler
Date: Thu Jul 23 09:14:15 2009
New Revision: 796984

URL: http://svn.apache.org/viewvc?rev=796984&view=rev
Log:
SLING-1021 - Use the global scope for the script resource resolver to avoid having this in the bindings for the script.

Modified:
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
    sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
    sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/JavaScriptEngineFactory.java

Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java?rev=796984&r1=796983&r2=796984&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScriptConstants.java Thu Jul 23 09:14:15 2009
@@ -28,6 +28,7 @@
      * The name of the script context attribute holding the {@link org.apache.sling.api.resource.ResourceResolver} which
      * has been used to resolve the script. This resource resolver can be used by the
      * script engines to further locate scripts (for includes etc.).
+     * The value is set in the global scope of the script context.
      * @since 2.0.6
      */
     public static final String ATTR_SCRIPT_RESOURCE_RESOLVER = "org.apache.sling.api.scripting.ScriptResourceResolver";

Modified: sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java?rev=796984&r1=796983&r2=796984&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java (original)
+++ sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java Thu Jul 23 09:14:15 2009
@@ -145,7 +145,7 @@
 
             // set the script resource resolver as an attribute
             ctx.setAttribute(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER,
-                    this.scriptResource.getResourceResolver(), ScriptContext.ENGINE_SCOPE);
+                    this.scriptResource.getResourceResolver(), ScriptContext.GLOBAL_SCOPE);
 
             reader = getScriptReader();
             if ( method != null && !(this.scriptEngine instanceof Invocable)) {

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=796984&r1=796983&r2=796984&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Thu Jul 23 09:14:15 2009
@@ -129,7 +129,7 @@
                          final ScriptContext context) {
 
         ResourceResolver resolver = (ResourceResolver) context.getAttribute(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER,
-                ScriptContext.ENGINE_SCOPE);
+                ScriptContext.GLOBAL_SCOPE);
         if ( resolver == null ) {
             resolver = scriptHelper.getScript().getScriptResource().getResourceResolver();
         }

Modified: sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/JavaScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/JavaScriptEngineFactory.java?rev=796984&r1=796983&r2=796984&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/JavaScriptEngineFactory.java (original)
+++ sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/JavaScriptEngineFactory.java Thu Jul 23 09:14:15 2009
@@ -169,7 +169,7 @@
                              final SlingScriptHelper scriptHelper,
                              final ScriptContext context) {
         ResourceResolver resolver = (ResourceResolver) context.getAttribute(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER,
-                ScriptContext.ENGINE_SCOPE);
+                ScriptContext.GLOBAL_SCOPE);
         if ( resolver == null ) {
             resolver = scriptHelper.getScript().getScriptResource().getResourceResolver();
         }