svn commit: r1773764 - in /sling/trunk/bundles/scripting/api/src/main/java: javax/script/ScriptEngineManager.java org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java org/apache/sling/scripting/api/resource/package-info.java

[ra...@apache.org]

Author: radu
Date: Mon Dec 12 11:29:35 2016
New Revision: 1773764

URL: http://svn.apache.org/viewvc?rev=1773764&view=rev
Log:
trivial: corrected javadoc

Modified:
    sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
    sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java

Modified: sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java?rev=1773764&r1=1773763&r2=1773764&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java (original)
+++ sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java Mon Dec 12 11:29:35 2016
@@ -82,7 +82,8 @@ public class ScriptEngineManager {
     }
 
     /**
-     * @deprecated use {@link #setBindings(Bindings)} instaed. This method is
+     * @param globalScope the global scope bindings map
+     * @deprecated use {@link #setBindings(Bindings)} instead. This method is
      *             introduced by the Livetribe JSR-223 implementation and is
      *             wrong.
      */
@@ -149,4 +150,4 @@ public class ScriptEngineManager {
             ScriptEngineFactory factory) {
         registeredByExtension.put(extension, factory);
     }
-}
\ No newline at end of file
+}

Modified: sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java?rev=1773764&r1=1773763&r2=1773764&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java (original)
+++ sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/ScriptingResourceResolverProvider.java Mon Dec 12 11:29:35 2016
@@ -38,6 +38,8 @@ public interface ScriptingResourceResolv
      *
      * <p><b>NOTE:</b> Usage of this {@link ResourceResolver} outside of a Servlet Request API context might lead to improper cleaning
      * (e.g. reusing the same resolver for multiple threads).</p>
+     *
+     * @return a request scoped resource resolver
      */
     ResourceResolver getRequestScopedResourceResolver();
 }

Modified: sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/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?rev=1773764&r1=1773763&r2=1773764&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java (original)
+++ sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/resource/package-info.java Mon Dec 12 11:29:35 2016
@@ -22,7 +22,7 @@
  * context of a Servlet API Request might lead to improper cleaning of objects whose life-cycle should not be longer than the request to
  * which they're bound to (for example per-thread objects)</i>.</p>
  *
- * <p>This package depends on the {@link org.apache.sling.api.resource} API, version >= 2.10.0.</p>
+ * <p>This package depends on the {@link org.apache.sling.api.resource} API, version &gt;= than 2.10.0.</p>
  */
 @Version("1.0.0")
 package org.apache.sling.scripting.api.resource;