From d1c182a18ef954ebd4f623aca396ce16681ff843 Mon Sep 17 00:00:00 2001
From: Nelson Silva <nsilva@nuxeo.com>
Date: Mon, 13 May 2019 14:53:10 +0100
Subject: [PATCH] Add 'console' object and add json error stacks

---
 .../src/main/resources/OSGI-INF/helpers-contrib.xml        | 1 +
 .../src/main/resources/notebook/json/error.ftl             | 7 ++++++-
 .../src/main/resources/notebook/json/opregister.ftl        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/automation-notebook-core/src/main/resources/OSGI-INF/helpers-contrib.xml b/automation-notebook-core/src/main/resources/OSGI-INF/helpers-contrib.xml
index feee7ad..c259483 100644
--- a/automation-notebook-core/src/main/resources/OSGI-INF/helpers-contrib.xml
+++ b/automation-notebook-core/src/main/resources/OSGI-INF/helpers-contrib.xml
@@ -6,6 +6,7 @@
 
   <extension target="org.nuxeo.ecm.core.operation.OperationServiceComponent"
              point="contextHelpers">
+    <contextHelper id="console" class="org.nuxeo.ecm.automation.interactive.helpers.NoteBookConsole"/>
     <contextHelper id="Console" class="org.nuxeo.ecm.automation.interactive.helpers.NoteBookConsole"/>
     <contextHelper id="Assert" class="org.nuxeo.ecm.automation.interactive.helpers.AssertHelper"/>
   </extension>
diff --git a/automation-notebook-core/src/main/resources/notebook/json/error.ftl b/automation-notebook-core/src/main/resources/notebook/json/error.ftl
index 7f31d5b..eae5a4c 100644
--- a/automation-notebook-core/src/main/resources/notebook/json/error.ftl
+++ b/automation-notebook-core/src/main/resources/notebook/json/error.ftl
@@ -1,5 +1,10 @@
 {
   "type" : "error",
   "exception" : "${e.getClass().getSimpleName()}",
-  "message" : "${e.getMessage()}"
+  "message" : "${e.getMessage()}",
+  "trace" : [
+  <#list e.getStackTrace() as trace>
+    "${trace.toString()}"<#if trace?has_next>,</#if>
+  </#list>
+  ]
 }
diff --git a/automation-notebook-core/src/main/resources/notebook/json/opregister.ftl b/automation-notebook-core/src/main/resources/notebook/json/opregister.ftl
index a45d5e7..949c02a 100644
--- a/automation-notebook-core/src/main/resources/notebook/json/opregister.ftl
+++ b/automation-notebook-core/src/main/resources/notebook/json/opregister.ftl
@@ -1,7 +1,7 @@
 
 {
   "type" : "register",
-  "opId",  "${opId}"
+  "opId" :  "${opId}"
   
   <#include "/notebook/json/footer.ftl">
 }