From fc9b05c72a32f717177292ed69a0c5da12b94ad9 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Wed, 1 Apr 2015 14:13:04 +0200 Subject: [PATCH] BATCHADM-132 Add startDate to execution.ftl & executions.ftl for retrieval as JSON via GET operations --- .../batch/admin/web/manager/jobs/json/execution.ftl | 1 + .../batch/admin/web/manager/jobs/json/executions.ftl | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl index 683158c4..757758e8 100644 --- a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl +++ b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl @@ -6,6 +6,7 @@ "id" : "${jobExecutionInfo.id?c}", "name" : "${jobExecutionInfo.name}", "status" : "${jobExecutionInfo.jobExecution.status}", + "startDate" : "${jobExecutionInfo.startDate}", "startTime" : "${jobExecutionInfo.startTime}", "duration" : "${jobExecutionInfo.duration}", "exitCode" : "${jobExecutionInfo.jobExecution.exitStatus.exitCode}", diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl index 9f5f6ac0..6731e553 100644 --- a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl +++ b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl @@ -6,6 +6,7 @@ "jobExecutions" : {<#list jobExecutions as jobExecutionInfo><#assign url><@spring.url relativeUrl="${servletPath}/jobs/executions/${jobExecutionInfo.id?c}.json"/> "${jobExecutionInfo.id}" : { "status" : "${jobExecutionInfo.jobExecution.status}", + "startDate" : "${jobExecutionInfo.startDate}", "startTime" : "${jobExecutionInfo.startTime}", "duration" : "${jobExecutionInfo.duration}", "resource" : "${baseUrl}${url}",