Merge pull request #8 from AFaust/mavenization

Removed dependency on RhinoScriptProcessor and index-based queries

Author: flox1an

javascript-console-repo/src/main/amp/config/alfresco/extension/fme-jsconsole-context.xml

@@ -7,7 +7,6 @@
 		<property name="transactionService" ref="transactionService"/>
 		<property name="preRollScriptResource" value="classpath:de/fme/jsconsole/jsconsole-pre-roll-script.js" />
 		<property name="postRollScriptResource" value="classpath:de/fme/jsconsole/jsconsole-post-roll-script.js" />
-		<property name="rhinoScriptProcessor" ref="javaScriptProcessor" />
 	</bean>
 
 </beans>

javascript-console-repo/src/main/amp/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/createscript.put.js

@@ -1,5 +1,5 @@
 
-var scriptFolder = search.xpathSearch("/app:company_home/app:dictionary/app:scripts")[0];
+var scriptFolder = companyhome.childrenByXPath("app:dictionary/app:scripts")[0];
 if (scriptFolder) {
 	var scriptNode = scriptFolder.createFile(args.name);
 	scriptNode.content = requestbody.content;

javascript-console-repo/src/main/amp/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/listscripts.get.js

@@ -24,7 +24,7 @@ function findScripts(folder) {
   return scriptlist;
 }
 
-var scriptFolder = search.xpathSearch("/app:company_home/app:dictionary/app:scripts")[0];
+var scriptFolder = companyhome.childrenByXPath("app:dictionary/app:scripts")[0];
 if (scriptFolder) {
 	model.scripts = jsonUtils.toJSONString(findScripts(scriptFolder));
 }

javascript-console-repo/src/main/java/de/fme/jsconsole/ExecuteWebscript.java

@@ -9,24 +9,24 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.repo.jscript.RhinoScriptProcessor;
 import org.alfresco.repo.jscript.ScriptNode;
 import org.alfresco.repo.jscript.ScriptUtils;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.scripts.ScriptResourceHelper;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.MD5;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.extensions.webscripts.AbstractWebScript;
 import org.springframework.extensions.webscripts.Cache;
@@ -56,15 +56,13 @@ public class ExecuteWebscript extends AbstractWebScript {
 
 	private TransactionService transactionService;
 
-	private Resource preRollScriptResource;
+	private ClassPathResource preRollScriptResource;
 
 	private String preRollScript = "";
 
-	private Resource postRollScriptResource;
+	private ClassPathResource postRollScriptResource;
 
 	private String postRollScript = "";
-
-	private RhinoScriptProcessor rhinoScriptProcessor;
 
 	@Override
 	public void init(Container container, Description description) {
@@ -89,9 +87,10 @@ public void execute(WebScriptRequest request, WebScriptResponse response) throws
 
 		JavascriptConsoleRequest jsreq = JavascriptConsoleRequest.readJson(request);
 
-		String script = ScriptResourceHelper.resolveScriptImports(jsreq.script, rhinoScriptProcessor, log);
+		final String script = MessageFormat.format("<import resource=\"classpath:{0}\">",
+		        this.preRollScriptResource.getPath()) + jsreq.script; 
 
-		ScriptContent scriptContent = new StringScriptContent(preRollScript + script + "\n" + postRollScript);
+		ScriptContent scriptContent = new StringScriptContent(script + "\n" + postRollScript);
 		JavascriptConsoleResult result = runScriptWithTransactionAndAuthentication(request, response, jsreq, scriptContent);
 
 		if (!result.isStatusResponseSent()) {
@@ -315,17 +314,13 @@ public void setTransactionService(TransactionService transactionService) {
 		this.transactionService = transactionService;
 	}
 
-	public void setPostRollScriptResource(Resource postRollScriptResource) {
+	public void setPostRollScriptResource(ClassPathResource postRollScriptResource) {
 		this.postRollScriptResource = postRollScriptResource;
 	}
 
-	public void setPreRollScriptResource(Resource preRollScriptResource) {
+	public void setPreRollScriptResource(ClassPathResource preRollScriptResource) {
 		this.preRollScriptResource = preRollScriptResource;
 	}
-	
-	public void setRhinoScriptProcessor(RhinoScriptProcessor rhinoScriptProcessor) {
-		this.rhinoScriptProcessor = rhinoScriptProcessor;
-	}
 
 	private static class StringScriptContent implements ScriptContent {
 		private final String content;