Merge branch 'develop' into stable

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>2.0.12</version>
+	<version>3.0.0</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>

src/main/java/com/inteligr8/activiti/ActivitiPublicRestApi.java

@@ -14,7 +14,13 @@
  */
 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.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 +36,28 @@ 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 ProcessInstanceApi getProcessInstanceApi() {
+        return this.getApi(ProcessInstanceApi.class);
+    }
+    
+    default ExecutionApi getExecutionApi() {
+        return this.getApi(ExecutionApi.class);
+    }
+    
 }

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.Action;
+import com.inteligr8.activiti.model.Action.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,
+        Action execute);
+
+    default void executeJob(
+        String jobId,
+        ActionValue action) {
+        this.executeJob(jobId, new Action(action));
+    }
+
+    default void executeJob(
+        String jobId) {
+        this.executeJob(jobId, new Action(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);
+
+}

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 {
+}

src/main/java/com/inteligr8/activiti/api/ExecutionApi.java

@@ -16,15 +16,15 @@ package com.inteligr8.activiti.api;
 
 import java.util.List;
 
-import javax.ws.rs.Consumes;
-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 javax.ws.rs.core.MediaType;
+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.Action;
@@ -163,7 +163,7 @@ public interface ExecutionApi {
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
-    public ResultList<Execution> getByAny(
+    ResultList<Execution> getByAny(
             @QueryParam("id") String executionId,
             @QueryParam("activityId") String activityId,
             @QueryParam("processDefinitionKey") String processDefinitionKey,

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 {
+}

src/main/java/com/inteligr8/activiti/api/ManagementApi.java

@@ -14,25 +14,13 @@
  */
 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 javax.ws.rs.core.MediaType;
-
-import com.inteligr8.activiti.model.Action;
-import com.inteligr8.activiti.model.Action.ActionValue;
 import com.inteligr8.activiti.model.Engine;
 import com.inteligr8.activiti.model.EngineProperties;
-import com.inteligr8.activiti.model.Job;
-import com.inteligr8.activiti.model.ResultList;
 
 @Path("/api/management")
 public interface ManagementApi {
@@ -46,146 +34,5 @@ public interface ManagementApi {
     @Path("properties")
     @Produces({ MediaType.APPLICATION_JSON })
     public EngineProperties getEngineProperties();
-    
-    
-    
-    @Path("jobs")
-    public interface JobsApiImpl extends JobsApi {}
-    
-    @Path("timer-jobs")
-    public interface TimerJobsApiImpl extends JobsApi {}
-    
-    @Path("deadletter-jobs")
-    public interface DeadletterJobsApiImpl extends JobsApi {}
-    
-    public interface JobsApi {
-        
-        @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,
-                Action execute);
-        
-        default void executeJob(
-                String jobId,
-                ActionValue action) {
-            this.executeJob(jobId, new Action(action));
-        }
-        
-        default void executeJob(
-                String jobId) {
-            this.executeJob(jobId, new Action(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);
-        
-    }
 
 }

src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java

@@ -17,16 +17,16 @@ package com.inteligr8.activiti.api;
 import java.io.File;
 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 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.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.inteligr8.activiti.model.Action;

src/main/java/com/inteligr8/activiti/api/RuntimeApi.java

@@ -16,10 +16,10 @@ package com.inteligr8.activiti.api;
 
 import java.util.List;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-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.core.MediaType;
 
 import com.inteligr8.activiti.model.Variable;
 

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 {
+}

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
@@ -75,4 +76,8 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(ShareApi.class);
 	}
 
+    default TemplatesApi getTemplatesApi() {
+        return this.getApi(TemplatesApi.class);
+    }
+
 }

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);
+	}
 
 }

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);
+    }
 
 }

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;

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;

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;

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;

src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java

@@ -14,13 +14,13 @@
  */
 package com.inteligr8.alfresco.activiti.api;
 
-import javax.ws.rs.DELETE;
-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 javax.ws.rs.core.MediaType;
+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;

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;
 

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;

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;

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,

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;

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;

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;
 

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;

src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.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.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.CompleteForm;

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();
+
+}

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);
+
+}

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);
+
+}

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;
+    }
+
+}

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;
+    }
+
+}

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;
+    }
+
+}

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;
+    }
+
+}

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;
     }

src/main/java/com/inteligr8/alfresco/activiti/model/Variable.java

@@ -4,5 +4,15 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Variable extends com.inteligr8.activiti.model.Variable {
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public Variable() {
+    }
+
+    public Variable(String name, String scope, String type, Object value) {
+        super(name, scope, type, value);
+    }
     
 }