You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/02/26 11:18:20 UTC
svn commit: r631155 -
/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
Author: fmeschbe
Date: Tue Feb 26 02:18:19 2008
New Revision: 631155
URL: http://svn.apache.org/viewvc?rev=631155&view=rev
Log:
SLING-272 Change extension for server side JavaScript to "ecma"
Modified:
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
Modified: incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java?rev=631155&r1=631154&r2=631155&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavaScriptEngineFactory.java Tue Feb 26 02:18:19 2008
@@ -37,9 +37,10 @@
/**
* The <code>RhinoJavaScriptEngineFactory</code> TODO
*/
-public class RhinoJavaScriptEngineFactory extends AbstractScriptEngineFactory implements ScopeProvider {
+public class RhinoJavaScriptEngineFactory extends AbstractScriptEngineFactory
+ implements ScopeProvider {
- public final static String JS_SCRIPT_EXTENSION = "js";
+ public final static String ECMA_SCRIPT_EXTENSION = "ecma";
public final static String ESP_SCRIPT_EXTENSION = "esp";
@@ -49,6 +50,7 @@
ScriptablePrintWriter.class };
private final String languageVersion;
+
private Scriptable rootScope;
public RhinoJavaScriptEngineFactory() {
@@ -62,11 +64,10 @@
languageVersion = String.valueOf(cx.getLanguageVersion());
Context.exit();
- setExtensions(JS_SCRIPT_EXTENSION, ESP_SCRIPT_EXTENSION);
+ setExtensions(ECMA_SCRIPT_EXTENSION, ESP_SCRIPT_EXTENSION);
setMimeTypes("text/javascript", "application/ecmascript",
"application/javascript");
- setNames("ecma", "javascript", JS_SCRIPT_EXTENSION,
- ESP_SCRIPT_EXTENSION);
+ setNames("javascript", ECMA_SCRIPT_EXTENSION, ESP_SCRIPT_EXTENSION);
}
public ScriptEngine getScriptEngine() {
@@ -80,7 +81,7 @@
public String getLanguageVersion() {
return languageVersion;
}
-
+
public Scriptable getScope() {
return getRootScope();
}
@@ -95,7 +96,7 @@
// register the host object
ScriptableObject.defineClass(rootScope, clazz);
- final ScriptableObject host = (ScriptableObject)clazz.newInstance();
+ final ScriptableObject host = (ScriptableObject) clazz.newInstance();
if (SlingWrapper.class.isAssignableFrom(clazz)) {
// SlingWrappers can map to several classes if needed
@@ -105,8 +106,10 @@
hostWrapper.getClassName());
}
} else {
- // but other ScriptableObjects need to be registered as well
- SlingWrapFactory.INSTANCE.registerWrapper(host.getClass(),host.getClassName());
+ // but other ScriptableObjects need to be registered as
+ // well
+ SlingWrapFactory.INSTANCE.registerWrapper(
+ host.getClass(), host.getClassName());
}
} catch (Throwable t) {
// TODO: log