v3.0.1 pom

Merge branch 'develop' into stable
added ProcessDefinitionApi
2024-09-23 15:14:25 -04:00 · 2024-09-23 15:12:16 -04:00 · 2024-09-23 15:11:34 -04:00 · 2024-09-23 15:11:27 -04:00 · 2024-08-15 12:26:21 -04:00 · 2024-08-15 12:25:28 -04:00
61 changed files with 2948 additions and 420 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>2.0.9</version>
+	<version>3.0.1</version>

 	<name>Alfresco Process Services ReST API for Java</name>
 	<description>An APS API library for building REST API clients that support both the CXF and Jersey frameworks</description>
@@ -38,20 +38,26 @@

 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 		
-		<jersey.version>2.39.1</jersey.version>
-		<cxf.version>3.5.6</cxf.version>
-		<jackson.version>2.15.1</jackson.version>
+		<jersey.version>3.1.8</jersey.version>
+		<cxf.version>4.0.2</cxf.version>
+		<jackson.version>2.17.2</jackson.version>
 	</properties>

 	<dependencies>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>2.1.6</version>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.activation</groupId>
+			<artifactId>jakarta.activation-api</artifactId>
+			<version>2.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
@@ -121,7 +127,7 @@
 					<plugin>
 						<groupId>com.inteligr8</groupId>
 						<artifactId>regex-maven-plugin</artifactId>
-						<version>1.0.2</version>
+						<version>1.0.5</version>
 						<executions>
 							<execution>
 								<id>fix-displayName</id>
--- a/src/main/java/com/inteligr8/activiti/ActivitiPublicRestApi.java
+++ b/src/main/java/com/inteligr8/activiti/ActivitiPublicRestApi.java
@@ -14,7 +14,14 @@
 */
 package com.inteligr8.activiti;

+import com.inteligr8.activiti.api.DeadletterJobsApi;
+import com.inteligr8.activiti.api.ExecutionApi;
+import com.inteligr8.activiti.api.JobsApi;
 import com.inteligr8.activiti.api.ManagementApi;
+import com.inteligr8.activiti.api.ProcessDefinitionApi;
+import com.inteligr8.activiti.api.ProcessInstanceApi;
+import com.inteligr8.activiti.api.RuntimeApi;
+import com.inteligr8.activiti.api.TimerJobsApi;

 /**
 * This interface consolidates the JAX-RS APIs available in the open-source
@@ -30,4 +37,32 @@ public interface ActivitiPublicRestApi {
 		return this.getApi(ManagementApi.class);
 	}
    
+    default RuntimeApi getRuntimeApi() {
+        return this.getApi(RuntimeApi.class);
+    }
+	
+	default JobsApi getJobsApi() {
+		return this.getApi(JobsApi.class);
+	}
+	
+	default DeadletterJobsApi getDeadletterJobsApi() {
+		return this.getApi(DeadletterJobsApi.class);
+	}
+	
+	default TimerJobsApi getTimerJobsApi() {
+		return this.getApi(TimerJobsApi.class);
+	}
+    
+    default ProcessDefinitionApi getProcessDefinitionApi() {
+        return this.getApi(ProcessDefinitionApi.class);
+    }
+    
+    default ProcessInstanceApi getProcessInstanceApi() {
+        return this.getApi(ProcessInstanceApi.class);
+    }
+    
+    default ExecutionApi getExecutionApi() {
+        return this.getApi(ExecutionApi.class);
+    }
+    
 }
--- a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
@@ -0,0 +1,163 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import java.io.File;
+import java.time.LocalDate;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
+import com.inteligr8.activiti.model.Job;
+import com.inteligr8.activiti.model.ResultList;
+
+public interface BaseJobsApi {
+    
+    @GET
+    @Path("{jobId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public Job getJob(
+        @PathParam("jobId") String jobId);
+
+    @DELETE
+    @Path("{jobId}")
+    public void deleteJob(
+        @PathParam("jobId") String jobId);
+
+    @POST
+    @Path("{jobId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    public void executeJob(
+        @PathParam("jobId") String jobId,
+        ProcessInstanceAction execute);
+
+    default void executeJob(
+        String jobId,
+        ActionValue action) {
+        this.executeJob(jobId, new ProcessInstanceAction(action));
+    }
+
+    default void executeJob(
+        String jobId) {
+        this.executeJob(jobId, new ProcessInstanceAction(ActionValue.Execute));
+    }
+
+    @GET
+    @Path("{jobId}/execution-stacktrace")
+    @Produces({ MediaType.APPLICATION_OCTET_STREAM })
+    public File getJobStacktrace(
+        @PathParam("jobId") String jobId);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("withoutTenantId") Boolean withoutTenatId,
+        @QueryParam("sort") String sort);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("tenantId") String tenantId,
+        @QueryParam("tenantIdLike") String tenantIdLike,
+        @QueryParam("sort") String sort);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("withException") Boolean withException,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("exceptionMessage") String exceptionMessage,
+        @QueryParam("withoutTenantId") Boolean withoutTenatId,
+        @QueryParam("sort") String sort);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("withException") Boolean withException,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("exceptionMessage") String exceptionMessage,
+        @QueryParam("tenantId") String tenantId,
+        @QueryParam("tenantIdLike") String tenantIdLike,
+        @QueryParam("sort") String sort);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("id") String jobId,
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("withException") Boolean withException,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("exceptionMessage") String exceptionMessage,
+        @QueryParam("withoutTenantId") Boolean withoutTenatId,
+        @QueryParam("sort") String sort);
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<Job> queryJobs(
+        @QueryParam("id") String jobId,
+        @QueryParam("processInstanceId") String processInstanceId,
+        @QueryParam("executionId") String executionId,
+        @QueryParam("processDefinitionId") String processDefinitionId,
+        @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
+        @QueryParam("executable") Boolean executable,
+        @QueryParam("withException") Boolean withException,
+        @QueryParam("dueBefore") LocalDate dueBefore,
+        @QueryParam("dueAfter") LocalDate dueAfter,
+        @QueryParam("exceptionMessage") String exceptionMessage,
+        @QueryParam("tenantId") String tenantId,
+        @QueryParam("tenantIdLike") String tenantIdLike,
+        @QueryParam("sort") String sort);
+
+}
--- a/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java
@@ -0,0 +1,21 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import jakarta.ws.rs.Path;
+
+@Path("/api/management/deadletter-jobs")
+public interface DeadletterJobsApi extends BaseJobsApi {
+}
--- a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java
@@ -0,0 +1,225 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import java.util.List;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
+import com.inteligr8.activiti.model.Execution;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SignalEventAction;
+import com.inteligr8.activiti.model.SortOrder;
+import com.inteligr8.activiti.model.Variable;
+
+@Path("/api/runtime/executions")
+public interface ExecutionApi {
+    
+    public enum Sort {
+        @JsonProperty("id")
+        ProcessInstanceId,
+        @JsonProperty("processDefinitionId")
+        ProcessDefinitionId,
+        @JsonProperty("tenantId")
+        TenantId,
+        @JsonProperty("processDefinitionKey")
+        ProcessDefinitionKey;
+    }
+    
+    public enum VariableScope {
+        @JsonProperty("local")
+        Local,
+        @JsonProperty("global")
+        Global,
+    }
+
+    @GET
+    @Path("{executionId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    Execution get(
+            @PathParam("executionId") String executionId);
+
+    @GET
+    @Path("{executionId}/activities")
+    @Produces({ MediaType.APPLICATION_JSON })
+    List<String> getActiveActivities(
+            @PathParam("executionId") String executionId);
+
+    default Execution signal(
+            String processInstanceId,
+            List<Variable> variables) {
+        ProcessInstanceAction action = new ProcessInstanceAction(ActionValue.Signal);
+        if (variables != null && !variables.isEmpty())
+            action.setVariables(variables);
+        return this.execute(processInstanceId, action);
+    }
+
+    default Execution signalReceived(
+            String processInstanceId,
+            String signal,
+            List<Variable> variables) {
+        ProcessInstanceAction action = new SignalEventAction(ActionValue.SignalReceived, signal);
+        if (variables != null && !variables.isEmpty())
+            action.setVariables(variables);
+        return this.execute(processInstanceId, action);
+    }
+
+    default Execution messageReceived(
+            String processInstanceId,
+            String message,
+            List<Variable> variables) {
+        ProcessInstanceAction action = new SignalEventAction(ActionValue.MessageReceived, message);
+        if (variables != null && !variables.isEmpty())
+            action.setVariables(variables);
+        return this.execute(processInstanceId, action);
+    }
+
+    @PUT
+    @Path("{executionId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    Execution execute(
+            @PathParam("executionId") String executionId,
+            ProcessInstanceAction action);
+
+    default ResultList<Execution> getWithoutTenant(
+            String executionId,
+            String activityId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String processInstanceId,
+            String messageEventSubscriptionName,
+            String signalEventSubscriptionName,
+            String parentId,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
+                messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, null, true,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    default ResultList<Execution> getByTenant(
+            String executionId,
+            String activityId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String processInstanceId,
+            String messageEventSubscriptionName,
+            String signalEventSubscriptionName,
+            String parentId,
+            String tenantId,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
+                messageEventSubscriptionName, signalEventSubscriptionName, parentId, tenantId, null, false,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    default ResultList<Execution> getByTenants(
+            String executionId,
+            String activityId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String processInstanceId,
+            String messageEventSubscriptionName,
+            String signalEventSubscriptionName,
+            String parentId,
+            String tenantIdLike,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
+                messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, tenantIdLike, false,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultList<Execution> getByAny(
+            @QueryParam("id") String executionId,
+            @QueryParam("activityId") String activityId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("processInstanceId") String processInstanceId,
+            @QueryParam("messageEventSubscriptionName") String messageEventSubscriptionName,
+            @QueryParam("signalEventSubscriptionName") String signalEventSubscriptionName,
+            @QueryParam("parentId") String parentId,
+            @QueryParam("tenantId") String tenantId,
+            @QueryParam("tenantIdLike") String tenantIdLike,
+            @QueryParam("withoutTenantId") Boolean withoutTenantId,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
+
+    @GET
+    @Path("{executionId}/variables")
+    @Produces({ MediaType.APPLICATION_JSON })
+    List<Variable> getVariables(
+            @PathParam("executionId") String executionId,
+            @QueryParam("scope") VariableScope scope);
+
+    @GET
+    @Path("{executionId}/variables/{variableName}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    Variable getVariable(
+            @PathParam("executionId") String executionId,
+            @PathParam("variableName") String variableName);
+
+    @POST
+    @Path("{executionId}/variables")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void createVariables(
+            @PathParam("executionId") String executionId,
+            List<Variable> variables);
+
+    @PUT
+    @Path("{executionId}/variables")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void updateVariables(
+            @PathParam("executionId") String executionId,
+            List<Variable> variables);
+
+    default void updateVariable(
+            String executionId,
+            Variable variable) {
+        this.updateVariable(executionId, variable.getName(), variable);
+    }
+    
+    @PUT
+    @Path("{executionId}/variables/{variableName}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void updateVariable(
+            @PathParam("executionId") String executionId,
+            @PathParam("variableName") String variableName,
+            Variable variable); 
+
+}
--- a/src/main/java/com/inteligr8/activiti/api/JobsApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/JobsApi.java
@@ -0,0 +1,21 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import jakarta.ws.rs.Path;
+
+@Path("/api/management/jobs")
+public interface JobsApi extends BaseJobsApi {
+}
--- a/src/main/java/com/inteligr8/activiti/api/ManagementApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/ManagementApi.java
@@ -14,160 +14,25 @@
 */
 package com.inteligr8.activiti.api;

-import java.io.File;
-import java.time.LocalDate;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.inteligr8.activiti.model.Engine;
 import com.inteligr8.activiti.model.EngineProperties;
-import com.inteligr8.activiti.model.ExecuteAction;
-import com.inteligr8.activiti.model.ExecuteAction.Action;
-import com.inteligr8.activiti.model.Job;
-import com.inteligr8.activiti.model.ResultList;

@Path("/api/management")
 public interface ManagementApi {
-    
-    public enum JobType {
-        @JsonProperty("jobs")
-        Job,
-        @JsonProperty("deadletter-jobs")
-        DeadletterJob
-    }

    @GET
    @Path("engine")
-    @Produces({ "application/json" })
+    @Produces({ MediaType.APPLICATION_JSON })
    public Engine getEngine();

    @GET
    @Path("properties")
-    @Produces({ "application/json" })
+    @Produces({ MediaType.APPLICATION_JSON })
    public EngineProperties getEngineProperties();
-    
-    @GET
-    @Path("{jobType}/{jobId}")
-    @Produces({ "application/json" })
-    public Job getJob(
-            @PathParam("jobType") JobType jobType,
-            @PathParam("jobId") String jobId);
-    
-    @DELETE
-    @Path("{jobType}/{jobId}")
-    public void deleteJob(
-            @PathParam("jobType") JobType jobType,
-            @PathParam("jobId") String jobId);
-    
-    @POST
-    @Path("{jobType}/{jobId}")
-    @Consumes({ "application/json" })
-    public void executeJob(
-            @PathParam("jobType") JobType jobType,
-            @PathParam("jobId") String jobId,
-            ExecuteAction execute);
-    
-    default void executeJob(
-            JobType jobType,
-            String jobId,
-            Action action) {
-        this.executeJob(jobType, jobId, new ExecuteAction(action));
-    }
-    
-    default void executeJob(
-            JobType jobType,
-            String jobId) {
-        this.executeJob(jobType, jobId, new ExecuteAction(Action.Execute));
-    }
-    
-    @GET
-    @Path("{jobType}/{jobId}/execution-stacktrace")
-    @Produces({ "application/octet-stream" })
-    public File getJobStacktrace(
-            @PathParam("jobType") JobType jobType,
-            @PathParam("jobId") String jobId);
-    
-    @GET
-    @Path("{jobType}")
-    @Produces({ "application/json" })
-    public ResultList<Job> queryJobs(
-            @PathParam("jobType") JobType jobType,
-            @QueryParam("id") String jobId,
-            @QueryParam("processInstanceId") String processInstanceId,
-            @QueryParam("executionId") String executionId,
-            @QueryParam("processDefinitionId") String processDefinitionId,
-            @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
-            @QueryParam("executable") Boolean executable,
-            @QueryParam("timersOnly") Boolean timersOnly,
-            @QueryParam("messagesOnly") Boolean messagesOnly,
-            @QueryParam("withException") Boolean withException,
-            @QueryParam("dueBefore") LocalDate dueBefore,
-            @QueryParam("dueAfter") LocalDate dueAfter,
-            @QueryParam("exceptionMessage") String exceptionMessage,
-            @QueryParam("withoutTenantId") Boolean withoutTenatId,
-            @QueryParam("sort") String sort);
-    
-    @GET
-    @Path("{jobType}")
-    @Produces({ "application/json" })
-    public ResultList<Job> queryJobs(
-            @PathParam("jobType") JobType jobType,
-            @QueryParam("id") String jobId,
-            @QueryParam("processInstanceId") String processInstanceId,
-            @QueryParam("executionId") String executionId,
-            @QueryParam("processDefinitionId") String processDefinitionId,
-            @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
-            @QueryParam("executable") Boolean executable,
-            @QueryParam("timersOnly") Boolean timersOnly,
-            @QueryParam("messagesOnly") Boolean messagesOnly,
-            @QueryParam("withException") Boolean withException,
-            @QueryParam("dueBefore") LocalDate dueBefore,
-            @QueryParam("dueAfter") LocalDate dueAfter,
-            @QueryParam("exceptionMessage") String exceptionMessage,
-            @QueryParam("tenantId") String tenantId,
-            @QueryParam("tenantIdLike") String tenantIdLike,
-            @QueryParam("sort") String sort);
-
-    default ResultList<Job> queryTimerJobs(
-            JobType jobType,
-            @QueryParam("id") String jobId,
-            @QueryParam("processInstanceId") String processInstanceId,
-            @QueryParam("executionId") String executionId,
-            @QueryParam("processDefinitionId") String processDefinitionId,
-            @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
-            @QueryParam("executable") Boolean executable,
-            @QueryParam("withException") Boolean withException,
-            @QueryParam("dueBefore") LocalDate dueBefore,
-            @QueryParam("dueAfter") LocalDate dueAfter,
-            @QueryParam("exceptionMessage") String exceptionMessage,
-            @QueryParam("withoutTenantId") Boolean withoutTenantId,
-            @QueryParam("sort") String sort) {
-        return this.queryJobs(jobType, jobId, processInstanceId, executionId, processDefinitionId, withRetriesLeft, executable, true, false, withException, dueBefore, dueAfter, exceptionMessage, withoutTenantId, sort);
-    }
-    
-    default ResultList<Job> queryMessagesJobs(
-            JobType jobType,
-            @QueryParam("id") String jobId,
-            @QueryParam("processInstanceId") String processInstanceId,
-            @QueryParam("executionId") String executionId,
-            @QueryParam("processDefinitionId") String processDefinitionId,
-            @QueryParam("withRetriesLeft") Boolean withRetriesLeft,
-            @QueryParam("executable") Boolean executable,
-            @QueryParam("withException") Boolean withException,
-            @QueryParam("dueBefore") LocalDate dueBefore,
-            @QueryParam("dueAfter") LocalDate dueAfter,
-            @QueryParam("exceptionMessage") String exceptionMessage,
-            @QueryParam("withoutTenantId") Boolean withoutTenantId,
-            @QueryParam("sort") String sort) {
-        return this.queryJobs(jobType, jobId, processInstanceId, executionId, processDefinitionId, withRetriesLeft, executable, false, true, withException, dueBefore, dueAfter, exceptionMessage, withoutTenantId, sort);
-    }

 }
--- a/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java
@@ -0,0 +1,136 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import com.inteligr8.activiti.api.ProcessInstanceApi.Sort;
+import com.inteligr8.activiti.model.ProcessDefinitionAction;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
+import com.inteligr8.activiti.model.ProcessDefinitionAction.ActionValue;
+import com.inteligr8.alfresco.activiti.model.ProcessDefinition;
+import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+@Path("/api/repository/process-definitions")
+public interface ProcessDefinitionApi {
+
+    @GET
+    @Path("{processDefinitionId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    ProcessDefinition get(
+            @PathParam("processDefinitionId") String processDefinitionId);
+
+    default void activate(
+            String processDefinitionId) {
+        this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Activate)); 
+    }
+
+    default void suspend(
+            String processDefinitionId) {
+        this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Suspend)); 
+    }
+
+    @PUT
+    @Path("{processDefinitionId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void act(
+            @PathParam("processDefinitionId") String processDefinitionId,
+            ProcessDefinitionAction action);
+
+    default ResultList<ProcessInstance> getByTenant(
+            String category,
+            String categoryLike,
+            String categoryNotEquals,
+            String key,
+            String keyLike,
+            String name,
+            String nameLike,
+            String resourceName,
+            String resourceNameLike,
+            String version,
+            Boolean suspended,
+            boolean latest,
+            String deploymentId,
+            String startableByUser,
+            String tenantId,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike,
+                name, nameLike, resourceName, resourceNameLike, version,
+                suspended, latest, deploymentId, startableByUser,
+                tenantId, null, sort, sortOrder, pageStart, pageSize);
+    }
+
+    default ResultList<ProcessInstance> getByTenants(
+            String category,
+            String categoryLike,
+            String categoryNotEquals,
+            String key,
+            String keyLike,
+            String name,
+            String nameLike,
+            String resourceName,
+            String resourceNameLike,
+            String version,
+            Boolean suspended,
+            boolean latest,
+            String deploymentId,
+            String startableByUser,
+            String tenantIdLike,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike,
+                name, nameLike, resourceName, resourceNameLike, version,
+                suspended, latest, deploymentId, startableByUser,
+                null, tenantIdLike, sort, sortOrder, pageStart, pageSize);
+    }
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<ProcessInstance> getByAny(
+            @QueryParam("category") String category,
+            @QueryParam("categoryLike") String categoryLike,
+            @QueryParam("categoryNotEquals") String categoryNotEquals,
+            @QueryParam("key") String key,
+            @QueryParam("keyLike") String keyLike,
+            @QueryParam("name") String name,
+            @QueryParam("nameLike") String nameLike,
+            @QueryParam("resourceName") String resourceName,
+            @QueryParam("resourceNameLike") String resourceNameLike,
+            @QueryParam("version") String version,
+            @QueryParam("suspended") Boolean suspended,
+            @QueryParam("latest") Boolean latest,
+            @QueryParam("deploymentId") String deploymentId,
+            @QueryParam("startableByUser") String startableByUser,
+            @QueryParam("tenantId") String tenantId,
+            @QueryParam("tenantIdLike") String tenantIdLike,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
+
+}
--- a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java
@@ -0,0 +1,214 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import java.io.File;
+import java.util.List;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
+import com.inteligr8.activiti.model.Variable;
+import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+
+@Path("/api/runtime/process-instances")
+public interface ProcessInstanceApi {
+    
+    public enum Sort {
+        @JsonProperty("id")
+        ProcessInstanceId,
+        @JsonProperty("processDefinitionId")
+        ProcessDefinitionId,
+        @JsonProperty("tenantId")
+        TenantId,
+        @JsonProperty("processDefinitionKey")
+        ProcessDefinitionKey;
+    }
+
+    @GET
+    @Path("{processInstanceId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    ProcessInstance get(
+            @PathParam("processInstanceId") String processInstanceId);
+
+    @DELETE
+    @Path("{processInstanceId}")
+    void delete(
+            @PathParam("processInstanceId") String processInstanceId);
+
+    default void activate(
+            String processInstanceId) {
+        this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Activate)); 
+    }
+
+    default void suspend(
+            String processInstanceId) {
+        this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Suspend)); 
+    }
+
+    @PUT
+    @Path("{processInstanceId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void act(
+            @PathParam("processInstanceId") String processInstanceId,
+            ProcessInstanceAction action);
+
+    default ResultList<ProcessInstance> getWithoutTenant(
+            String processInstanceId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String businessKey,
+            String involvedUser,
+            Boolean suspended,
+            String superProcessInstanceId,
+            String subProcessInstanceId,
+            Boolean excludeSubprocesses,
+            Boolean includeProcessVariables,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
+                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
+                excludeSubprocesses, includeProcessVariables, null, null, true,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    default ResultList<ProcessInstance> getByTenant(
+            String processInstanceId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String businessKey,
+            String involvedUser,
+            Boolean suspended,
+            String superProcessInstanceId,
+            String subProcessInstanceId,
+            Boolean excludeSubprocesses,
+            Boolean includeProcessVariables,
+            String tenantId,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
+                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
+                excludeSubprocesses, includeProcessVariables, tenantId, null, false,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    default ResultList<ProcessInstance> getByTenants(
+            String processInstanceId,
+            String processDefinitionKey,
+            String processDefinitionId,
+            String businessKey,
+            String involvedUser,
+            Boolean suspended,
+            String superProcessInstanceId,
+            String subProcessInstanceId,
+            Boolean excludeSubprocesses,
+            Boolean includeProcessVariables,
+            String tenantIdLike,
+            Sort sort,
+            SortOrder sortOrder,
+            Integer pageStart,
+            Integer pageSize) {
+        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
+                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
+                excludeSubprocesses, includeProcessVariables, null, tenantIdLike, false,
+                sort, sortOrder, pageStart, pageSize);
+    }
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<ProcessInstance> getByAny(
+            @QueryParam("id") String processInstanceId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("businessKey") String businessKey,
+            @QueryParam("involvedUser") String involvedUser,
+            @QueryParam("suspended") Boolean suspended,
+            @QueryParam("superProcessInstanceId") String superProcessInstanceId,
+            @QueryParam("subProcessInstanceId") String subProcessInstanceId,
+            @QueryParam("excludeSubprocesses") Boolean excludeSubprocesses,
+            @QueryParam("includeProcessVariables") Boolean includeProcessVariables,
+            @QueryParam("tenantId") String tenantId,
+            @QueryParam("tenantIdLike") String tenantIdLike,
+            @QueryParam("withoutTenantId") Boolean withoutTenantId,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
+
+    @GET
+    @Path("{processInstanceId}/diagram")
+    @Produces({ "image/png" })
+    File getDiagram(
+            @PathParam("processInstanceId") String processInstanceId);
+
+    @GET
+    @Path("{processInstanceId}/variables")
+    @Produces({ MediaType.APPLICATION_JSON })
+    List<Variable> getVariables(
+            @PathParam("processInstanceId") String processInstanceId);
+
+    @GET
+    @Path("{processInstanceId}/variables/{variableName}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    Variable getVariable(
+            @PathParam("processInstanceId") String processInstanceId,
+            @PathParam("variableName") String variableName);
+
+    @POST
+    @Path("{processInstanceId}/variables")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void createVariables(
+            @PathParam("processInstanceId") String processInstanceId,
+            List<Variable> variables);
+
+    @PUT
+    @Path("{processInstanceId}/variables")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void updateVariables(
+            @PathParam("processInstanceId") String processInstanceId,
+            List<Variable> variables);
+
+    default void updateVariable(
+            String processInstanceId,
+            Variable variable) {
+        this.updateVariable(processInstanceId, variable.getName(), variable);
+    }
+    
+    @PUT
+    @Path("{processInstanceId}/variables/{variableName}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void updateVariable(
+            @PathParam("processInstanceId") String processInstanceId,
+            @PathParam("variableName") String variableName,
+            Variable variable); 
+
+}
--- a/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import java.util.List;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
+
+import com.inteligr8.activiti.model.Variable;
+
+@Path("/api/runtime")
+public interface RuntimeApi {
+
+    @POST
+    @Path("signals")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    void signalReceived(
+            String signal,
+            String tenantId,
+            Boolean async,
+            List<Variable> variables);
+
+}
--- a/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java
@@ -0,0 +1,21 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.activiti.api;
+
+import jakarta.ws.rs.Path;
+
+@Path("/api/management/timer-jobs")
+public interface TimerJobsApi extends BaseJobsApi {
+}
--- a/src/main/java/com/inteligr8/activiti/model/ExecuteAction.java
+++ b/src/main/java/com/inteligr8/activiti/model/ExecuteAction.java
@@ -1,40 +0,0 @@
-package com.inteligr8.activiti.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ExecuteAction {
-
-    public enum Action {
-        @JsonProperty("execute")
-        Execute
-    }
-    
-    @JsonProperty("action")
-    private Action action;
-
-    /**
-     * No args constructor for use in serialization
-     */
-    public ExecuteAction() {
-    }
-    
-    public ExecuteAction(Action action) {
-        this.action = action;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-	public ExecuteAction withAction(Action action) {
-        this.action = action;
-        return this;
-    }
-
-}
--- a/src/main/java/com/inteligr8/activiti/model/Execution.java
+++ b/src/main/java/com/inteligr8/activiti/model/Execution.java
@@ -0,0 +1,182 @@
+
+package com.inteligr8.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Execution extends Datum {
+
+    @JsonProperty("activityId")
+    private String activityId;
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("parentId")
+    private String parentId;
+    @JsonProperty("parentUrl")
+    private String parentUrl;
+    @JsonProperty("processInstanceId")
+    private String processInstanceId;
+    @JsonProperty("processInstanceUrl")
+    private String processInstanceUrl;
+    @JsonProperty("superExecutionId")
+    private String superExecutionId;
+    @JsonProperty("superExecutionUrl")
+    private String superExecutionUrl;
+    @JsonProperty("suspended")
+    private Boolean suspended;
+    @JsonProperty("tenantId")
+    private String tenantId;
+    @JsonProperty("url")
+    private String url;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public Execution() {
+    }
+    
+    public String getActivityId() {
+        return activityId;
+    }
+    
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
+    
+    public Execution withActivityId(String activityId) {
+        this.activityId = activityId;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Execution withId(String id) {
+        this.id = id;
+        return this;
+    }
+    
+    public String getParentId() {
+        return parentId;
+    }
+    
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+    
+    public Execution withParentId(String parentId) {
+        this.parentId = parentId;
+        return this;
+    }
+    
+    public String getParentUrl() {
+        return parentUrl;
+    }
+    
+    public void setParentUrl(String parentUrl) {
+        this.parentUrl = parentUrl;
+    }
+    
+    public Execution withParentUrl(String parentUrl) {
+        this.parentUrl = parentUrl;
+        return this;
+    }
+    
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+    
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+    
+    public Execution withProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+        return this;
+    }
+    
+    public String getProcessInstanceUrl() {
+        return processInstanceUrl;
+    }
+    
+    public void setProcessInstanceUrl(String processInstanceUrl) {
+        this.processInstanceUrl = processInstanceUrl;
+    }
+    
+    public Execution withProcessInstanceUrl(String processInstanceUrl) {
+        this.processInstanceUrl = processInstanceUrl;
+        return this;
+    }
+    
+    public String getSuperExecutionId() {
+        return superExecutionId;
+    }
+    
+    public void setSuperExecutionId(String superExecutionId) {
+        this.superExecutionId = superExecutionId;
+    }
+    
+    public Execution withSuperExecutionId(String superExecutionId) {
+        this.superExecutionId = superExecutionId;
+        return this;
+    }
+    
+    public String getSuperExecutionUrl() {
+        return superExecutionUrl;
+    }
+    
+    public void setSuperExecutionUrl(String superExecutionUrl) {
+        this.superExecutionUrl = superExecutionUrl;
+    }
+    
+    public Execution withSuperExecutionUrl(String superExecutionUrl) {
+        this.superExecutionUrl = superExecutionUrl;
+        return this;
+    }
+
+    public Boolean getSuspended() {
+        return suspended;
+    }
+
+    public void setSuspended(Boolean suspended) {
+        this.suspended = suspended;
+    }
+
+    public Execution withSuspended(Boolean suspended) {
+        this.suspended = suspended;
+        return this;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public Execution withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+    
+    public String getUrl() {
+        return url;
+    }
+    
+    public void setUrl(String url) {
+        this.url = url;
+    }
+    
+    public Execution withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/Job.java
+++ b/src/main/java/com/inteligr8/activiti/model/Job.java
@@ -31,7 +31,7 @@ public class Job extends Datum {
    private String exceptionMessage;
    @JsonProperty("dueDate")
    private OffsetDateTime dueDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    @JsonProperty("tenantId")
    private String tenantId;

--- a/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java
+++ b/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java
@@ -0,0 +1,37 @@
+package com.inteligr8.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MessageEventAction extends ProcessInstanceAction {
+    
+    @JsonProperty("messageName")
+    private String message;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public MessageEventAction() {
+    }
+    
+    public MessageEventAction(ActionValue action, String message) {
+        super(action);
+        this.message = message;
+    }
+    
+    public String getMessage() {
+        return message;
+    }
+    
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public MessageEventAction withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+    
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/ProcessDefinitionAction.java
+++ b/src/main/java/com/inteligr8/activiti/model/ProcessDefinitionAction.java
@@ -0,0 +1,89 @@
+package com.inteligr8.activiti.model;
+
+import java.time.OffsetDateTime;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProcessDefinitionAction {
+
+    public enum ActionValue {
+        @JsonProperty("suspend")
+        Suspend,
+        @JsonProperty("activate")
+        Activate
+    }
+    
+    @JsonProperty("action")
+    private ActionValue action;
+    @JsonProperty("includeProcessInstances")
+    private boolean includeProcessInstances;
+    @JsonProperty("date")
+    private OffsetDateTime date;
+    @JsonProperty("category")
+    private String category;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public ProcessDefinitionAction() {
+    }
+    
+    public ProcessDefinitionAction(ActionValue action) {
+        this.action = action;
+    }
+
+    public ActionValue getAction() {
+        return action;
+    }
+
+    public void setAction(ActionValue action) {
+        this.action = action;
+    }
+
+	public ProcessDefinitionAction withAction(ActionValue action) {
+        this.action = action;
+        return this;
+    }
+	
+	public boolean isIncludeProcessInstances() {
+        return includeProcessInstances;
+    }
+	
+	public void setIncludeProcessInstances(boolean includeProcessInstances) {
+        this.includeProcessInstances = includeProcessInstances;
+    }
+    
+    public ProcessDefinitionAction withIncludeProcessInstances(boolean includeProcessInstances) {
+        this.includeProcessInstances = includeProcessInstances;
+        return this;
+    }
+	
+	public OffsetDateTime getDate() {
+        return date;
+    }
+	
+	public void setDate(OffsetDateTime date) {
+        this.date = date;
+    }
+    
+    public ProcessDefinitionAction withDate(OffsetDateTime date) {
+        this.date = date;
+        return this;
+    }
+    
+    public String getCategory() {
+        return category;
+    }
+    
+    public void setCategory(String category) {
+        this.category = category;
+    }
+    
+    public ProcessDefinitionAction withCategory(String category) {
+        this.category = category;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/ProcessInstance.java
+++ b/src/main/java/com/inteligr8/activiti/model/ProcessInstance.java
@@ -0,0 +1,202 @@
+
+package com.inteligr8.activiti.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProcessInstance extends Datum {
+
+    @JsonProperty("activityId")
+    private String activityId;
+    @JsonProperty("businessKey")
+    private String businessKey;
+    @JsonProperty("completed")
+    private Boolean completed;
+    @JsonProperty("ended")
+    private Boolean ended;
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("processDefinitionId")
+    private String processDefinitionId;
+    @JsonProperty("processDefinitionKey")
+    private String processDefinitionKey;
+    @JsonProperty("processDefinitionUrl")
+    private String processDefinitionUrl;
+    @JsonProperty("suspended")
+    private Boolean suspended;
+    @JsonProperty("tenantId")
+    private String tenantId;
+    @JsonProperty("url")
+    private String url;
+    @JsonProperty("variables")
+    private List<Variable> variables = new ArrayList<Variable>();
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public ProcessInstance() {
+    }
+    
+    public String getActivityId() {
+        return activityId;
+    }
+    
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
+    
+    public ProcessInstance withActivityId(String activityId) {
+        this.activityId = activityId;
+        return this;
+    }
+
+    public String getBusinessKey() {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+
+    public ProcessInstance withBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+        return this;
+    }
+    
+    public Boolean getCompleted() {
+        return completed;
+    }
+    
+    public void setCompleted(Boolean completed) {
+        this.completed = completed;
+    }
+    
+    public ProcessInstance withCompleted(Boolean completed) {
+        this.completed = completed;
+        return this;
+    }
+
+    public Boolean getEnded() {
+        return ended;
+    }
+
+    public void setEnded(Boolean ended) {
+        this.ended = ended;
+    }
+
+    public ProcessInstance withEnded(Boolean ended) {
+        this.ended = ended;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public ProcessInstance withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ProcessInstance withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public ProcessInstance withProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+        return this;
+    }
+
+    public String getProcessDefinitionKey() {
+        return processDefinitionKey;
+    }
+
+    public void setProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+    public ProcessInstance withProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+        return this;
+    }
+
+    public Boolean getSuspended() {
+        return suspended;
+    }
+
+    public void setSuspended(Boolean suspended) {
+        this.suspended = suspended;
+    }
+
+    public ProcessInstance withSuspended(Boolean suspended) {
+        this.suspended = suspended;
+        return this;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public ProcessInstance withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+    
+    public String getUrl() {
+        return url;
+    }
+    
+    public void setUrl(String url) {
+        this.url = url;
+    }
+    
+    public ProcessInstance withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public List<Variable> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<Variable> variables) {
+        this.variables = variables;
+    }
+
+    public ProcessInstance withVariables(List<Variable> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java
+++ b/src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java
@@ -0,0 +1,67 @@
+package com.inteligr8.activiti.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ProcessInstanceAction {
+
+    public enum ActionValue {
+        @JsonProperty("execute")
+        Execute,
+        @JsonProperty("suspend")
+        Suspend,
+        @JsonProperty("activate")
+        Activate,
+        @JsonProperty("signal")
+        Signal,
+        @JsonProperty("signalEventReceived")
+        SignalReceived,
+        @JsonProperty("messageEventReceived")
+        MessageReceived
+    }
+    
+    @JsonProperty("action")
+    private ActionValue action;
+    @JsonProperty("variables")
+    private List<Variable> variables;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public ProcessInstanceAction() {
+    }
+    
+    public ProcessInstanceAction(ActionValue action) {
+        this.action = action;
+    }
+
+    public ActionValue getAction() {
+        return action;
+    }
+
+    public void setAction(ActionValue action) {
+        this.action = action;
+    }
+
+	public ProcessInstanceAction withAction(ActionValue action) {
+        this.action = action;
+        return this;
+    }
+	
+	public List<Variable> getVariables() {
+        return variables;
+    }
+	
+	public void setVariables(List<Variable> variables) {
+        this.variables = variables;
+    }
+    
+    public ProcessInstanceAction withVariables(List<Variable> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/SignalEvent.java
+++ b/src/main/java/com/inteligr8/activiti/model/SignalEvent.java
@@ -0,0 +1,84 @@
+package com.inteligr8.activiti.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SignalEvent {
+    
+    @JsonProperty("signalName")
+    private String signal;
+    @JsonProperty("tenantId")
+    private String tenantId;
+    @JsonProperty("async")
+    private Boolean async;
+    @JsonProperty("variables")
+    private List<Variable> variables;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public SignalEvent() {
+    }
+    
+    public SignalEvent(String signal, String tenantId, Boolean async) {
+        this.signal = signal;
+        this.tenantId = tenantId;
+        this.async = async;
+    }
+    
+    public String getSignal() {
+        return signal;
+    }
+    
+    public void setSignal(String signal) {
+        this.signal = signal;
+    }
+    
+    public SignalEvent withSignal(String signal) {
+        this.signal = signal;
+        return this;
+    }
+    
+    public String getTenantId() {
+        return tenantId;
+    }
+    
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+    
+    public SignalEvent withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+    
+    public Boolean getAsync() {
+        return async;
+    }
+    
+    public void setAsync(Boolean async) {
+        this.async = async;
+    }
+    
+    public SignalEvent withAsync(Boolean async) {
+        this.async = async;
+        return this;
+    }
+    
+    public List<Variable> getVariables() {
+        return variables;
+    }
+    
+    public void setVariables(List<Variable> variables) {
+        this.variables = variables;
+    }
+    
+    public SignalEvent withVariables(List<Variable> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java
+++ b/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java
@@ -0,0 +1,36 @@
+package com.inteligr8.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SignalEventAction extends ProcessInstanceAction {
+    
+    @JsonProperty("signalName")
+    private String signal;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public SignalEventAction() {
+    }
+    
+    public SignalEventAction(ActionValue action, String signal) {
+        super(action);
+        this.signal = signal;
+    }
+    
+    public String getSignal() {
+        return signal;
+    }
+    
+    public void setSignal(String signal) {
+        this.signal = signal;
+    }
+    
+    public SignalEventAction withSignal(String signal) {
+        this.signal = signal;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/SortOrder.java
+++ b/src/main/java/com/inteligr8/activiti/model/SortOrder.java
@@ -0,0 +1,12 @@
+package com.inteligr8.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum SortOrder {
+    
+    @JsonProperty("asc")
+    Ascending,
+    @JsonProperty("desc")
+    Descending
+
+}
--- a/src/main/java/com/inteligr8/activiti/model/Variable.java
+++ b/src/main/java/com/inteligr8/activiti/model/Variable.java
@@ -0,0 +1,90 @@
+package com.inteligr8.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "type",
+    "value",
+    "scope"
+})
+public class Variable {
+
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("scope")
+    private String scope;
+    @JsonProperty("type")
+    private String type;
+    @JsonProperty("value")
+    private Object value;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public Variable() {
+    }
+
+    public Variable(String name, String scope, String type, Object value) {
+        this.name = name;
+        this.scope = scope;
+        this.type = type;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Variable withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public Variable withScope(String scope) {
+        this.scope = scope;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Variable withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public Variable withValue(Object value) {
+        this.value = value;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
@@ -24,6 +24,7 @@ import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi;
 import com.inteligr8.alfresco.activiti.api.ProfileApi;
 import com.inteligr8.alfresco.activiti.api.ShareApi;
 import com.inteligr8.alfresco.activiti.api.TasksApi;
+import com.inteligr8.alfresco.activiti.api.TemplatesApi;

 /**
 * This interface consolidates the JAX-RS APIs available in the APS Public
@@ -47,7 +48,7 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(AppVersionApi.class);
 	}
    
-    default HistoricApi getHistoricProcessInstancesApi() {
+    default HistoricApi getHistoricApi() {
        return this.getApi(HistoricApi.class);
    }
 	
@@ -75,4 +76,8 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(ShareApi.class);
 	}

+    default TemplatesApi getTemplatesApi() {
+        return this.getApi(TemplatesApi.class);
+    }
+
 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
@@ -1,6 +1,7 @@
 package com.inteligr8.alfresco.activiti;

 import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
+import com.inteligr8.alfresco.activiti.api.TemplatesCxfApi;

 /**
 * This interface appends Apache CXF implementation specific methods to the
@@ -14,5 +15,9 @@ public interface ApsPublicRestCxfApi extends ApsPublicRestApi {
 	default AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
 		return this.getApi(AppDefinitionsCxfApi.class);
 	}
+	
+	default TemplatesCxfApi getTemplatesCxfApi() {
+	    return this.getApi(TemplatesCxfApi.class);
+	}

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
@@ -1,6 +1,7 @@
 package com.inteligr8.alfresco.activiti;

 import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
+import com.inteligr8.alfresco.activiti.api.TemplatesJerseyApi;

 /**
 * This interface appends Jersey implementation specific methods to the JAX-RS
@@ -14,5 +15,9 @@ public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {
 	default AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
 		return this.getApi(AppDefinitionsJerseyApi.class);
 	}
+    
+    default TemplatesJerseyApi getTemplatesJerseyApi() {
+        return this.getApi(TemplatesJerseyApi.class);
+    }

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java
@@ -16,15 +16,15 @@ package com.inteligr8.alfresco.activiti.api;

 import java.util.List;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;

 import com.inteligr8.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.Group;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java
@@ -16,15 +16,15 @@ package com.inteligr8.alfresco.activiti.api;

 import java.io.File;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;

 import com.inteligr8.alfresco.activiti.model.AppDefinitionPublishRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java
@@ -1,13 +1,13 @@

 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;

 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java
@@ -1,13 +1,13 @@

 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;

 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java
@@ -0,0 +1,61 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti.api;
+
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.AppDeployment;
+import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
+
+@Path("/api/enterprise")
+public interface AppDeploymentsApi {
+
+    @GET
+    @Path("runtime-app-deployment")
+    @Produces({ "application/json" })
+    AppDeployment get(
+            @QueryParam("deploymentId") String deploymentId);
+
+    @GET
+    @Path("runtime-app-deployments/{deploymentId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDeployment get(
+            @PathParam("deploymentId") long deploymentId);
+
+    @DELETE
+    @Path("runtime-app-deployments/{deploymentId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    void remove(
+            @PathParam("deploymentId") long deploymentId);
+
+    @GET
+    @Path("runtime-app-deployments")
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultListDataRepresentation<AppDeployment> query(
+            @QueryParam("nameLike") String nameLike,
+            @QueryParam("tenantId") Integer tenantId,
+            @QueryParam("latest") Boolean latest,
+            @QueryParam("start") Integer start,
+            @QueryParam("sort") String sort,
+            @QueryParam("order") String order,
+            @QueryParam("size") Integer size);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java
@@ -14,9 +14,9 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;

 import com.inteligr8.alfresco.activiti.model.AppVersion;

--- a/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java
@@ -14,11 +14,11 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;

 import com.inteligr8.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.GroupLight;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java
@@ -14,10 +14,10 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;

 import com.inteligr8.alfresco.activiti.model.HistoricProcessInstanceQueryRepresentation;
 import com.inteligr8.alfresco.activiti.model.HistoricTaskQueryRepresentation;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java
@@ -14,12 +14,14 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;

-import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.ModelRepresentation;

@Path("/api/enterprise/models")
 public interface ModelsApi {
@@ -40,8 +42,14 @@ public interface ModelsApi {
 	}

    @GET
+	@Path("{id}")
    @Produces({ "application/json" })
-    public ResultListDataRepresentation get(
+    public ModelRepresentation get(
+    		@PathParam("id") String id);
+
+    @GET
+    @Produces({ "application/json" })
+    public ResultList<ModelRepresentation> get(
    		@QueryParam("filter") String filter,
    		@QueryParam("sort") String sort,
    		@QueryParam("modelType") Integer modelType,
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java
@@ -14,10 +14,10 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;

 import com.inteligr8.alfresco.activiti.model.ProcessDefinition;
 import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java
@@ -16,14 +16,14 @@ package com.inteligr8.alfresco.activiti.api;

 import java.util.List;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;

 import com.inteligr8.alfresco.activiti.model.CreateProcessInstance;
 import com.inteligr8.alfresco.activiti.model.ProcessInstance;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java
@@ -14,9 +14,9 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;

 import com.inteligr8.alfresco.activiti.model.User;

--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java
@@ -14,13 +14,13 @@
 */
 package com.inteligr8.alfresco.activiti.api;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;

 import com.inteligr8.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.ShareInfoRequest;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java
@@ -16,129 +16,152 @@ package com.inteligr8.alfresco.activiti.api;

 import java.util.List;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;

 import com.inteligr8.alfresco.activiti.model.AssigneeIdentifier;
-import com.inteligr8.alfresco.activiti.model.HistoricTaskQueryRepresentation;
+import com.inteligr8.alfresco.activiti.model.CompleteForm;
+import com.inteligr8.alfresco.activiti.model.FormDefinition;
+import com.inteligr8.alfresco.activiti.model.FormValue;
 import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
 import com.inteligr8.alfresco.activiti.model.Task;
+import com.inteligr8.alfresco.activiti.model.TaskFilterRepresentation;
 import com.inteligr8.alfresco.activiti.model.TaskQueryRepresentation;
 import com.inteligr8.alfresco.activiti.model.TaskUpdate;
 import com.inteligr8.alfresco.activiti.model.UserIdentifier;
 import com.inteligr8.alfresco.activiti.model.Variable;

-@Path("/api/enterprise/tasks")
+@Path("/api/enterprise")
 public interface TasksApi {

    @GET
-    @Path("{taskId}")
+    @Path("tasks/{taskId}")
    @Produces({ "application/json" })
    Task get(@PathParam("taskId") String taskId);

+    @GET
+    @Path("task-forms/{taskId}")
+    @Produces({ "application/json" })
+    FormDefinition getForm(@PathParam("taskId") String taskId);
+
+    @GET
+    @Path("task-forms/{taskId}/form-values/{field}")
+    @Produces({ "application/json" })
+    FormValue getFormValue(@PathParam("taskId") String taskId, @PathParam("field") String field);
+
+    @GET
+    @Path("task-forms/{taskId}/form-values/{field}/{column}")
+    @Produces({ "application/json" })
+    FormValue getFormValue(@PathParam("taskId") String taskId, @PathParam("field") String field, @PathParam("column") String column);
+
    @PUT
-    @Path("{taskId}")
+    @Path("tasks/{taskId}")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    Task update(@PathParam("taskId") String taskId, TaskUpdate taskUpdate);

    @DELETE
-    @Path("{taskId}")
+    @Path("tasks/{taskId}")
    @Produces({ "application/json" })
    void delete(@PathParam("taskId") String taskId);

    @POST
-    @Path("query")
+    @Path("tasks/query")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    ResultListDataRepresentation<Task> query(TaskQueryRepresentation request);

    @POST
-    @Path("filter")
+    @Path("tasks/filter")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
-    ResultListDataRepresentation<Task> query(HistoricTaskQueryRepresentation request);
+    ResultListDataRepresentation<Task> filter(TaskFilterRepresentation request);

    @PUT
-    @Path("{taskId}/action/assign")
+    @Path("tasks/{taskId}/action/assign")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    Task assign(@PathParam("taskId") String taskId, AssigneeIdentifier request);

    @PUT
-    @Path("{taskId}/action/claim")
+    @Path("tasks/{taskId}/action/claim")
    void claim(@PathParam("taskId") String taskId);

    @PUT
-    @Path("{taskId}/action/complete")
+    @Path("tasks/{taskId}/action/complete")
    void complete(@PathParam("taskId") String taskId);

+    @POST
+    @Path("task-forms/{taskId}")
+    @Consumes({ "application/json" })
+    void complete(@PathParam("taskId") String taskId, CompleteForm request);
+
    @PUT
-    @Path("{taskId}/action/delegate")
+    @Path("tasks/{taskId}/action/delegate")
    @Consumes({ "application/json" })
    void delegate(@PathParam("taskId") String taskId, UserIdentifier request);

    @PUT
-    @Path("{taskId}/action/involve")
+    @Path("tasks/{taskId}/action/involve")
    @Consumes({ "application/json" })
    void involve(@PathParam("taskId") String taskId, UserIdentifier request);

    @POST
-    @Path("{taskId}/groups/{groupId}")
+    @Path("tasks/{taskId}/groups/{groupId}")
    void involveGroup(@PathParam("taskId") String taskId, @PathParam("groupId") String groupId);

    @DELETE
-    @Path("{taskId}/groups/{groupId}")
+    @Path("tasks/{taskId}/groups/{groupId}")
    void removeInvolvedGroup(@PathParam("taskId") String taskId, @PathParam("groupId") String groupId);

    @PUT
-    @Path("{taskId}/action/remove-involved")
+    @Path("tasks/{taskId}/action/remove-involved")
    @Consumes({ "application/json" })
    void removeInvolved(@PathParam("taskId") String taskId, UserIdentifier request);

    @PUT
-    @Path("{taskId}/action/resolve")
+    @Path("tasks/{taskId}/action/resolve")
    void resolve(@PathParam("taskId") String taskId);

    @PUT
-    @Path("{taskId}/action/unclaim")
+    @Path("tasks/{taskId}/action/unclaim")
    void unclaim(@PathParam("taskId") String taskId);
    
    @GET
-    @Path("{taskId}/variables")
+    @Path("tasks/{taskId}/variables")
    @Produces({ "application/json" })
    List<Variable> getVariables(@PathParam("taskId") String taskId, @QueryParam("scope") String scope);
    
    @POST
-    @Path("{taskId}/variables")
+    @Path("tasks/{taskId}/variables")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    List<Variable> setVariables(@PathParam("taskId") String taskId, List<Variable> variables);
    
    @DELETE
-    @Path("{taskId}/variables")
+    @Path("tasks/{taskId}/variables")
    List<Variable> removeVariables(@PathParam("taskId") String taskId);
    
    @GET
-    @Path("{taskId}/variables/{variableName}")
+    @Path("tasks/{taskId}/variables/{variableName}")
    @Produces({ "application/json" })
    Variable getVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, @QueryParam("scope") String scope);
    
    @PUT
-    @Path("{taskId}/variables/{variableName}")
+    @Path("tasks/{taskId}/variables/{variableName}")
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    Variable setVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, Variable variable);
    
    @DELETE
-    @Path("{taskId}/variables/{variableName}")
+    @Path("tasks/{taskId}/variables/{variableName}")
    void removeVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, @QueryParam("scope") String scope);

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java
@@ -0,0 +1,167 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti.api;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.DocumentTemplateLight;
+import com.inteligr8.alfresco.activiti.model.EmailTemplate;
+import com.inteligr8.alfresco.activiti.model.EmailTemplateLight;
+
+/**
+ * This is an undocumented API.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Path("/app/rest")
+public interface TemplatesApi {
+    
+    public enum TemplateSort {
+        @JsonProperty("sort_by_name_asc")
+        NameAscending,
+        @JsonProperty("sort_by_name_desc")
+        NameDescending
+    }
+
+    @GET
+    @Path("email-templates/system")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<EmailTemplateLight> getSystemEmailTemplates(
+            @QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("email-templates/custom")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<EmailTemplateLight> getCustomEmailTemplates(
+    		@QueryParam("nameFilter") String nameFilter,
+    		@QueryParam("start") Integer start,
+    		@QueryParam("size") Integer size,
+    		@QueryParam("sort") String sort,
+    		@QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("email-templates/custom")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<EmailTemplateLight> getCustomEmailTemplates(
+    		@QueryParam("nameFilter") String nameFilter,
+    		@QueryParam("start") Integer start,
+    		@QueryParam("size") Integer size,
+    		@QueryParam("sort") TemplateSort sort,
+    		@QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("email-templates/system/{templateName}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EmailTemplate getSystemEmailTemplate(
+            @PathParam("templateName") String name,
+            @QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("email-templates/custom/{templateId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EmailTemplate getCustomEmailTemplate(
+            @PathParam("templateId") long id,
+            @QueryParam("tenantId") Long tenantId);
+
+    @POST
+    @Path("email-templates/custom")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EmailTemplateLight createCustomEmailTemplate(
+            EmailTemplate template);
+
+    @PUT
+    @Path("email-templates/system/{templateName}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EmailTemplate updateSystemEmailTemplate(
+            @PathParam("templateName") String name,
+            EmailTemplate template);
+
+    @PUT
+    @Path("email-templates/custom/{templateId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EmailTemplate updateCustomEmailTemplate(
+            @PathParam("templateId") long id,
+            EmailTemplate template);
+
+    @DELETE
+    @Path("email-templates/custom/{templateId}")
+    public void deleteCustomEmailTemplate(
+            @PathParam("templateId") long id,
+            @QueryParam("tenantId") Long tenantId);
+    
+    
+
+    @GET
+    @Path("document-templates")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<DocumentTemplateLight> getDocumentTemplates(
+            @QueryParam("nameFilter") String nameFilter,
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size,
+            @QueryParam("sort") String sort,
+            @QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("document-templates")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<DocumentTemplateLight> getDocumentTemplates(
+            @QueryParam("nameFilter") String nameFilter,
+            @QueryParam("start") Integer start,
+            @QueryParam("size") Integer size,
+            @QueryParam("sort") TemplateSort sort,
+            @QueryParam("tenantId") Long tenantId);
+
+    default Response getDocumentTemplate(
+            DocumentTemplateLight template) {
+        return this.getDocumentTemplate(template.getId(), System.currentTimeMillis());
+    }
+
+    @GET
+    @Path("document-templates/{templateId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public DocumentTemplateLight getDocumentTemplate(
+            @PathParam("templateId") long id);
+
+    @GET
+    @Path("document-templates/{templateId}/file")
+    @Produces({
+        "application/msword",
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.template"
+    })
+    public Response getDocumentTemplate(
+            @PathParam("templateId") long id,
+            @QueryParam("version") long version);
+
+    @DELETE
+    @Path("document-templates/{templateId}")
+    public void deleteDocumentTemplate();
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java
@@ -0,0 +1,53 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti.api;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.DocumentTemplateLight;
+import com.inteligr8.alfresco.activiti.model.FileMultipartCxf;
+
+/**
+ * This is an undocumented API.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Path("/app/rest")
+public interface TemplatesCxfApi extends TemplatesApi {
+
+    @POST
+    @Path("admin/document-templates")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public DocumentTemplateLight createDocumentTemplate(
+            @QueryParam("tenantId") Long tenantId,
+            FileMultipartCxf file);
+
+    @POST
+    @Path("admin/document-templates/{templateId}")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public DocumentTemplateLight updateDocumentTemplate(
+            @PathParam("templateId") long id,
+            @QueryParam("tenantId") Long tenantId,
+            FileMultipartCxf file);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java
@@ -0,0 +1,53 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti.api;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.DocumentTemplateLight;
+import com.inteligr8.alfresco.activiti.model.FileMultipartJersey;
+
+/**
+ * This is an undocumented API.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Path("/app/rest")
+public interface TemplatesJerseyApi extends TemplatesApi {
+
+    @POST
+    @Path("admin/document-templates")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public DocumentTemplateLight createDocumentTemplate(
+            @QueryParam("tenantId") Long tenantId,
+            FileMultipartJersey file);
+
+    @POST
+    @Path("admin/document-templates/{templateId}")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public DocumentTemplateLight updateDocumentTemplate(
+            @PathParam("templateId") long id,
+            @QueryParam("tenantId") Long tenantId,
+            FileMultipartJersey file);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDeployment.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDeployment.java
@@ -0,0 +1,123 @@
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.time.OffsetDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.inteligr8.activiti.model.Datum;
+
+
+/**
+ * AppDeploymentRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "id",
+    "appDefinition",
+    "created",
+    "createdBy",
+    "deploymentId",
+    "dmnDeploymentId"
+})
+public class AppDeployment extends Datum {
+
+    @JsonProperty("id")
+    private long id;
+    @JsonProperty("appDefinition")
+    private AppDefinition appDefinition;
+    @JsonProperty("created")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
+    private OffsetDateTime created;
+    @JsonProperty("createdBy")
+    private UserLight createdBy;
+    @JsonProperty("deploymentId")
+    private String deploymentId;
+    @JsonProperty("dmnDeploymentId")
+    private Long dmnDeploymentId;
+    
+    public long getId() {
+        return id;
+    }
+    
+    public void setId(long id) {
+        this.id = id;
+    }
+    
+    public AppDeployment withId(long id) {
+        this.id = id;
+        return this;
+    }
+    
+    public AppDefinition getAppDefinition() {
+        return appDefinition;
+    }
+    
+    public void setAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+    }
+    
+    public AppDeployment withAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+        return this;
+    }
+    
+    public OffsetDateTime getCreated() {
+        return created;
+    }
+    
+    public void setCreated(OffsetDateTime created) {
+        this.created = created;
+    }
+    
+    public AppDeployment withCreated(OffsetDateTime created) {
+        this.created = created;
+        return this;
+    }
+    
+    public UserLight getCreatedBy() {
+        return createdBy;
+    }
+    
+    public void setCreatedBy(UserLight createdBy) {
+        this.createdBy = createdBy;
+    }
+    
+    public AppDeployment withCreatedBy(UserLight createdBy) {
+        this.createdBy = createdBy;
+        return this;
+    }
+    
+    public String getDeploymentId() {
+        return deploymentId;
+    }
+    
+    public void setDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+    }
+    
+    public AppDeployment withDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+        return this;
+    }
+    
+    public Long getDmnDeploymentId() {
+        return dmnDeploymentId;
+    }
+    
+    public void setDmnDeploymentId(Long dmnDeploymentId) {
+        this.dmnDeploymentId = dmnDeploymentId;
+    }
+    
+    public AppDeployment withDmnDeploymentId(Long dmnDeploymentId) {
+        this.dmnDeploymentId = dmnDeploymentId;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/BaseTemplateLight.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/BaseTemplateLight.java
@@ -0,0 +1,67 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.time.OffsetDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BaseTemplateLight {
+	
+	@JsonProperty
+	private Long id;
+	@JsonProperty(required = true)
+	private String name;
+    @JsonProperty
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+    private OffsetDateTime created;
+    @JsonProperty
+    private UserLight createdBy;
+    @JsonProperty
+    private Integer tenantId;
+    
+    public Long getId() {
+        return id;
+    }
+    
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public OffsetDateTime getCreated() {
+        return created;
+    }
+    
+    public void setCreated(OffsetDateTime created) {
+        this.created = created;
+    }
+    
+    public UserLight getCreatedBy() {
+        return createdBy;
+    }
+    
+    public void setCreatedBy(UserLight createdBy) {
+        this.createdBy = createdBy;
+    }
+    
+    public Integer getTenantId() {
+        return tenantId;
+    }
+    
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/CompleteForm.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/CompleteForm.java
@@ -0,0 +1,39 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "outcome"
+})
+public class CompleteForm {
+
+    @JsonProperty("outcome")
+    private String outcome;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public CompleteForm() {
+    }
+
+    public CompleteForm(String outcome) {
+        this.outcome = outcome;
+    }
+
+    public String getOutcome() {
+        return outcome;
+    }
+
+    public void setOutcome(String outcome) {
+        this.outcome = outcome;
+    }
+    
+    public CompleteForm withOutcome(String outcome) {
+        this.outcome = outcome;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/DocumentTemplateLight.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/DocumentTemplateLight.java
@@ -0,0 +1,42 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DocumentTemplateLight extends BaseTemplateLight {
+
+    @JsonProperty
+    private Integer modelId;
+	@JsonProperty
+	private String mimeType;
+    @JsonProperty
+    private String simpleType;
+    
+    public Integer getModelId() {
+        return modelId;
+    }
+    
+    public void setModelId(Integer modelId) {
+        this.modelId = modelId;
+    }
+    
+    public String getMimeType() {
+        return mimeType;
+    }
+    
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+    
+    public String getSimpleType() {
+        return simpleType;
+    }
+    
+    public void setSimpleType(String simpleType) {
+        this.simpleType = simpleType;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/EmailTemplate.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/EmailTemplate.java
@@ -0,0 +1,22 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EmailTemplate extends EmailTemplateLight {
+
+    @JsonProperty
+    private String template;
+    
+    public String getTemplate() {
+        return template;
+    }
+    
+    public void setTemplate(String template) {
+        this.template = template;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/EmailTemplateLight.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/EmailTemplateLight.java
@@ -0,0 +1,32 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EmailTemplateLight extends BaseTemplateLight {
+
+    @JsonProperty
+    private String systemTemplateId;
+	@JsonProperty
+	private String subject;
+    
+    public String getSystemTemplateId() {
+        return systemTemplateId;
+    }
+    
+    public void setSystemTemplateId(String systemTemplateId) {
+        this.systemTemplateId = systemTemplateId;
+    }
+	
+	public String getSubject() {
+        return subject;
+    }
+	
+	public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FormDefinition.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FormDefinition.java
@@ -0,0 +1,201 @@
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.Datum;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FormDefinition extends Datum {
+
+    @JsonProperty("className")
+    private String className;
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("processDefinitionId")
+    private String processDefinitionId;
+    @JsonProperty("processDefinitionKey")
+    private String processDefinitionKey;
+    @JsonProperty("processDefinitionName")
+    private String processDefinitionName;
+    @JsonProperty("outcomes")
+    private List<FormOutcome> outcomes = new ArrayList<>();
+    @JsonProperty("selectedOutcome")
+    private String selectedOutcome;
+    @JsonProperty("taskDefinitionKey")
+    private String taskDefinitionKey;
+    @JsonProperty("taskId")
+    private String taskId;
+    @JsonProperty("taskName")
+    private String taskName;
+    @JsonProperty("variables")
+    private List<FormVariable> variables = new ArrayList<>();
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public FormDefinition() {
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+	public FormDefinition withClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+	public FormDefinition withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+	public FormDefinition withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+	public FormDefinition withProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+        return this;
+    }
+
+    public String getProcessDefinitionKey() {
+        return processDefinitionKey;
+    }
+
+    public void setProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+	public FormDefinition withProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+        return this;
+    }
+
+    public String getProcessDefinitionName() {
+        return processDefinitionName;
+    }
+
+    public void setProcessDefinitionName(String processDefinitionName) {
+        this.processDefinitionName = processDefinitionName;
+    }
+
+	public FormDefinition withProcessDefinitionName(String processDefinitionName) {
+        this.processDefinitionName = processDefinitionName;
+        return this;
+    }
+
+    public List<FormOutcome> getOutcomes() {
+        return outcomes;
+    }
+
+    public void setOutcomes(List<FormOutcome> outcomes) {
+        this.outcomes = outcomes;
+    }
+
+	public FormDefinition withOutcomes(List<FormOutcome> outcomes) {
+        this.outcomes = outcomes;
+        return this;
+    }
+
+    public String getSelectedOutcome() {
+        return selectedOutcome;
+    }
+
+    public void setSelectedOutcome(String selectedOutcome) {
+        this.selectedOutcome = selectedOutcome;
+    }
+
+	public FormDefinition withSelectedOutcome(String selectedOutcome) {
+        this.selectedOutcome = selectedOutcome;
+        return this;
+    }
+
+    public String getTaskDefinitionKey() {
+        return taskDefinitionKey;
+    }
+
+    public void setTaskDefinitionKey(String taskDefinitionKey) {
+        this.taskDefinitionKey = taskDefinitionKey;
+    }
+
+	public FormDefinition withTaskDefinitionKey(String taskDefinitionKey) {
+        this.taskDefinitionKey = taskDefinitionKey;
+        return this;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+	public FormDefinition withTaskId(String taskId) {
+        this.taskId = taskId;
+        return this;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+	public FormDefinition withTaskName(String taskName) {
+        this.taskName = taskName;
+        return this;
+    }
+
+    public List<FormVariable> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(List<FormVariable> variables) {
+        this.variables = variables;
+    }
+
+	public FormDefinition withVariables(List<FormVariable> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FormOutcome.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FormOutcome.java
@@ -0,0 +1,56 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "id",
+    "name"
+})
+public class FormOutcome {
+
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public FormOutcome() {
+    }
+
+    public FormOutcome(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+    
+    public String getId() {
+        return id;
+    }
+    
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public FormOutcome withId(String id) {
+        this.id = id;
+        return this;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public FormOutcome withName(String name) {
+        this.name = name;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FormValue.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FormValue.java
@@ -0,0 +1,56 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "id",
+    "name"
+})
+public class FormValue {
+
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public FormValue() {
+    }
+
+    public FormValue(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+    
+    public String getId() {
+        return id;
+    }
+    
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public FormValue withId(String id) {
+        this.id = id;
+        return this;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public FormValue withName(String name) {
+        this.name = name;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FormVariable.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FormVariable.java
@@ -0,0 +1,73 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "type",
+    "value"
+})
+public class FormVariable {
+
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("type")
+    private String type;
+    @JsonProperty("value")
+    private Object value;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public FormVariable() {
+    }
+
+    public FormVariable(String name, String type, Object value) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public FormVariable withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public FormVariable withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public FormVariable withValue(Object value) {
+        this.value = value;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
@@ -45,10 +45,10 @@ public class HistoricProcessInstanceQueryRepresentation {
    @JsonProperty("finished")
    private Boolean finished;
    @JsonProperty("finishedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime finishedAfter;
    @JsonProperty("finishedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime finishedBefore;
    @JsonProperty("includeProcessVariables")
    private Boolean includeProcessVariables;
@@ -73,10 +73,10 @@ public class HistoricProcessInstanceQueryRepresentation {
    @JsonProperty("start")
    private Integer start;
    @JsonProperty("startedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime startedAfter;
    @JsonProperty("startedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime startedBefore;
    @JsonProperty("startedBy")
    private String startedBy;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java
@@ -99,33 +99,33 @@ public class HistoricTaskQueryRepresentation {
    @JsonProperty("taskCandidateGroup")
    private String taskCandidateGroup;
    @JsonProperty("taskCreatedOn")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCreated;
    @JsonProperty("taskCreatedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCreatedBefore;
    @JsonProperty("taskCreatedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCreatedAfter;
    @JsonProperty("dueDate")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueDate;
    @JsonProperty("dueDateBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueDateBefore;
    @JsonProperty("dueDateAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueDateAfter;
    @JsonProperty("withoutDueDate")
    private Boolean withoutDueDate;
    @JsonProperty("taskCompletedOn")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCompleted;
    @JsonProperty("taskCompletedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCompletedBefore;
    @JsonProperty("taskCompletedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime taskCompletedAfter;
    @JsonProperty("taskDeleteReason")
    private String taskDeleteReason;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java
@@ -1,10 +1,13 @@

 package com.inteligr8.alfresco.activiti.model;

+import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -42,7 +45,7 @@ public class ModelRepresentation {
    @JsonProperty("comment")
    private String comment;
    @JsonProperty("createdBy")
-    private Integer createdBy;
+    private Long createdBy;
    @JsonProperty("createdByFullName")
    private String createdByFullName;
    @JsonProperty("description")
@@ -50,11 +53,12 @@ public class ModelRepresentation {
    @JsonProperty("favorite")
    private Boolean favorite;
    @JsonProperty("id")
-    private Integer id;
+    private Long id;
    @JsonProperty("lastUpdated")
-    private String lastUpdated;
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
+    private OffsetDateTime lastUpdated;
    @JsonProperty("lastUpdatedBy")
-    private Integer lastUpdatedBy;
+    private Long lastUpdatedBy;
    @JsonProperty("lastUpdatedByFullName")
    private String lastUpdatedByFullName;
    @JsonProperty("latestVersion")
@@ -66,11 +70,11 @@ public class ModelRepresentation {
    @JsonProperty("permission")
    private String permission;
    @JsonProperty("referenceId")
-    private Integer referenceId;
+    private Long referenceId;
    @JsonProperty("stencilSet")
-    private Integer stencilSet;
+    private Long stencilSet;
    @JsonProperty("tenantId")
-    private Integer tenantId;
+    private Long tenantId;
    @JsonProperty("version")
    private Integer version;
    @JsonIgnore
@@ -92,16 +96,16 @@ public class ModelRepresentation {
    }

    @JsonProperty("createdBy")
-    public Integer getCreatedBy() {
+    public Long getCreatedBy() {
        return createdBy;
    }

    @JsonProperty("createdBy")
-    public void setCreatedBy(Integer createdBy) {
+    public void setCreatedBy(Long createdBy) {
        this.createdBy = createdBy;
    }

-    public ModelRepresentation withCreatedBy(Integer createdBy) {
+    public ModelRepresentation withCreatedBy(Long createdBy) {
        this.createdBy = createdBy;
        return this;
    }
@@ -152,46 +156,46 @@ public class ModelRepresentation {
    }

    @JsonProperty("id")
-    public Integer getId() {
+    public Long getId() {
        return id;
    }

    @JsonProperty("id")
-    public void setId(Integer id) {
+    public void setId(Long id) {
        this.id = id;
    }

-    public ModelRepresentation withId(Integer id) {
+    public ModelRepresentation withId(Long id) {
        this.id = id;
        return this;
    }

    @JsonProperty("lastUpdated")
-    public String getLastUpdated() {
+    public OffsetDateTime getLastUpdated() {
        return lastUpdated;
    }

    @JsonProperty("lastUpdated")
-    public void setLastUpdated(String lastUpdated) {
+    public void setLastUpdated(OffsetDateTime lastUpdated) {
        this.lastUpdated = lastUpdated;
    }

-    public ModelRepresentation withLastUpdated(String lastUpdated) {
+    public ModelRepresentation withLastUpdated(OffsetDateTime lastUpdated) {
        this.lastUpdated = lastUpdated;
        return this;
    }

    @JsonProperty("lastUpdatedBy")
-    public Integer getLastUpdatedBy() {
+    public Long getLastUpdatedBy() {
        return lastUpdatedBy;
    }

    @JsonProperty("lastUpdatedBy")
-    public void setLastUpdatedBy(Integer lastUpdatedBy) {
+    public void setLastUpdatedBy(Long lastUpdatedBy) {
        this.lastUpdatedBy = lastUpdatedBy;
    }

-    public ModelRepresentation withLastUpdatedBy(Integer lastUpdatedBy) {
+    public ModelRepresentation withLastUpdatedBy(Long lastUpdatedBy) {
        this.lastUpdatedBy = lastUpdatedBy;
        return this;
    }
@@ -272,46 +276,46 @@ public class ModelRepresentation {
    }

    @JsonProperty("referenceId")
-    public Integer getReferenceId() {
+    public Long getReferenceId() {
        return referenceId;
    }

    @JsonProperty("referenceId")
-    public void setReferenceId(Integer referenceId) {
+    public void setReferenceId(Long referenceId) {
        this.referenceId = referenceId;
    }

-    public ModelRepresentation withReferenceId(Integer referenceId) {
+    public ModelRepresentation withReferenceId(Long referenceId) {
        this.referenceId = referenceId;
        return this;
    }

    @JsonProperty("stencilSet")
-    public Integer getStencilSet() {
+    public Long getStencilSet() {
        return stencilSet;
    }

    @JsonProperty("stencilSet")
-    public void setStencilSet(Integer stencilSet) {
+    public void setStencilSet(Long stencilSet) {
        this.stencilSet = stencilSet;
    }

-    public ModelRepresentation withStencilSet(Integer stencilSet) {
+    public ModelRepresentation withStencilSet(Long stencilSet) {
        this.stencilSet = stencilSet;
        return this;
    }

    @JsonProperty("tenantId")
-    public Integer getTenantId() {
+    public Long getTenantId() {
        return tenantId;
    }

    @JsonProperty("tenantId")
-    public void setTenantId(Integer tenantId) {
+    public void setTenantId(Long tenantId) {
        this.tenantId = tenantId;
    }

-    public ModelRepresentation withTenantId(Integer tenantId) {
+    public ModelRepresentation withTenantId(Long tenantId) {
        this.tenantId = tenantId;
        return this;
    }
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
@@ -39,7 +39,7 @@ public class ProcessInstance extends Datum {
    @JsonProperty("businessKey")
    private String businessKey;
    @JsonProperty("ended")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime ended;
    @JsonProperty("graphicalNotationDefined")
    private Boolean graphicalNotationDefined;
@@ -64,7 +64,7 @@ public class ProcessInstance extends Datum {
    @JsonProperty("startFormDefined")
    private Boolean startFormDefined;
    @JsonProperty("started")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime started;
    @JsonProperty("startedBy")
    private UserLight startedBy;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java
@@ -56,18 +56,18 @@ public class Task extends Datum {
    @JsonProperty("category")
    private String category;
    @JsonProperty("created")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime created;
    @JsonProperty("description")
    private String description;
    @JsonProperty("dueDate")
    private OffsetDateTime dueDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    @JsonProperty("duration")
    private Long duration;
    @JsonProperty("endDate")
    private OffsetDateTime endDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    @JsonProperty("executionId")
    private String executionId;
    @JsonProperty("formKey")
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java
@@ -39,10 +39,10 @@ public class TaskFilter extends Datum {
    @JsonProperty("assignment")
    private String assignment;
    @JsonProperty("dueBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueBefore;
    @JsonProperty("dueAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueAfter;
    @JsonProperty("processDefinitionId")
    private String processDefinitionId;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java
@@ -54,10 +54,10 @@ public class TaskQueryRepresentation {
    @JsonProperty("text")
    private String text;
    @JsonProperty("dueBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueBefore;
    @JsonProperty("dueAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueAfter;
    @JsonProperty("taskId")
    private String taskId;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java
@@ -37,7 +37,7 @@ public class TaskUpdate {
    @JsonProperty("descriptionSet")
    private Boolean descriptionSet;
    @JsonProperty("dueDate")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
    private OffsetDateTime dueDate;
    @JsonProperty("dueDateSet")
    private Boolean dueDateSet;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/Variable.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Variable.java
@@ -1,25 +1,9 @@
 package com.inteligr8.alfresco.activiti.model;

 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "type",
-    "value"
-})
-public class Variable {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("scope")
-    private String scope;
-    @JsonProperty("type")
-    private String type;
-    @JsonProperty("value")
-    private Object value;
+public class Variable extends com.inteligr8.activiti.model.Variable {

    /**
     * No args constructor for use in serialization
@@ -28,62 +12,7 @@ public class Variable {
    }

    public Variable(String name, String scope, String type, Object value) {
-        this.name = name;
-        this.scope = scope;
-        this.type = type;
-        this.value = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Variable withName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    public void setScope(String scope) {
-        this.scope = scope;
-    }
-
-    public Variable withScope(String scope) {
-        this.scope = scope;
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Variable withType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-    public Variable withValue(Object value) {
-        this.value = value;
-        return this;
+        super(name, scope, type, value);
    }
    
 }
Author	SHA1	Message	Date
Brian M. Long	ad8712fa54	v3.0.1 pom	2024-09-23 15:14:25 -04:00
Brian M. Long	e354c5be2f	Merge branch 'develop' into stable	2024-09-23 15:12:16 -04:00
Brian M. Long	9019889239	added ProcessDefinitionApi	2024-09-23 15:11:34 -04:00
Brian M. Long	8d993b68be	rename Action to ProcessInstanceAction	2024-09-23 15:11:27 -04:00
Brian M. Long	a146654ea9	Merge branch 'develop' into stable	2024-08-15 12:26:21 -04:00
Brian M. Long	962ef8f98c	v3.x; upgrade to jakarta	2024-08-15 12:25:28 -04:00
Brian M. Long	44d87548bf	v2.0.17 pom	2023-11-16 11:38:52 -05:00
Brian M. Long	775498670e	Merge branch 'develop' into stable	2023-11-16 11:38:33 -05:00
Brian Long	c0916958f0	added @Consumes multipart/form-data for TemplatesApi	2023-11-16 11:34:53 -05:00
Brian M. Long	9ba16c4b3b	v2.0.16 pom	2023-11-16 09:25:24 -05:00
Brian M. Long	8937539a77	Merge branch 'develop' into stable	2023-11-16 09:21:57 -05:00
Brian Long	09aabea4e3	int$64 is long	2023-11-16 09:20:22 -05:00
Brian M. Long	b359502c86	v2.0.15 pom	2023-11-15 20:27:38 -05:00
Brian Long	93c593bb41	added ModelsApi get	2023-11-15 20:16:10 -05:00
Brian M. Long	3e3cb195b3	Merge branch 'develop' into stable	2023-11-15 20:00:00 -05:00
Brian Long	715bf6fd1e	template API func fixes	2023-11-15 19:58:30 -05:00
Brian M. Long	d1cf12e950	added template sort-by enum	2023-11-15 18:12:17 -05:00
Brian M. Long	6dff96f35f	v2.0.14 pom	2023-11-15 16:30:13 -05:00
Brian M. Long	09d6f5b885	Merge branch 'develop' into stable	2023-11-15 16:25:43 -05:00
Brian M. Long	c716057a24	several fixes after developing more	2023-11-15 16:25:34 -05:00
Brian M. Long	ce6e4752df	added template API	2023-11-15 13:50:52 -05:00
Brian M. Long	bf779a8d18	v2.0.13 pom	2023-11-13 17:35:23 -05:00
Brian M. Long	6e0e1eaa1c	Merge branch 'develop' into stable	2023-11-13 17:35:08 -05:00
Brian M. Long	17515d4be3	refactor JobsApi	2023-11-13 17:34:59 -05:00
Brian M. Long	b146e1d55a	added api accessors	2023-11-13 17:15:08 -05:00
Brian M. Long	f4183d7897	v2.0.12 pom	2023-11-13 17:14:08 -05:00
Brian M. Long	cced7e76e4	Merge branch 'develop' into stable	2023-11-13 17:08:53 -05:00
Brian M. Long	14a2f74a60	added ProcessInstanceApi and ExecutionApi	2023-11-13 17:08:16 -05:00
Brian M. Long	550a01278a	v2.0.11 pom	2023-06-01 10:25:17 -04:00
Brian M. Long	39abfcfc22	Merge branch 'develop' into stable	2023-06-01 10:24:56 -04:00
Brian M. Long	24ad70c25c	added some key task-form API endpoints	2023-06-01 10:24:40 -04:00
Brian M. Long	31b1823b76	v2.0.10 pom	2023-05-30 13:28:28 -04:00
Brian M. Long	20a9504301	Merge branch 'develop' into stable	2023-05-30 13:28:00 -04:00
Brian M. Long	117e946460	fix APS timezone format	2023-05-30 13:27:52 -04:00
Brian M. Long	b4b57b7594	v2.0.10 pom	2023-05-30 12:46:54 -04:00
Brian M. Long	6067a2e551	Merge branch 'develop' into stable	2023-05-30 12:46:36 -04:00
Brian M. Long	cdeb325e74	fixed date/time format	2023-05-30 12:46:22 -04:00