Merge branch 'master' of https://github.com/jgoldhammer/js-console into jgoldhammer-master

Conflicts:
	.gitignore
	javascript-console-repo/.classpath
	javascript-console-repo/.project
	javascript-console-repo/build.properties
	javascript-console-repo/build.xml
	javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/createscript.put.desc.xml
	javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/saveScript.put.desc.xml
	javascript-console-repo/src/main/amp/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/createscript.put.desc.xml
	javascript-console-repo/src/main/amp/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/createscript.put.json.ftl
	javascript-console-repo/src/main/amp/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/listscripts.get.js
	javascript-console-repo/src/main/java/de/fme/jsconsole/ExecuteWebscript.java
	javascript-console-share/.classpath
	javascript-console-share/build.properties
	javascript-console-share/build.xml
	javascript-console-share/source/web/fme/components/jsconsole/codemirror/javascript.js
	javascript-console-share/source/web/fme/components/jsconsole/codemirror/mode/freemarker/parsefreemarker.js
	javascript-console-share/source/web/fme/components/jsconsole/codemirror/mode/javascript/javascript.js
	javascript-console-share/source/web/fme/components/jsconsole/codemirror/parsefreemarker.js
	javascript-console-share/src/main/amp/config/alfresco/site-webscripts/de/fme/components/jsconsole/javascript-console.get.html.ftl
	javascript-console-share/src/main/amp/config/alfresco/site-webscripts/de/fme/components/jsconsole/javascript-console.get.properties
	javascript-console-share/src/main/amp/config/alfresco/site-webscripts/de/fme/components/jsconsole/javascript-console.get_en.properties
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/codemirror.css
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/codemirror.js
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/htmlmixed.js
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/javascript.js
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/parsefreemarker.js
	javascript-console-share/src/main/amp/web/fme/components/jsconsole/codemirror/xml.js

Author: flox1an

README.md

@@ -1,13 +1,39 @@
-
 Javascript Console Admin Console component for Alfresco 3.4/4.0
 ===============================================================
 
-Author: Florian Maul (fme AG)
+Author: Florian Maul (fme AG)  
+            Jens Goldhammer (fme AG)
 
 This project contains a Javascript Console component for the Alfresco Share's 
 Administration Console, that enables the execution of arbitrary javascript code 
 in the repository. 
 
+Download newest rc version for Alfresco 4.x
+--------------------------------------------
+
+[Share Jar for 4.x](https://github.com/jgoldhammer/js-console/raw/5d083f5c594f679dc015c9dc1b0dd9132f5a4a9b/javascript-console-dist/javascript-console-share-0.6rc.jar)  
+[Repo Jar for 4.x](https://github.com/jgoldhammer/js-console/raw/5d083f5c594f679dc015c9dc1b0dd9132f5a4a9b/javascript-console-dist/javascript-console-repo-0.6rc.jar)
+
+New Features
+--------
+
++ new json output view for validation and formatting json from the freemarker template processing
+![JSONView](https://raw.github.com/jgoldhammer/js-console/master/javascript-console-share/screenshots/json_output_view.png) 
+
++ JSHint integration in javascript editor- it validates input on the fly and integrates the alfresco root objects like search, node...
+![JSHINT](https://raw.github.com/jgoldhammer/js-console/master/javascript-console-share/screenshots/jshint_live_integration.png) 
+
++ performance statistics - displays overall time, time for javascript and freemarker processing, time for network and time for rest of the server side processing 
+![PERFORMANCE](https://raw.github.com/jgoldhammer/js-console/master/javascript-console-share/screenshots/performance_stats.png) 
+
++ Editor Theming - allows you to theme the javascript and freemarker codemirror editor
+![Editor themes](https://raw.github.com/jgoldhammer/js-console/master/javascript-console-share/screenshots/editor_themes.png)
+
++ better error marking of server runtime errors in the editors
+![Error](https://raw.github.com/jgoldhammer/js-console/master/javascript-console-share/screenshots/js_error_detection_and_marking.png)
+
++ update codemirror to version 3 and enabling many codemirror addons(activeline, hightlight selection, new autocomplete module)
+
 
 Installation
 ------------

javascript-console-repo/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

@@ -0,0 +1,5 @@
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

javascript-console-repo/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

javascript-console-repo/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+</faceted-project>

javascript-console-repo/README.txt

@@ -0,0 +1,64 @@
+
+Javascript Console Admin Console component for Alfresco Share
+=============================================================
+
+Author: Florian Maul
+
+This project defines a Javascript Console component for Share's Administration Console,
+that enables the execution of arbitrary javascript code in the repository. 
+
+
+Installation
+------------
+
+The component has been developed to install on top of an existing Alfresco
+3.4 or 4.0 installation. There are two different version in this archive with
+a specific folder for each of the Alfresco version.
+
+When you have chosen the correct folder (3.4.x or 4.0.x) for your Alfresco version
+you'll find two jar files within that folder. The javascript-console-repo.jar needs
+to be copied into the Alfresco repository:
+
+  tomcat/webapps/alfresco/WEB-INF/lib/
+  
+The other file javascript-console-share.jar needs to be copied to the 
+corresponding folder in the Share webapp:
+
+  tomcat/webapps/share/WEB-INF/lib/
+  
+The deployment location has changed recently (with Javascript Console 0.5)
+because the Javascript Console now uses Java classes that have to be deployed 
+to these locations and can NOT reside in tomcat/shared/lib anymore.
+
+
+Building
+--------
+
+To build the individual JAR files, run the following command from the base 
+project directory.
+
+    ant -Dalfresco.sdk.dir=c:\dev\sdks\alfresco-enterprise-sdk-4.0.0 clean dist-jar
+
+The command should build a JAR file named javascript-console-repo.jar or
+javascript-console-share.jar in the 'dist' directory within your project.
+
+There also is the javascript-console-dist which builds both jar files and 
+creates a patched version for Alfresco 3.4.x which does not support all the 
+features of the version for 4.0.x
+
+To deploy the extension files into a local Tomcat instance for testing, you can 
+use the hotcopy-tomcat-jar task. You will need to set the tomcat.home
+property in Ant.
+
+    ant -Dtomcat.home=C:/Alfresco/tomcat clean hotcopy-tomcat-jar
+    
+Once you have run this you will need to restart Tomcat so that the classpath 
+resources in the JAR file are picked up.
+
+
+Using the component
+-------------------
+
+Log in to Alfresco Share as an admin user and navigate to the Administration
+page. Click 'Javascript Console' in the left hand side navigation.
+

javascript-console-repo/config/alfresco/extension/model/fme-jsconsole-model.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<model name="jsc:jsconsole-model" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+	<description>Javascript Console Model </description>
+	<version>1.0</version>
+
+	<imports>
+		<!-- Import Alfresco Dictionary Definitions -->
+		<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
+		<!-- Import Alfresco Content Domain Model Definitions -->
+		<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm" />
+	</imports>
+
+	<namespaces>
+		<!-- namespace for  visible aspects -->
+        <namespace uri="http://www.fme.de/alfresco/models/jsconsole" prefix="jsc"/>
+	</namespaces>
+	
+	<aspects>
+        <aspect name="jsc:scriptContext">
+            <properties>
+                <property name="jsc:freemarkerScript">
+                    <type>d:content</type>
+                </property>
+            </properties>
+        </aspect>
+	</aspects>
+
+</model>

javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/readScript.get.desc.xml

@@ -0,0 +1,6 @@
+<webscript>
+  <shortname>fme JSConsole read existing javascript and freemarker</shortname>
+  <url>/de/fme/jsconsole/readScript?nodeRef={nodeRef}</url>
+  <authentication>admin</authentication>
+  <format default="json">extension</format>
+</webscript>

javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/readScript.get.json.ftl

@@ -0,0 +1,3 @@
+{
+	"scripts" : ${scripts}
+}

javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/readScript.get.json.js

@@ -0,0 +1,24 @@
+
+var nodeRef= args.nodeRef;
+
+var readScript = function saveScript(){
+    var scriptFolder = search.xpathSearch("/app:company_home/app:dictionary/app:scripts")[0];
+    if (scriptFolder) {
+        var scriptNode;
+        if(isUpdate){
+            scriptNode = scriptFolder.childByNamePath(args.name);
+        }else{
+            scriptNode = scriptFolder.createFile(args.name);
+        }
+    	scriptNode.content = json.get('jsScript');
+    	scriptNode.properties["jsc:freemarkerScript"] = json.get('fmScript');
+    	scriptNode.save();
+    }else{
+        logger.warn('No script folder');
+    }
+}
+
+saveScript();
+
+// from listScripts.get.js
+findAvailableScripts();

javascript-console-repo/config/alfresco/extension/templates/webscripts/de/fme/jsconsole/readsnippets.get.desc.xml

@@ -0,0 +1,6 @@
+<webscript>
+  <shortname>fme JSConsole List Javascript Files</shortname>
+  <url>/de/fme/jsconsole/readsnippets</url>
+  <authentication>admin</authentication>
+  <format default="json">extension</format>
+</webscript>