JSC: Improved properties printing

JSC: used Java based logger


git-svn-id: https://share-extras.googlecode.com/svn/trunk/Javascript Console@1051 a3f5c567-fd0f-3a89-9b71-a290c5a5f590

Author: flox1an

javascript-console-repo/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="source/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/alfresco-core-4.0.0.jar" sourcepath="/ALFRESCO_SDK_400/src/alfresco-core-src.zip"/>
-	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/alfresco-data-model-4.0.0.jar"/>
+	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/alfresco-data-model-4.0.0.jar" sourcepath="/ALFRESCO_SDK_400/src/alfresco-datamodel-src.zip"/>
 	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/alfresco-remote-api-4.0.0.jar"/>
 	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/dependencies/spring-surf/spring-surf-core-1.0.0.jar"/>
 	<classpathentry kind="var" path="ALFRESCO_SDK_400/lib/server/dependencies/spring-surf/spring-webscripts-1.0.0.jar"/>

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

@@ -10,33 +10,5 @@
 		<property name="rhinoScriptProcessor" ref="javaScriptProcessor" />
 	</bean>
 
-<!-- 	
-<bean id="slingshotDocLibCustomResponse"
-       parent="baseJavaScriptExtension"
-       class="org.alfresco.repo.jscript.SlingshotDocLibCustomResponse">
-    <property name="extensionName">
-       <value>slingshotDocLib</value>
-    </property>
-    <property name="customResponses">
-      <map>
-         <entry key="vtiServer">
-            <ref bean="doclibCustomVtiServer"/>
-         </entry>
-      </map>
-    </property>
-    </bean>	
-	
-	
-	<bean id="slingshotDocLibCustomResponse" parent="applicationScriptUtils">
- <property name="decoratedProperties">
-    <map merge="true">
-       <entry key="alf:propertyHolder">
-          <ref bean="customDecoratorBean"/>
-       </entry>
-    </map>
- </property>
-</bean>
--->
-	
 </beans>
 

javascript-console-repo/config/de/fme/jsconsole/jsconsole-post-roll-script.js

@@ -1,3 +1 @@
-
 jsconsole.setSpace(space);
-

javascript-console-repo/config/de/fme/jsconsole/jsconsole-pre-roll-script.js

@@ -1,42 +1,4 @@
-/*
- * Set up a wrapper for the logger, to write logging information to the 
- * output stream and yet keep all methods of the Java ScriptLogger available.
- */
-var _$orglogger = logger;
-
-logger = {
-  log: function(text) {
-    print(text);
-    _$orglogger.log(text);
-  },
-  
-  warn: function(text) {
-    print(text);
-    _$orglogger.warn(text);
-  },
-  
-  isLoggingEnabled : function() {
-    return _$orglogger.isLoggingEnabled();
-  },
-  
-  isWarnLoggingEnabled : function() {
-    return _$orglogger.isWarnLoggingEnabled();
-  },
-
-  system : _$orglogger.system,
-  
-  /**
-   * Sets the log level of a class or package using log4j
-   * @param classname a Java class or package name
-   * @param level log level TRACE,DEBUG,INFO,ERROR as String
-   */
-  setLevel : function(classname, level) {
-	  var log4j = Packages.org.apache.log4j.Logger.getLogger(classname);
-	  var logLevel = Packages.org.apache.log4j.Level.toLevel(level);
-	  log4j.setLevel(logLevel);	  
-  }
-};
-
+logger=jsconsole.getLogger();
 function print(obj) { 
 	jsconsole.print(obj);
 };

javascript-console-repo/source/java/de/fme/jsconsole/ExecuteWebscript.java

@@ -55,7 +55,7 @@ public class ExecuteWebscript extends AbstractWebScript {
 	private ScriptUtils scriptUtils;
 
 	private TransactionService transactionService;
-
+	
 	private Resource preRollScriptResource;
 
 	private String preRollScript = "";
@@ -93,7 +93,10 @@ public void execute(WebScriptRequest request, WebScriptResponse response) throws
 
 		ScriptContent scriptContent = new StringScriptContent(preRollScript + script + "\n" + postRollScript);
 		JavascriptConsoleResult result = runScriptWithTransactionAndAuthentication(request, response, jsreq, scriptContent);
-		result.writeJson(response);
+		
+		if (!result.isStatusResponseSent()) {
+			result.writeJson(response);
+		}
 	}
 
 	private String readScriptFromResource(Resource resource) throws IOException {
@@ -167,7 +170,6 @@ private JavascriptConsoleResult executeScriptContent(WebScriptRequest req, WebSc
 
 			JavascriptConsoleScriptObject javascriptConsole = new JavascriptConsoleScriptObject();
 			scriptModel.put("jsconsole", javascriptConsole);
-			scriptModel.put("logger", new JavascriptConsoleScriptLogger(javascriptConsole));
 
 			if (StringUtils.isNotBlank(spaceNodeRef)) {
 				javascriptConsole.setSpace(scriptUtils.getNodeFromString(spaceNodeRef));
@@ -178,7 +180,6 @@ private JavascriptConsoleResult executeScriptContent(WebScriptRequest req, WebSc
 				} else {
 					javascriptConsole.setSpace((ScriptNode) ch);
 				}
-
 			}
 			scriptModel.put("space", javascriptConsole.getSpace());
 
@@ -207,6 +208,7 @@ private JavascriptConsoleResult executeScriptContent(WebScriptRequest req, WebSc
 			// is a redirect to a status specific template required?
 			if (status.getRedirect()) {
 				sendStatus(req, res, status, cache, format, templateModel);
+				output.setStatusResponseSent(true);
 			} else {
 				// apply location
 				String location = status.getLocation();
@@ -217,8 +219,7 @@ private JavascriptConsoleResult executeScriptContent(WebScriptRequest req, WebSc
 				}
 
 				if (StringUtils.isNotBlank(template)) {
-					TemplateProcessor templateProcessor = getContainer().getTemplateProcessorRegistry().getTemplateProcessorByExtension(
-							"ftl");
+					TemplateProcessor templateProcessor = getContainer().getTemplateProcessorRegistry().getTemplateProcessorByExtension("ftl");
 					StringWriter sw = new StringWriter();
 					templateProcessor.processString(template, templateModel, sw);
 					if (log.isDebugEnabled()) {
@@ -311,7 +312,6 @@ public void setRhinoScriptProcessor(RhinoScriptProcessor rhinoScriptProcessor) {
 		this.rhinoScriptProcessor = rhinoScriptProcessor;
 	}
 
-
 	private static class StringScriptContent implements ScriptContent {
 		private final String content;
 

javascript-console-repo/source/java/de/fme/jsconsole/JavascriptConsoleResult.java

@@ -28,6 +28,8 @@ public class JavascriptConsoleResult {
 	private String spaceNodeRef = "";
 
 	private String spacePath = "";
+	
+	private boolean statusResponseSent = false;
 
 	public void setPrintOutput(List<String> printOutput) {
 		this.printOutput = printOutput;
@@ -61,6 +63,7 @@ public String getSpacePath() {
 		return spacePath;
 	}
 
+	
 	public void writeJson(WebScriptResponse response) throws IOException {
 		response.setContentEncoding("UTF-8");
 		response.setContentType(MimetypeMap.MIMETYPE_JSON);
@@ -80,4 +83,12 @@ public void writeJson(WebScriptResponse response) throws IOException {
 					"Error writing json response.", e);
 		}
 	}
+
+	public boolean isStatusResponseSent() {
+		return statusResponseSent;
+	}
+
+	public void setStatusResponseSent(boolean statusResponseSent) {
+		this.statusResponseSent = statusResponseSent;
+	}
 }

javascript-console-repo/source/java/de/fme/jsconsole/JavascriptConsoleScriptLogger.java

@@ -113,7 +113,6 @@ public void out(String str)
         }
     }
 
-    
     public void setLevel(String classname, String level) {
     	Logger log4j = Logger.getLogger(classname);
     	Level logLevel = Level.toLevel(level);

javascript-console-repo/source/java/de/fme/jsconsole/JavascriptConsoleScriptObject.java

@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.repo.jscript.ScriptNode;
 import org.alfresco.repo.security.authority.script.ScriptGroup;
@@ -34,6 +35,10 @@ public void setSpace(ScriptNode space) {
 		this.space = space;
 	}	
 
+	public JavascriptConsoleScriptLogger getLogger() {
+		return new JavascriptConsoleScriptLogger(this);
+	}
+	
 	public void print(Object obj) {
 
 		if (obj != null) {
@@ -58,6 +63,7 @@ public void print(Object obj) {
 
 	}
 
+	@SuppressWarnings("unchecked")
 	private String formatValue(Object value) {
 		if (value instanceof ScriptNode) {
 			return formatScriptNode((ScriptNode) value);
@@ -71,10 +77,23 @@ private String formatValue(Object value) {
 			return formatNodeRef((NodeRef) value);
 		} else if (value instanceof ChildAssociationRef) {
 		    return formatChildAssoc((ChildAssociationRef) value);
+	    } else if (value instanceof Map) {
+	    	return formatMap((Map<String, Object>) value);
 	    }
 		return value.toString();
 	}
 
+	private String formatMap(Map<String, Object> map) {
+		StringBuffer buffer = new StringBuffer();
+		for (Map.Entry<String, Object> entry : map.entrySet()) {
+			buffer.append(formatValue(entry.getKey()));				
+			buffer.append(" : ");
+			buffer.append(formatValue(entry.getValue()));
+			buffer.append("\n");
+		}
+		return buffer.toString();
+	}
+
 	private String formatScriptUser(ScriptUser value) {
 		return "ScriptUser: " + value.getUserName() + " (" + value.getFullName()+")";
 	}