You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/11/08 11:54:42 UTC
svn commit: r593126 - in /incubator/sling/trunk/scripting:
freemarker/src/main/java/org/apache/sling/scripting/freemarker/
javascript/src/main/java/org/apache/sling/scripting/javascript/
ruby/src/main/java/org/apache/sling/scripting/ruby/ velocity/src/...
Author: cziegeler
Date: Thu Nov 8 02:54:40 2007
New Revision: 593126
URL: http://svn.apache.org/viewvc?rev=593126&view=rev
Log:
Add scr tags for script engines.
Modified:
incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavasSriptEngine.java
incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
Modified: incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java?rev=593126&r1=593125&r2=593126&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java (original)
+++ incubator/sling/trunk/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/FreemarkerScriptEngine.java Thu Nov 8 02:54:40 2007
@@ -34,6 +34,11 @@
/**
* A ScriptEngine that uses {@link http://freemarker.org/ FreeMarker} templates
* to render a Resource in HTML.
+ *
+ * @scr.component
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * @scr.property name="service.description" value="Sling FreeMarker Script Engine"
+ * @scr.service interface="org.apache.sling.api.scripting.SlingScriptEngine"
*/
public class FreemarkerScriptEngine implements SlingScriptEngine {
Modified: incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavasSriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavasSriptEngine.java?rev=593126&r1=593125&r2=593126&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavasSriptEngine.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoJavasSriptEngine.java Thu Nov 8 02:54:40 2007
@@ -31,6 +31,11 @@
/**
* A ScriptEngine that uses the Rhino interpreter to process Sling requests with
* server-side javascript.
+ *
+ * @scr.component
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * @scr.property name="service.description" value="Sling JavaScript Script Engine"
+ * @scr.service interface="org.apache.sling.api.scripting.SlingScriptEngine"
*/
public class RhinoJavasSriptEngine implements SlingScriptEngine {
Modified: incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java?rev=593126&r1=593125&r2=593126&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java (original)
+++ incubator/sling/trunk/scripting/ruby/src/main/java/org/apache/sling/scripting/ruby/ErbScriptEngine.java Thu Nov 8 02:54:40 2007
@@ -37,7 +37,12 @@
import org.jruby.runtime.builtin.IRubyObject;
/**
- * A ScriptEngine that uses ruby erb templates to render a Resource
+ * A ScriptEngine that uses ruby erb templates to render a Resource.
+ *
+ * @scr.component
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * @scr.property name="service.description" value="Sling Ruby Script Engine"
+ * @scr.service interface="org.apache.sling.api.scripting.SlingScriptEngine"
*/
public class ErbScriptEngine implements SlingScriptEngine {
@@ -109,7 +114,7 @@
.invokeMethod(runtime, erb, "send", new Object[]{bindingSym}, IRubyObject.class);
String out = (String) JavaEmbedUtils.invokeMethod(runtime, erb, "result",
- new Object[]{(Object) binding}, String.class);
+ new Object[]{binding}, String.class);
stream.println(out);
stream.flush();
Modified: incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java?rev=593126&r1=593125&r2=593126&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java (original)
+++ incubator/sling/trunk/scripting/velocity/src/main/java/org/apache/sling/scripting/velocity/VelocityTemplatesScriptEngine.java Thu Nov 8 02:54:40 2007
@@ -32,7 +32,12 @@
import org.apache.velocity.app.VelocityEngine;
/**
- * A ScriptEngine that uses Velocity templates to render a Resource
+ * A ScriptEngine that uses Velocity templates to render a Resource.
+ *
+ * @scr.component
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * @scr.property name="service.description" value="Sling Velocity Script Engine"
+ * @scr.service interface="org.apache.sling.api.scripting.SlingScriptEngine"
*/
public class VelocityTemplatesScriptEngine implements SlingScriptEngine {