NASA-AMMOS · jamesfwood · Dec 6, 2023 · Oct 31, 2023 · Nov 6, 2023 · Nov 6, 2023
diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -201,7 +201,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome

diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome

diff --git a/create_server_dist.sh b/create_server_dist.sh
@@ -22,8 +22,8 @@ print 'Creating new CWS distribution directory...'
 mkdir -p ${CWS}/{bpmn,config/templates,installer,logs,upgrade,sql/cws}
 
 print 'Unzipping Camunda into distribution...'
-unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -x start-camunda.bat start-camunda.sh -d ${CWS} > ${CWS}/logs/camunda_extract.log 2>&1
-unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract.log 2>&1
+unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -x start-camunda.bat start-camunda.sh -d ${CWS} > ${CWS}/logs/camunda_extract_main.log 2>&1
+unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract_lib.log 2>&1
 
 if [[ $? -gt 0 ]]; then
     print "ERROR: failed to unzip Camunda distribution, check ${CWS}/logs/camunda_extract.log for details."

diff --git a/cws-service/src/main/java/jpl/cws/console/CwsConsoleStartup.java b/cws-service/src/main/java/jpl/cws/console/CwsConsoleStartup.java
@@ -32,7 +32,7 @@ public class CwsConsoleStartup implements InitializingBean, DisposableBean {
 	@Autowired private SecurityService cwsSecurityService;
 	@Autowired private CodeService cwsCodeService;
 	@Autowired private ProcessStatusDaemon processStatusDaemon;
-	@Autowired private HistoryCleanupDaemon historyCleanupDaemon;
+	@Autowired private ElasticAndWorkerCleanupDaemon elasticAndWorkerCleanupDaemon;
 	@Autowired private ExternalTaskDaemon externalTaskDaemon;
 	@Autowired private WorkerMonitorBackgroundThread workerMonitorBackgroundThread;
 
@@ -55,7 +55,7 @@ public void afterPropertiesSet() throws Exception {
 
 		startWorkerMonitorBackgroundThread();
 
-		startHistoryCleanupDaemon();
+		startElasticAndWorkerCleanupDaemon();
 
 		startExternalTaskDaemon();
 
@@ -150,8 +150,8 @@ public boolean accept( File dir, String name ) {
 	/**
 	 * 
 	 */
-	private void startHistoryCleanupDaemon() {
-		historyCleanupDaemon.start();
+	private void startElasticAndWorkerCleanupDaemon() {
+		elasticAndWorkerCleanupDaemon.start();
 	}
 
 	/**
@@ -190,8 +190,8 @@ public void destroy() throws Exception {
 		log.warn("Destroying bean...");
 		log.warn("  Interrupting processStatusDaemon bean...");
 		processStatusDaemon.interrupt();
-		log.warn("  Interrupting historyCleanupDaemon bean...");
-		historyCleanupDaemon.interrupt();
+		log.warn("  Interrupting elasticAndWorkerCleanupDaemon bean...");
+		elasticAndWorkerCleanupDaemon.interrupt();
 		log.warn("  Interrupting externalTaskDaemon bean...");
 		externalTaskDaemon.interrupt();
 		log.warn("  Interrupting awsMetricsPublisherBackgroundThread bean...");

diff --git a/cws-service/src/main/java/jpl/cws/console/ElasticAndWorkerCleanupDaemon.java b/cws-service/src/main/java/jpl/cws/console/ElasticAndWorkerCleanupDaemon.java
@@ -0,0 +1,49 @@
+package jpl.cws.console;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import jpl.cws.core.log.CwsEmailerService;
+import jpl.cws.service.CwsConsoleService;
+
+public class ElasticAndWorkerCleanupDaemon extends Thread {
+	private static final Logger log = LoggerFactory.getLogger(ElasticAndWorkerCleanupDaemon.class);
+
+	private static final int THIS_THREAD_REPEAT_DELAY = 8 * 60 * 60000;		// 8 hours
+
+	@Autowired private CwsConsoleService cwsConsoleService;
+	@Autowired private CwsEmailerService cwsEmailerService;
+
+	public void run() {
+
+		try {
+
+			log.debug("ElasticAndWorkerCleanupDaemon starting...");
+
+			while (true) {
+
+				try {
+					sleep(THIS_THREAD_REPEAT_DELAY);
+
+					log.debug("Performing ElasticSearch and Worker Log cleanup...");
+
+					cwsConsoleService.cleanupElasticsearch();
+					cwsConsoleService.sendWorkerLogCleanupTopicMessage();
+
+				} catch (InterruptedException e) {
+					log.warn("ElasticAndWorkerCleanupDaemon interrupted. Must be shutting down..");
+					break;
+				}
+			}
+			log.warn("ElasticAndWorkerCleanupDaemon stopping...");
+		}
+		catch (Throwable e) {
+			cwsEmailerService.sendNotificationEmails("ElasticAndWorkerCleanupDaemon Error", "Severe Error!\n\nElastic And Worker Cleanup Daemon run threw an exception. This is an unexpected error and should never happen. Look at logs for more details. You may have to restart CWS.\n\nDetails: " + e.getMessage());
+			log.error("ElasticAndWorkerCleanupDaemon stopping...", e);
+
+			throw e;
+		}
+	}
+
+}
diff --git a/cws-service/src/main/java/jpl/cws/console/ExternalTaskDaemon.java b/cws-service/src/main/java/jpl/cws/console/ExternalTaskDaemon.java
@@ -10,7 +10,7 @@
 import javax.jms.Session;
 
 public class ExternalTaskDaemon extends Thread {
-    private static final Logger log = LoggerFactory.getLogger(HistoryCleanupDaemon.class);
+    private static final Logger log = LoggerFactory.getLogger(ElasticAndWorkerCleanupDaemon.class);
 
     private static final int ONE_HOUR_MS = 60 * 60 * 1000; // 1 hour
 

diff --git a/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java b/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java
diff --git a/cws-service/src/main/java/jpl/cws/service/CwsConsoleService.java b/cws-service/src/main/java/jpl/cws/service/CwsConsoleService.java
@@ -325,8 +325,6 @@ public String deployProcessDefinition(String bpmnXml, BpmnModelInstance model, S
                         deployedProcDef.getKey(), deployedProcDef.getDeploymentId());
             }
 
-            repositoryService.updateProcessDefinitionHistoryTimeToLive(deployedProcDef.getId(), Integer.parseInt(historyDaysToLive));
-
             // Notify workers that there has been a change
             // to the set of deployed process definitions
             //

diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/AdminTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/AdminTestIT.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,6 +86,8 @@ public void runGroupsTest() {
             createAuthorizationButton.click();
             sleep(1000);
 
+            WebElement groupOrUserToggle = driver.findElement(By.cssSelector(".input-group-addon"));
+            groupOrUserToggle.click();
             WebElement userIdField = findElByXPath("//input[@type='text']");
             userIdField.sendKeys(USERNAME);
             sleep(1000);
@@ -240,11 +243,11 @@ public void runTenantsTest() {
             proceedButton.click();
             sleep(1000);
 
+            screenShot("AdminTestIT-runTenantsTest");
             if (findOnPage("Tenant cwstestdev successfully deleted.")) {
                 scriptPass = true;
             }
             sleep(1000);
-            screenShot("AdminTestIT-runTenantsTest");
 
             goToPage("deployments");
             logout();

diff --git a/cws-test/src/test/resources/bpmn/cws331.bpmn b/cws-test/src/test/resources/bpmn/cws331.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Bp7N4PhYEeaDD70QSuWP-g" exporter="camunda modeler" exporterVersion="2.8.0.201612011311" targetNamespace="http://camunda.org/schema/1.0/bpmn">
-  <bpmn2:process id="cws331" name="cws331" isExecutable="true">
+  <bpmn2:process id="cws331" name="cws331" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:serviceTask id="ServiceTask_1" camunda:class="jpl.cws.task.SleepTask" name="sleep with delay">
       <bpmn2:extensionElements>
         <camunda:field expression="5" name="numLogs"/>

diff --git a/cws-test/src/test/resources/bpmn/external_pwd.bpmn b/cws-test/src/test/resources/bpmn/external_pwd.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1lpy48n" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0-alpha-8">
-  <bpmn:process id="external_pwd" name="external_pwd" isExecutable="true">
+  <bpmn:process id="external_pwd" name="external_pwd" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn:outgoing>SequenceFlow_0ymnk7r</bpmn:outgoing>
     </bpmn:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/failed_model.bpmn b/cws-test/src/test/resources/bpmn/failed_model.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0hy4e4n" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="failed_model" name="Failed Model" isExecutable="true">
+  <bpmn:process id="failed_model" name="Failed Model" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn:outgoing>SequenceFlow_14pp20j</bpmn:outgoing>
     </bpmn:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/issue_16_case1.bpmn b/cws-test/src/test/resources/bpmn/issue_16_case1.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_R1h6IJRCEeOK8uFCFN0InQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="issue_16_case1" isExecutable="true">
+  <bpmn2:process id="issue_16_case1" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/output_refresh_test.bpmn b/cws-test/src/test/resources/bpmn/output_refresh_test.bpmn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1jjbges" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
   <bpmn:process id="output_refresh_test" name="Output Refresh Test" isExecutable="true">
-    <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
+    <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true" camunda:historyTimeToLive="30">
       <bpmn:outgoing>SequenceFlow_0gipvhj</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0gipvhj" sourceRef="StartEvent_1" targetRef="Task_0iuu41n" />

diff --git a/cws-test/src/test/resources/bpmn/subprocess_test.bpmn b/cws-test/src/test/resources/bpmn/subprocess_test.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="subprocess_test" name="Subprocess Test" isExecutable="true">
+  <bpmn2:process id="subprocess_test" name="Subprocess Test" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn2:outgoing>SequenceFlow_1myunr7</bpmn2:outgoing>
     </bpmn2:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/test.bpmn b/cws-test/src/test/resources/bpmn/test.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_ltu48MELEeOlzfBFYwFcyA" targetNamespace="http://activiti.org/bpmn">
-  <bpmn2:process id="test_custom_method_call" name="Test Custom Method Call" isExecutable="true">
+  <bpmn2:process id="test_custom_method_call" name="Test Custom Method Call" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/test_all_models.bpmn b/cws-test/src/test/resources/bpmn/test_all_models.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0gwbugk" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="test_all_models" name="Test All Models" isExecutable="true">
+  <bpmn:process id="test_all_models" name="Test All Models" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn:outgoing>SequenceFlow_10zvbwv</bpmn:outgoing>
     </bpmn:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/test_cmdlineexec_task.bpmn b/cws-test/src/test/resources/bpmn/test_cmdlineexec_task.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_J_N2IKukEeOyC-h5TzZsuA" targetNamespace="http://activiti.org/bpmn">
-  <bpmn2:process id="test_cmdlineexec_task" isExecutable="true">
+  <bpmn2:process id="test_cmdlineexec_task" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:serviceTask id="ServiceTask_1" camunda:class="jpl.cws.task.CmdLineExecTask">
       <bpmn2:extensionElements>
         <camunda:field name="throwOnFailures" expression="true" />

diff --git a/cws-test/src/test/resources/bpmn/test_custom_method.bpmn b/cws-test/src/test/resources/bpmn/test_custom_method.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_EjaNkBc4EeSwBYqVUGqZoA" targetNamespace="http://camunda.org/schema/1.0/bpmn">
-  <bpmn2:process id="test_custom_method" name="Test Custom Method" isExecutable="true">
+  <bpmn2:process id="test_custom_method" name="Test Custom Method" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
     </bpmn2:endEvent>

diff --git a/cws-test/src/test/resources/bpmn/test_custom_method_call.bpmn b/cws-test/src/test/resources/bpmn/test_custom_method_call.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_ltu48MELEeOlzfBFYwFcyA" targetNamespace="http://activiti.org/bpmn">
-  <bpmn2:process id="test_custom_method_call" name="Test Custom Method Call" isExecutable="true">
+  <bpmn2:process id="test_custom_method_call" name="Test Custom Method Call" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:serviceTask id="ServiceTask_1" camunda:class="jpl.cws.task.LogTask">
       <bpmn2:extensionElements>
         <camunda:field name="message">

diff --git a/cws-test/src/test/resources/bpmn/test_deployments_page.bpmn b/cws-test/src/test/resources/bpmn/test_deployments_page.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0zp5yyi" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
-  <bpmn:process id="test_deployments_page" name="Test Deploy Page" isExecutable="true">
+  <bpmn:process id="test_deployments_page" name="Test Deploy Page" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true">
       <bpmn:outgoing>SequenceFlow_0qgq7oh</bpmn:outgoing>
     </bpmn:startEvent>

diff --git a/cws-test/src/test/resources/bpmn/test_distrib.bpmn b/cws-test/src/test/resources/bpmn/test_distrib.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_n7oK0IoLEeOHR4vGHpRBTA" targetNamespace="http://activiti.org/bpmn">
-  <bpmn2:process id="test_distrib" isExecutable="true">
+  <bpmn2:process id="test_distrib" isExecutable="true" camunda:historyTimeToLive="30">
     <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>