Removing ?js_string encodings form the REST API

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/engine/process-engine.get.json.ftl

 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-  "name": <#if processEngineInfo.name??>"${processEngineInfo.name?js_string}"<#else>null</#if>,
-  "resourceUrl": <#if processEngineInfo.resourceUrl??>"${processEngineInfo.resourceUrl?js_string}"<#else>null</#if>,
-  "exception": <#if processEngineInfo.exception??>"${processEngineInfo.exception?js_string}"<#else>null</#if>,
-  "version": "${version?js_string}"
+  "name": <#if processEngineInfo.name??>"${processEngineInfo.name}"<#else>null</#if>,
+  "resourceUrl": <#if processEngineInfo.resourceUrl??>"${processEngineInfo.resourceUrl}"<#else>null</#if>,
+  "exception": <#if processEngineInfo.exception??>"${processEngineInfo.exception}"<#else>null</#if>,
+  "version": "${version}"
 }
 </#escape>
\ No newline at end of file

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/identity/identity.lib.ftl

@@ -6,10 +6,10 @@
 
 <#macro printUser user>
 {
-  "id": "${(user.id!"")?js_string}",
-  "firstName": "${(user.firstName!"")?js_string}",
-  "lastName": "${(user.lastName!"")?js_string}",
-  "email": "${(user.email!"")?js_string}"
+  "id": "${(user.id!"")}",
+  "firstName": "${(user.firstName!"")}",
+  "lastName": "${(user.lastName!"")}",
+  "email": "${(user.email!"")}"
 }
 </#macro>
 
@@ -21,8 +21,8 @@
 
 <#macro printGroup group>
 {
-  "id": "${(group.id!"")?js_string}",
-  "name": "${(group.name!"")?js_string}",
-  "type": "${(group.type!"")?js_string}"
+  "id": "${(group.id!"")}",
+  "name": "${(group.name!"")}",
+  "type": "${(group.type!"")}"
 }
 </#macro>
\ No newline at end of file

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/management/management.lib.ftl

@@ -9,11 +9,11 @@
 </#macro>
 
 <#macro printJob job>
-  "id": "${job.id?js_string}",
-  "executionId": "${job.executionId?js_string}",
+  "id": "${job.id}",
+  "executionId": "${job.executionId}",
   "retries": ${job.retries?c},
-  "processInstanceId": "${(job.processInstanceId!"")?js_string}",
+  "processInstanceId": "${(job.processInstanceId!"")}",
   "dueDate": <#if job.dueDate??>"${iso8601Date(job.dueDate)}"<#else>null</#if>,
-  "assignee": <#if job.assignee??>"${job.assignee?js_string}"<#else>null</#if>,
-  "exceptionMessage": <#if job.exceptionMessage??>"${job.exceptionMessage?js_string}"<#else>null</#if>
+  "assignee": <#if job.assignee??>"${job.assignee}"<#else>null</#if>,
+  "exceptionMessage": <#if job.exceptionMessage??>"${job.exceptionMessage}"<#else>null</#if>
 </#macro>

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/management/table-data.get.json.ftl

@@ -5,7 +5,7 @@
     <#list tablePage.rows as row>
     {
       <#list row?keys as columnName>
-      "${columnName?js_string}":<#if row[columnName]?is_sequence>${row[columnName]?size?c}<#elseif row[columnName]?is_boolean>${row[columnName]?string}<#elseif row[columnName]?is_number>${row[columnName]?c}<#elseif row[columnName]?is_date>"${row[columnName]?string}"<#else>"${row[columnName]?js_string}"</#if><#if columnName_has_next>,</#if><#if firstColumnName??><#assign firstColumnName=columnName/></#if>
+      "${columnName}": <#if row[columnName]?is_sequence>${row[columnName]?size?c}<#elseif row[columnName]?is_boolean>${row[columnName]?string}<#elseif row[columnName]?is_number>${row[columnName]?c}<#elseif row[columnName]?is_date>"${iso8601Date(row[columnName])}"<#else>"${row[columnName]?string}"</#if><#if columnName_has_next>,</#if><#if firstColumnName??><#assign firstColumnName=columnName/></#if>
       </#list>
     }<#if row_has_next>,</#if>
     </#list>

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/management/table.get.json.ftl

 {
-  "tableName": "${tableMetaData.tableName?js_string}",
-  "columnNames": [<#list tableMetaData.columnNames as columnName>"${columnName?js_string}"<#if columnName_has_next>,</#if></#list>],
-  "columnTypes": [<#list tableMetaData.columnTypes as columnType>"${columnType?js_string}"<#if columnType_has_next>,</#if></#list>]
+  "tableName": "${tableMetaData.tableName}",
+  "columnNames": [<#list tableMetaData.columnNames as columnName>"${columnName}"<#if columnName_has_next>,</#if></#list>],
+  "columnTypes": [<#list tableMetaData.columnTypes as columnType>"${columnType}"<#if columnType_has_next>,</#if></#list>]
 }
\ No newline at end of file

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/management/tables.get.json.ftl

@@ -4,8 +4,8 @@
   "data": [
     <#list tableNames as tableName>
     {
-      "tableName": "${tableName?js_string}",
-      "total": ${tables[tableName]?js_string}
+      "tableName": "${tableName}",
+      "total": ${tables[tableName]}
     }<#if tableName_has_next>,</#if>
     </#list>
   ]

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/process/process-instance.post.json.ftl

 <#escape x as jsonUtils.encodeJSONString(x)>
 {
   "id": "${instance.id}",
-  "processDefinitionId": "${instance.processDefinitionId?js_string}",
-  "activityNames": [<#list instance.findActiveActivityIds() as name>"${name?js_string}"<#if name_has_next>, </#if></#list>],
+  "processDefinitionId": "${instance.processDefinitionId}",
+  "activityNames": [<#list instance.findActiveActivityIds() as name>"${name}"<#if name_has_next>, </#if></#list>],
   "ended": ${instance.ended?string}
 }
 </#escape>
\ No newline at end of file

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/process/process.lib.ftl

@@ -6,12 +6,12 @@
 
 <#macro printProcessDefinition processDefinition>
 {
-  "id": "${processDefinition.id?js_string}",
-  "key": "${processDefinition.key?js_string}",
-  "name": <#if processDefinition.name??>"${processDefinition.name?js_string}"<#else>null</#if>,
-  "version": ${processDefinition.version?string},
-  "deploymentId": "${processDefinition.deploymentId?js_string}",
-  "resourceName": "${processDefinition.resourceName?js_string}",
-  "startFormResourceKey": <#if processDefinition.startFormResourceKey??>"${processDefinition.startFormResourceKey?js_string}"<#else>null</#if>
+  "id": "${processDefinition.id}",
+  "key": "${processDefinition.key}",
+  "name": <#if processDefinition.name??>"${processDefinition.name}"<#else>null</#if>,
+  "version": ${processDefinition.version},
+  "deploymentId": "${processDefinition.deploymentId}",
+  "resourceName": "${processDefinition.resourceName}",
+  "startFormResourceKey": <#if processDefinition.startFormResourceKey??>"${processDefinition.startFormResourceKey}"<#else>null</#if>
 }
 </#macro>
\ No newline at end of file

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/repository/repository.lib.ftl

@@ -9,7 +9,7 @@
 </#macro>
 
 <#macro printDeployment deployment>
-  "id": "${deployment.id?js_string}",
-  "name": "${deployment.name?js_string}",
+  "id": "${deployment.id}",
+  "name": "${deployment.name}",
   "deploymentTime": <#if deployment.deploymentTime??>"${iso8601Date(deployment.deploymentTime)}"<#else>null</#if>
 </#macro>

modules/activiti-webapp-rest/src/main/resources/webscripts/org/activiti/rest/api/task/task.lib.ftl

@@ -9,12 +9,12 @@
 </#macro>
 
 <#macro printTask task>
-  "id": "${task.id?js_string}",
-  "name": "${task.name?js_string}",
-  "description": "${(task.description!"")?js_string}",
+  "id": "${task.id}",
+  "name": "${task.name}",
+  "description": "${(task.description!"")}",
   "priority": ${task.priority},
-  "assignee": <#if task.assignee??>"${task.assignee?js_string}"<#else>null</#if>,
+  "assignee": <#if task.assignee??>"${task.assignee}"<#else>null</#if>,
   "executionId": ${task.executionId},
-  "processInstanceId": <#if task.processInstanceId??>"${task.processInstanceId?js_string}"<#else>null</#if>,
-  "formResourceKey": <#if task.formResourceKey??>"${task.formResourceKey?js_string}"<#else>null</#if>
+  "processInstanceId": <#if task.processInstanceId??>"${task.processInstanceId}"<#else>null</#if>,
+  "formResourceKey": <#if task.formResourceKey??>"${task.formResourceKey}"<#else>null</#if>
 </#macro>
\ No newline at end of file