. Checkpoint for the Rhino JavaScript engine integration:

- Additions to the Alfresco JavaScript data-model
. JUnit test for each entry point into Rhino and the ScriptService
  - tests for various API calls on the Scriptable Node object
. More javadoc clean-up in templating and script services

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/repository/ScriptService.java

@@ -19,6 +19,8 @@ package org.alfresco.service.cmr.repository;
 import java.io.Writer;
 import java.util.Map;
 
+import org.alfresco.service.namespace.QName;
+
 /**
  * Script Service.
  * <p>
@@ -53,13 +55,15 @@ public interface ScriptService
      * Process a script against the supplied data model.
      * 
      * @param scriptRef    Script NodeRef location
+     * @param contentProp  QName of the property on the node that contains the content, null can
+     *                     be passed to indicate the default property of 'cm:content'
      * @param model        Object model to process script against
      * 
      * @return output of the script (may be null or any valid wrapped JavaScript object)
      * 
      * @throws ScriptException
      */
-    public Object executeScript(NodeRef scriptRef, Map<String, Object> model)
+    public Object executeScript(NodeRef scriptRef, QName contentProp, Map<String, Object> model)
         throws ScriptException;
     
     /**

source/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java

@@ -18,8 +18,8 @@ package org.alfresco.service.cmr.repository;
 
 /**
  * Interface contract for the conversion of file name to a fully qualified icon image path for use by
- * the templating engine.
- * 
+ * templating and scripting engines executing within the repository context.
+ * <p>
  * Generally this contract will be implemented by classes that have access to say the webserver
  * context which can be used to generate an icon image for a specific filename.
  *