v2.0.10 pom

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>3.0-SNAPSHOT</version>
+	<version>2.0.10</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,30 +38,24 @@
 
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.target>8</maven.compiler.target>
-		<maven.compiler.release>11</maven.compiler.release>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 		
-		<jersey.version>3.1.10</jersey.version>
+		<jersey.version>2.39.1</jersey.version>
-		<cxf.version>4.1.0</cxf.version>
+		<cxf.version>3.5.6</cxf.version>
-		<jackson.version>2.18.1</jackson.version>
+		<jackson.version>2.15.1</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>3.1.0</version>
+			<version>2.1.6</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>
-			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
@@ -127,7 +121,7 @@
 					<plugin>
 						<groupId>com.inteligr8</groupId>
 						<artifactId>regex-maven-plugin</artifactId>
-						<version>1.0.5</version>
+						<version>1.0.2</version>
 						<executions>
 							<execution>
 								<id>fix-displayName</id>

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

@@ -14,14 +14,7 @@
  */
 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
@@ -37,32 +30,4 @@ 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);
-    }
-    
 }

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

@@ -1,170 +0,0 @@
-/*
- * 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 com.inteligr8.activiti.model.Job;
-import com.inteligr8.activiti.model.ProcessInstanceAction;
-import com.inteligr8.activiti.model.ResultList;
-import com.inteligr8.activiti.model.SortOrder;
-
-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;
-
-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);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-    @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,
-        @QueryParam("order") SortOrder sortOrder,
-        @QueryParam("start") Integer pageStart,
-        @QueryParam("size") Integer pageSize);
-
-}

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

@@ -1,21 +0,0 @@
-/*
- * 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

@@ -1,166 +0,0 @@
-/*
- * 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 com.fasterxml.jackson.annotation.JsonProperty;
-import com.inteligr8.activiti.model.Execution;
-import com.inteligr8.activiti.model.ProcessInstanceAction;
-import com.inteligr8.activiti.model.ResultList;
-import com.inteligr8.activiti.model.SortOrder;
-import com.inteligr8.activiti.model.Variable;
-
-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;
-
-@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);
-
-    @PUT
-    @Path("{executionId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_JSON })
-    Execution execute(
-            @PathParam("executionId") String executionId,
-            ProcessInstanceAction action);
-
-    @GET
-    @Produces({ MediaType.APPLICATION_JSON })
-    ResultList<Execution> getByTenant(
-            @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("sort") Sort sort,
-            @QueryParam("order") SortOrder sortOrder,
-            @QueryParam("start") Integer pageStart,
-            @QueryParam("size") Integer pageSize);
-
-    @GET
-    @Produces({ MediaType.APPLICATION_JSON })
-    ResultList<Execution> getByTenants(
-            @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("tenantIdLike") String tenantIdLike,
-            @QueryParam("sort") Sort sort,
-            @QueryParam("order") SortOrder sortOrder,
-            @QueryParam("start") Integer pageStart,
-            @QueryParam("size") Integer 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);
-    
-    @PUT
-    @Path("{executionId}/variables/{variableName}")
-    @Consumes({ MediaType.APPLICATION_JSON })
-    void updateVariable(
-            @PathParam("executionId") String executionId,
-            @PathParam("variableName") String variableName,
-            Variable variable); 
-
-}

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

@@ -1,21 +0,0 @@
-/*
- * 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,160 @@
  */
 package com.inteligr8.activiti.api;
 
-import jakarta.ws.rs.GET;
+import java.io.File;
-import jakarta.ws.rs.Path;
+import java.time.LocalDate;
-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({ MediaType.APPLICATION_JSON })
+    @Produces({ "application/json" })
     public Engine getEngine();
 
     @GET
     @Path("properties")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({ "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);
+    }
+
 }

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

@@ -1,72 +0,0 @@
-/*
- * 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.ProcessDefinition;
-import com.inteligr8.activiti.model.ProcessDefinitionAction;
-import com.inteligr8.activiti.model.ResultList;
-import com.inteligr8.activiti.model.SortOrder;
-
-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);
-
-    @PUT
-    @Path("{processDefinitionId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
-    void act(
-            @PathParam("processDefinitionId") String processDefinitionId,
-            ProcessDefinitionAction action);
-
-    @GET
-    @Produces({ MediaType.APPLICATION_JSON })
-    public ResultList<ProcessDefinition> 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);
-
-}

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

@@ -1,170 +0,0 @@
-/*
- * 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 com.fasterxml.jackson.annotation.JsonProperty;
-import com.inteligr8.activiti.model.ProcessInstanceAction;
-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;
-
-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;
-
-@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);
-
-    @PUT
-    @Path("{processInstanceId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
-    void act(
-            @PathParam("processInstanceId") String processInstanceId,
-            ProcessInstanceAction action);
-
-    @GET
-    @Produces({ MediaType.APPLICATION_JSON })
-    public ResultList<ProcessInstance> getByTenant(
-            @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("sort") Sort sort,
-            @QueryParam("order") SortOrder sortOrder,
-            @QueryParam("start") Integer pageStart,
-            @QueryParam("size") Integer pageSize);
-
-    @GET
-    @Produces({ MediaType.APPLICATION_JSON })
-    public ResultList<ProcessInstance> getByTenants(
-            @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("tenantIdLike") String tenantIdLike,
-            @QueryParam("sort") Sort sort,
-            @QueryParam("order") SortOrder sortOrder,
-            @QueryParam("start") Integer pageStart,
-            @QueryParam("size") Integer 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);
-    
-    @PUT
-    @Path("{processInstanceId}/variables/{variableName}")
-    @Consumes({ MediaType.APPLICATION_JSON })
-    void updateVariable(
-            @PathParam("processInstanceId") String processInstanceId,
-            @PathParam("variableName") String variableName,
-            Variable variable); 
-
-}

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

@@ -1,38 +0,0 @@
-/*
- * 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);
-
-}

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

@@ -1,21 +0,0 @@
-/*
- * 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/activiti/model/ExecuteAction.java

@@ -0,0 +1,40 @@
+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;
+    }
+
+}

src/main/java/com/inteligr8/activiti/model/Execution.java

@@ -1,182 +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 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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/MessageEventAction.java

@@ -1,37 +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 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;
-    }
-    
-
-}

src/main/java/com/inteligr8/activiti/model/ProcessDefinition.java

@@ -1,243 +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 ProcessDefinition extends Datum {
-
-    @JsonProperty("category")
-    private String category;
-    @JsonProperty("deploymentId")
-    private String deploymentId;
-    @JsonProperty("deploymentUrl")
-    private String deploymentUrl;
-    @JsonProperty("diagramResource")
-    private String diagramResource;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("graphicalNotationDefined")
-    private boolean graphicalNotationDefined;
-    @JsonProperty("id")
-    private String id;
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonProperty("startFormDefined")
-    private boolean startFormDefined;
-    @JsonProperty("suspended")
-    private boolean suspended;
-    @JsonProperty("tenantId")
-    private String tenantId;
-    @JsonProperty("url")
-    private String url;
-    @JsonProperty("version")
-    private Integer version;
-
-    /**
-     * No args constructor for use in serialization
-     */
-    public ProcessDefinition() {
-    }
-    
-    public String getCategory() {
-        return category;
-    }
-    
-    public void setCategory(String category) {
-        this.category = category;
-    }
-    
-    public ProcessDefinition withCategory(String category) {
-        this.category = category;
-        return this;
-    }
-    
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-    
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-    
-    public ProcessDefinition withDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-        return this;
-    }
-    
-    public String getDeploymentUrl() {
-        return deploymentUrl;
-    }
-    
-    public void setDeploymentUrl(String deploymentUrl) {
-        this.deploymentUrl = deploymentUrl;
-    }
-    
-    public ProcessDefinition withDeploymentUrl(String deploymentUrl) {
-        this.deploymentUrl = deploymentUrl;
-        return this;
-    }
-    
-    public String getDescription() {
-        return description;
-    }
-    
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    
-    public ProcessDefinition withDescription(String description) {
-        this.description = description;
-        return this;
-    }
-    
-    public String getDiagramResource() {
-        return diagramResource;
-    }
-    
-    public void setDiagramResource(String diagramResource) {
-        this.diagramResource = diagramResource;
-    }
-    
-    public ProcessDefinition withDiagramResource(String diagramResource) {
-        this.diagramResource = diagramResource;
-        return this;
-    }
-    
-    public boolean isGraphicalNotationDefined() {
-        return graphicalNotationDefined;
-    }
-    
-    public void setGraphicalNotationDefined(boolean graphicalNotationDefined) {
-        this.graphicalNotationDefined = graphicalNotationDefined;
-    }
-    
-    public ProcessDefinition withGraphicalNotationDefined(boolean graphicalNotationDefined) {
-        this.graphicalNotationDefined = graphicalNotationDefined;
-        return this;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public ProcessDefinition withId(String id) {
-        this.id = id;
-        return this;
-    }
-    
-    public String getKey() {
-        return key;
-    }
-    
-    public void setKey(String key) {
-        this.key = key;
-    }
-    
-    public ProcessDefinition withKey(String key) {
-        this.key = key;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ProcessDefinition withName(String name) {
-        this.name = name;
-        return this;
-    }
-    
-    public String getResource() {
-        return resource;
-    }
-    
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-    
-    public ProcessDefinition withResource(String resource) {
-        this.resource = resource;
-        return this;
-    }
-    
-    public boolean isStartFormDefined() {
-        return startFormDefined;
-    }
-    
-    public void setStartFormDefined(boolean startFormDefined) {
-        this.startFormDefined = startFormDefined;
-    }
-    
-    public ProcessDefinition withStartFormDefined(boolean startFormDefined) {
-        this.startFormDefined = startFormDefined;
-        return this;
-    }
-    
-    public boolean isSuspended() {
-        return suspended;
-    }
-    
-    public void setSuspended(boolean suspended) {
-        this.suspended = suspended;
-    }
-    
-    public ProcessDefinition withSuspended(boolean suspended) {
-        this.suspended = suspended;
-        return this;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public ProcessDefinition withTenantId(String tenantId) {
-        this.tenantId = tenantId;
-        return this;
-    }
-    
-    public String getUrl() {
-        return url;
-    }
-    
-    public void setUrl(String url) {
-        this.url = url;
-    }
-    
-    public ProcessDefinition withUrl(String url) {
-        this.url = url;
-        return this;
-    }
-    
-    public Integer getVersion() {
-        return version;
-    }
-    
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public ProcessDefinition withVersion(Integer version) {
-        this.version = version;
-        return this;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/ProcessDefinitionAction.java

@@ -1,89 +0,0 @@
-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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/ProcessInstance.java

@@ -1,202 +0,0 @@
-
-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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java

@@ -1,67 +0,0 @@
-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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/SignalEvent.java

@@ -1,84 +0,0 @@
-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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/SignalEventAction.java

@@ -1,36 +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 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;
-    }
-
-}

src/main/java/com/inteligr8/activiti/model/SortOrder.java

@@ -1,12 +0,0 @@
-package com.inteligr8.activiti.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public enum SortOrder {
-    
-    @JsonProperty("asc")
-    Ascending,
-    @JsonProperty("desc")
-    Descending
-
-}

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

@@ -1,90 +0,0 @@
-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;
-    }
-    
-}

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApi.java

@@ -1,36 +0,0 @@
-/*
- * 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;
-
-import com.inteligr8.alfresco.activiti.api.ShareApi;
-import com.inteligr8.alfresco.activiti.api.TemplatesApi;
-
-/**
- * This interface consolidates the JAX-RS APIs available in the Activiti & APS
- * public ReST APIs, plus some useful non-public APIs available in APS.
- * 
- * @author brian@inteligr8.com
- */
-public interface ApsProtectedRestApi extends ApsPublicRestApi {
-	
-	default ShareApi getShareApi() {
-		return this.getApi(ShareApi.class);
-	}
-
-    default TemplatesApi getTemplatesApi() {
-        return this.getApi(TemplatesApi.class);
-    }
-
-}

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestCxfApi.java

@@ -1,12 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-/**
- * This interface appends CXF implementation specific methods to the JAX-RS API
- * of the APS Protected ReST API.  This is due to a lack of multi-part in the
- * JAX-RS specification.
- * 
- * @author brian@inteligr8.com
- */
-public interface ApsProtectedRestCxfApi extends ApsProtectedRestApi, ApsPublicRestCxfApi {
-
-}

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestJerseyApi.java

@@ -1,12 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-/**
- * This interface appends Jersey implementation specific methods to the JAX-RS
- * API of the APS Protected ReST API.  This is due to a lack of multi-part in
- * the JAX-RS specification.
- * 
- * @author brian@inteligr8.com
- */
-public interface ApsProtectedRestJerseyApi extends ApsProtectedRestApi, ApsPublicRestJerseyApi {
-
-}

src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java

@@ -17,31 +17,28 @@ package com.inteligr8.alfresco.activiti;
 import com.inteligr8.activiti.ActivitiPublicRestApi;
 import com.inteligr8.alfresco.activiti.api.AdminApi;
 import com.inteligr8.alfresco.activiti.api.AppDefinitionsApi;
-import com.inteligr8.alfresco.activiti.api.AppDeploymentsApi;
 import com.inteligr8.alfresco.activiti.api.AppVersionApi;
 import com.inteligr8.alfresco.activiti.api.HistoricApi;
 import com.inteligr8.alfresco.activiti.api.ModelsApi;
-import com.inteligr8.alfresco.activiti.api.ProcessDefinitionsApi;
 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;
 
 /**
- * This interface consolidates the JAX-RS APIs available in the Activiti & APS
+ * This interface consolidates the JAX-RS APIs available in the APS Public
- * public ReST APIs.
+ * ReST API.
  * 
  * @author brian@inteligr8.com
  */
 public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 	
+	<T> T getApi(Class<T> apiClass);
+	
 	default AdminApi getAdminApi() {
 		return this.getApi(AdminApi.class);
 	}
 	
-    default AppDeploymentsApi getAppDeploymentsApi() {
-        return this.getApi(AppDeploymentsApi.class);
-    }
-	
 	default AppDefinitionsApi getAppDefinitionsApi() {
 		return this.getApi(AppDefinitionsApi.class);
 	}
@@ -58,10 +55,6 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(ModelsApi.class);
 	}
 	
-    default ProcessDefinitionsApi getProcessDefinitionsApi() {
-        return this.getApi(ProcessDefinitionsApi.class);
-    }
-	
 	default ProcessInstancesApi getProcessInstancesApi() {
 		return this.getApi(ProcessInstancesApi.class);
 	}
@@ -74,4 +67,12 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(TasksApi.class);
 	}
 	
+	
+	/**
+	 * The following are not part of the official open source or enterprise APIs
+	 */
+	default ShareApi getShareApi() {
+		return this.getApi(ShareApi.class);
+	}
+
 }

src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java

@@ -1,7 +1,6 @@
 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
@@ -16,8 +15,4 @@ public interface ApsPublicRestCxfApi extends ApsPublicRestApi {
 		return this.getApi(AppDefinitionsCxfApi.class);
 	}
 
-	default TemplatesCxfApi getTemplatesCxfApi() {
-	    return this.getApi(TemplatesCxfApi.class);
-	}
-
 }

src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java

@@ -1,7 +1,6 @@
 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
@@ -16,8 +15,4 @@ public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {
 		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 jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
+import javax.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
+import javax.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,38 +16,32 @@ package com.inteligr8.alfresco.activiti.api;
 
 import java.io.File;
 
-import com.inteligr8.activiti.model.ResultList;
+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 com.inteligr8.alfresco.activiti.model.AppDefinitionPublishRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionSaveRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
 
-import jakarta.ws.rs.Consumes;
+@Path("/api/enterprise/app-definitions")
-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;
-
-@Path("/api/enterprise")
 public interface AppDefinitionsApi {
 
     @GET
-    @Path("runtime-app-definitions")
+    @Path("{modelId}")
-    @Produces({ MediaType.APPLICATION_JSON })
-    ResultList<AppDefinitionRepresentation> get();
-
-    @GET
-    @Path("app-definitions/{modelId}")
     @Produces({ MediaType.APPLICATION_JSON })
     AppDefinitionRepresentation get(
     		@PathParam("modelId") Long appId);
 
     @PUT
-    @Path("app-definitions/{modelId}")
+    @Path("{modelId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     AppDefinitionUpdateResultRepresentation update(
@@ -55,29 +49,22 @@ public interface AppDefinitionsApi {
     		AppDefinitionSaveRepresentation updatedModel);
 
     @DELETE
-    @Path("app-definitions/{appDefinitionId}")
+    @Path("{appDefinitionId}")
     void delete(
     		@PathParam("appDefinitionId") Long appId);
 
     @GET
-    @Path("app-definitions/{modelId}/export")
+    @Path("{modelId}/export")
     @Produces({ MediaType.APPLICATION_JSON, "application/zip" })
     File export(
     		@PathParam("modelId") Long appId);
 
-//    @POST
-//    @Path("runtime-app-definitions")
-//    @Consumes({ MediaType.APPLICATION_JSON })
-//    @Produces({ MediaType.APPLICATION_JSON })
-//    void publish(
-//    		AppDefinitionsRepresentation publishModel);
-
     @POST
-    @Path("app-definitions/{modelId}/publish")
+    @Path("{modelId}/publish")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     AppDefinitionUpdateResultRepresentation publish(
-            @PathParam("modelId") Long appId,
+    		@PathParam("modelId") Long appId,
-            AppDefinitionPublishRepresentation publishModel);
+    		AppDefinitionPublishRepresentation publishModel);
 
 }

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

@@ -1,13 +1,13 @@
 
 package com.inteligr8.alfresco.activiti.api;
 
-import jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
+import javax.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 jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
+import javax.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

@@ -1,61 +0,0 @@
-/*
- * 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({ MediaType.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") Long tenantId,
-            @QueryParam("latest") Boolean latest,
-            @QueryParam("start") Integer start,
-            @QueryParam("sort") String sort,
-            @QueryParam("order") String order,
-            @QueryParam("size") Integer size);
-
-}

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

@@ -14,9 +14,9 @@
  */
 package com.inteligr8.alfresco.activiti.api;
 
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.Produces;
+import javax.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 jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.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 jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.Produces;
+import javax.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,14 +14,12 @@
  */
 package com.inteligr8.alfresco.activiti.api;
 
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
-import jakarta.ws.rs.QueryParam;
 
-import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
-import com.inteligr8.alfresco.activiti.model.ModelRepresentation;
 
 @Path("/api/enterprise/models")
 public interface ModelsApi {
@@ -29,9 +27,7 @@ public interface ModelsApi {
 	enum ModelType {
 		Process(0),
 		Form(2),
-		App(3),
+		App(3);
-		DecisionTable(4),
-		DataModel(5);
 		
 		private int id;
 		private ModelType(int id) {
@@ -44,14 +40,8 @@ public interface ModelsApi {
 	}
 
     @GET
-	@Path("{id}")
     @Produces({ "application/json" })
-    public ModelRepresentation get(
+    public ResultListDataRepresentation 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 jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.ws.rs.QueryParam;
 
 import com.inteligr8.alfresco.activiti.model.ProcessDefinition;
 import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
@@ -29,7 +29,7 @@ public interface ProcessDefinitionsApi {
     @Produces({ "application/json" })
     ResultListDataRepresentation<ProcessDefinition> get(
             @QueryParam("latest") Boolean latest,
-            @QueryParam("appDefinitionId") Long appDefinitionId,
+            @QueryParam("appDefinitionId") Integer appDefinitionId,
             @QueryParam("deploymentId") String deploymentId);
 
 }

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 jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
+import javax.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.PUT;
+import javax.ws.rs.PUT;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.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 jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.Produces;
+import javax.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 jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.PUT;
+import javax.ws.rs.PUT;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
+import javax.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,20 +16,17 @@ package com.inteligr8.alfresco.activiti.api;
 
 import java.util.List;
 
-import jakarta.ws.rs.Consumes;
+import javax.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
+import javax.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
+import javax.ws.rs.GET;
-import jakarta.ws.rs.POST;
+import javax.ws.rs.POST;
-import jakarta.ws.rs.PUT;
+import javax.ws.rs.PUT;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
+import javax.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
+import javax.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import javax.ws.rs.QueryParam;
 
 import com.inteligr8.alfresco.activiti.model.AssigneeIdentifier;
-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;
@@ -38,130 +35,110 @@ import com.inteligr8.alfresco.activiti.model.TaskUpdate;
 import com.inteligr8.alfresco.activiti.model.UserIdentifier;
 import com.inteligr8.alfresco.activiti.model.Variable;
 
-@Path("/api/enterprise")
+@Path("/api/enterprise/tasks")
 public interface TasksApi {
 
     @GET
-    @Path("tasks/{taskId}")
+    @Path("{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("tasks/{taskId}")
+    @Path("{taskId}")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     Task update(@PathParam("taskId") String taskId, TaskUpdate taskUpdate);
 
     @DELETE
-    @Path("tasks/{taskId}")
+    @Path("{taskId}")
     @Produces({ "application/json" })
     void delete(@PathParam("taskId") String taskId);
 
     @POST
-    @Path("tasks/query")
+    @Path("query")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     ResultListDataRepresentation<Task> query(TaskQueryRepresentation request);
 
     @POST
-    @Path("tasks/filter")
+    @Path("filter")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     ResultListDataRepresentation<Task> filter(TaskFilterRepresentation request);
 
     @PUT
-    @Path("tasks/{taskId}/action/assign")
+    @Path("{taskId}/action/assign")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     Task assign(@PathParam("taskId") String taskId, AssigneeIdentifier request);
 
     @PUT
-    @Path("tasks/{taskId}/action/claim")
+    @Path("{taskId}/action/claim")
     void claim(@PathParam("taskId") String taskId);
 
     @PUT
-    @Path("tasks/{taskId}/action/complete")
+    @Path("{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("tasks/{taskId}/action/delegate")
+    @Path("{taskId}/action/delegate")
     @Consumes({ "application/json" })
     void delegate(@PathParam("taskId") String taskId, UserIdentifier request);
 
     @PUT
-    @Path("tasks/{taskId}/action/involve")
+    @Path("{taskId}/action/involve")
     @Consumes({ "application/json" })
     void involve(@PathParam("taskId") String taskId, UserIdentifier request);
 
     @POST
-    @Path("tasks/{taskId}/groups/{groupId}")
+    @Path("{taskId}/groups/{groupId}")
     void involveGroup(@PathParam("taskId") String taskId, @PathParam("groupId") String groupId);
 
     @DELETE
-    @Path("tasks/{taskId}/groups/{groupId}")
+    @Path("{taskId}/groups/{groupId}")
     void removeInvolvedGroup(@PathParam("taskId") String taskId, @PathParam("groupId") String groupId);
 
     @PUT
-    @Path("tasks/{taskId}/action/remove-involved")
+    @Path("{taskId}/action/remove-involved")
     @Consumes({ "application/json" })
     void removeInvolved(@PathParam("taskId") String taskId, UserIdentifier request);
 
     @PUT
-    @Path("tasks/{taskId}/action/resolve")
+    @Path("{taskId}/action/resolve")
     void resolve(@PathParam("taskId") String taskId);
 
     @PUT
-    @Path("tasks/{taskId}/action/unclaim")
+    @Path("{taskId}/action/unclaim")
     void unclaim(@PathParam("taskId") String taskId);
     
     @GET
-    @Path("tasks/{taskId}/variables")
+    @Path("{taskId}/variables")
     @Produces({ "application/json" })
     List<Variable> getVariables(@PathParam("taskId") String taskId, @QueryParam("scope") String scope);
     
     @POST
-    @Path("tasks/{taskId}/variables")
+    @Path("{taskId}/variables")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     List<Variable> setVariables(@PathParam("taskId") String taskId, List<Variable> variables);
     
     @DELETE
-    @Path("tasks/{taskId}/variables")
+    @Path("{taskId}/variables")
     List<Variable> removeVariables(@PathParam("taskId") String taskId);
     
     @GET
-    @Path("tasks/{taskId}/variables/{variableName}")
+    @Path("{taskId}/variables/{variableName}")
     @Produces({ "application/json" })
     Variable getVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, @QueryParam("scope") String scope);
     
     @PUT
-    @Path("tasks/{taskId}/variables/{variableName}")
+    @Path("{taskId}/variables/{variableName}")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     Variable setVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, Variable variable);
     
     @DELETE
-    @Path("tasks/{taskId}/variables/{variableName}")
+    @Path("{taskId}/variables/{variableName}")
     void removeVariable(@PathParam("taskId") String taskId, @PathParam("variableName") String variableName, @QueryParam("scope") String scope);
 
 }

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

@@ -1,162 +0,0 @@
-/*
- * 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);
-
-    @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

@@ -1,53 +0,0 @@
-/*
- * 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

@@ -1,53 +0,0 @@
-/*
- * 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/AppDefinition.java

@@ -40,13 +40,13 @@ public class AppDefinition {
     @JsonProperty("icon")
     private String icon;
     @JsonProperty("id")
-    private Long id;
+    private Integer id;
     @JsonProperty("modelId")
-    private Long modelId;
+    private Integer modelId;
     @JsonProperty("name")
     private String name;
     @JsonProperty("tenantId")
-    private Long tenantId;
+    private Integer tenantId;
     @JsonProperty("theme")
     private String theme;
     @JsonIgnore
@@ -113,31 +113,31 @@ public class AppDefinition {
     }
 
     @JsonProperty("id")
-    public Long getId() {
+    public Integer getId() {
         return id;
     }
 
     @JsonProperty("id")
-    public void setId(Long id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
-    public AppDefinition withId(Long id) {
+    public AppDefinition withId(Integer id) {
         this.id = id;
         return this;
     }
 
     @JsonProperty("modelId")
-    public Long getModelId() {
+    public Integer getModelId() {
         return modelId;
     }
 
     @JsonProperty("modelId")
-    public void setModelId(Long modelId) {
+    public void setModelId(Integer modelId) {
         this.modelId = modelId;
     }
 
-    public AppDefinition withModelId(Long modelId) {
+    public AppDefinition withModelId(Integer modelId) {
         this.modelId = modelId;
         return this;
     }
@@ -158,16 +158,16 @@ public class AppDefinition {
     }
 
     @JsonProperty("tenantId")
-    public Long getTenantId() {
+    public Integer getTenantId() {
         return tenantId;
     }
 
     @JsonProperty("tenantId")
-    public void setTenantId(Long tenantId) {
+    public void setTenantId(Integer tenantId) {
         this.tenantId = tenantId;
     }
 
-    public AppDefinition withTenantId(Long tenantId) {
+    public AppDefinition withTenantId(Integer tenantId) {
         this.tenantId = tenantId;
         return this;
     }

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

@@ -1,12 +1,205 @@
 
 package com.inteligr8.alfresco.activiti.model;
 
+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.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+
 /**
  * AppDefinitionRepresentation
  * <p>
  * 
  * 
  */
-public class AppDefinitionRepresentation extends AppDefinition {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "defaultAppId",
+    "deploymentId",
+    "description",
+    "icon",
+    "id",
+    "modelId",
+    "name",
+    "tenantId",
+    "theme"
+})
+public class AppDefinitionRepresentation {
+
+    @JsonProperty("defaultAppId")
+    private String defaultAppId;
+    @JsonProperty("deploymentId")
+    private String deploymentId;
+    @JsonProperty("description")
+    private String description;
+    @JsonProperty("icon")
+    private String icon;
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("modelId")
+    private Integer modelId;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("tenantId")
+    private Integer tenantId;
+    @JsonProperty("theme")
+    private String theme;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonProperty("defaultAppId")
+    public String getDefaultAppId() {
+        return defaultAppId;
+    }
+
+    @JsonProperty("defaultAppId")
+    public void setDefaultAppId(String defaultAppId) {
+        this.defaultAppId = defaultAppId;
+    }
+
+    public AppDefinitionRepresentation withDefaultAppId(String defaultAppId) {
+        this.defaultAppId = defaultAppId;
+        return this;
+    }
+
+    @JsonProperty("deploymentId")
+    public String getDeploymentId() {
+        return deploymentId;
+    }
+
+    @JsonProperty("deploymentId")
+    public void setDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+    }
+
+    public AppDefinitionRepresentation withDeploymentId(String deploymentId) {
+        this.deploymentId = deploymentId;
+        return this;
+    }
+
+    @JsonProperty("description")
+    public String getDescription() {
+        return description;
+    }
+
+    @JsonProperty("description")
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public AppDefinitionRepresentation withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    @JsonProperty("icon")
+    public String getIcon() {
+        return icon;
+    }
+
+    @JsonProperty("icon")
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public AppDefinitionRepresentation withIcon(String icon) {
+        this.icon = icon;
+        return this;
+    }
+
+    @JsonProperty("id")
+    public Integer getId() {
+        return id;
+    }
+
+    @JsonProperty("id")
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public AppDefinitionRepresentation withId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    @JsonProperty("modelId")
+    public Integer getModelId() {
+        return modelId;
+    }
+
+    @JsonProperty("modelId")
+    public void setModelId(Integer modelId) {
+        this.modelId = modelId;
+    }
+
+    public AppDefinitionRepresentation withModelId(Integer modelId) {
+        this.modelId = modelId;
+        return this;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public AppDefinitionRepresentation withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @JsonProperty("tenantId")
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    @JsonProperty("tenantId")
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public AppDefinitionRepresentation withTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    @JsonProperty("theme")
+    public String getTheme() {
+        return theme;
+    }
+
+    @JsonProperty("theme")
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public AppDefinitionRepresentation withTheme(String theme) {
+        this.theme = theme;
+        return this;
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public AppDefinitionRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
 
 }

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

@@ -1,123 +0,0 @@
-
-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;
-    }
-
-}

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

@@ -1,67 +0,0 @@
-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/CompleteForm.java

@@ -1,39 +0,0 @@
-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;
-    }
-    
-}

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

@@ -1,42 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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/FormDefinition.java

@@ -1,201 +0,0 @@
-
-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;
-    }
-
-}

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

@@ -1,56 +0,0 @@
-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;
-    }
-    
-}

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

@@ -1,56 +0,0 @@
-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;
-    }
-    
-}

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

@@ -1,73 +0,0 @@
-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;
-    }
-    
-}

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

@@ -1,13 +1,10 @@
 
 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;
@@ -45,7 +42,7 @@ public class ModelRepresentation {
     @JsonProperty("comment")
     private String comment;
     @JsonProperty("createdBy")
-    private Long createdBy;
+    private Integer createdBy;
     @JsonProperty("createdByFullName")
     private String createdByFullName;
     @JsonProperty("description")
@@ -53,12 +50,11 @@ public class ModelRepresentation {
     @JsonProperty("favorite")
     private Boolean favorite;
     @JsonProperty("id")
-    private Long id;
+    private Integer id;
     @JsonProperty("lastUpdated")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
+    private String lastUpdated;
-    private OffsetDateTime lastUpdated;
     @JsonProperty("lastUpdatedBy")
-    private Long lastUpdatedBy;
+    private Integer lastUpdatedBy;
     @JsonProperty("lastUpdatedByFullName")
     private String lastUpdatedByFullName;
     @JsonProperty("latestVersion")
@@ -70,11 +66,11 @@ public class ModelRepresentation {
     @JsonProperty("permission")
     private String permission;
     @JsonProperty("referenceId")
-    private Long referenceId;
+    private Integer referenceId;
     @JsonProperty("stencilSet")
-    private Long stencilSet;
+    private Integer stencilSet;
     @JsonProperty("tenantId")
-    private Long tenantId;
+    private Integer tenantId;
     @JsonProperty("version")
     private Integer version;
     @JsonIgnore
@@ -96,16 +92,16 @@ public class ModelRepresentation {
     }
 
     @JsonProperty("createdBy")
-    public Long getCreatedBy() {
+    public Integer getCreatedBy() {
         return createdBy;
     }
 
     @JsonProperty("createdBy")
-    public void setCreatedBy(Long createdBy) {
+    public void setCreatedBy(Integer createdBy) {
         this.createdBy = createdBy;
     }
 
-    public ModelRepresentation withCreatedBy(Long createdBy) {
+    public ModelRepresentation withCreatedBy(Integer createdBy) {
         this.createdBy = createdBy;
         return this;
     }
@@ -156,46 +152,46 @@ public class ModelRepresentation {
     }
 
     @JsonProperty("id")
-    public Long getId() {
+    public Integer getId() {
         return id;
     }
 
     @JsonProperty("id")
-    public void setId(Long id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
-    public ModelRepresentation withId(Long id) {
+    public ModelRepresentation withId(Integer id) {
         this.id = id;
         return this;
     }
 
     @JsonProperty("lastUpdated")
-    public OffsetDateTime getLastUpdated() {
+    public String getLastUpdated() {
         return lastUpdated;
     }
 
     @JsonProperty("lastUpdated")
-    public void setLastUpdated(OffsetDateTime lastUpdated) {
+    public void setLastUpdated(String lastUpdated) {
         this.lastUpdated = lastUpdated;
     }
 
-    public ModelRepresentation withLastUpdated(OffsetDateTime lastUpdated) {
+    public ModelRepresentation withLastUpdated(String lastUpdated) {
         this.lastUpdated = lastUpdated;
         return this;
     }
 
     @JsonProperty("lastUpdatedBy")
-    public Long getLastUpdatedBy() {
+    public Integer getLastUpdatedBy() {
         return lastUpdatedBy;
     }
 
     @JsonProperty("lastUpdatedBy")
-    public void setLastUpdatedBy(Long lastUpdatedBy) {
+    public void setLastUpdatedBy(Integer lastUpdatedBy) {
         this.lastUpdatedBy = lastUpdatedBy;
     }
 
-    public ModelRepresentation withLastUpdatedBy(Long lastUpdatedBy) {
+    public ModelRepresentation withLastUpdatedBy(Integer lastUpdatedBy) {
         this.lastUpdatedBy = lastUpdatedBy;
         return this;
     }
@@ -276,46 +272,46 @@ public class ModelRepresentation {
     }
 
     @JsonProperty("referenceId")
-    public Long getReferenceId() {
+    public Integer getReferenceId() {
         return referenceId;
     }
 
     @JsonProperty("referenceId")
-    public void setReferenceId(Long referenceId) {
+    public void setReferenceId(Integer referenceId) {
         this.referenceId = referenceId;
     }
 
-    public ModelRepresentation withReferenceId(Long referenceId) {
+    public ModelRepresentation withReferenceId(Integer referenceId) {
         this.referenceId = referenceId;
         return this;
     }
 
     @JsonProperty("stencilSet")
-    public Long getStencilSet() {
+    public Integer getStencilSet() {
         return stencilSet;
     }
 
     @JsonProperty("stencilSet")
-    public void setStencilSet(Long stencilSet) {
+    public void setStencilSet(Integer stencilSet) {
         this.stencilSet = stencilSet;
     }
 
-    public ModelRepresentation withStencilSet(Long stencilSet) {
+    public ModelRepresentation withStencilSet(Integer stencilSet) {
         this.stencilSet = stencilSet;
         return this;
     }
 
     @JsonProperty("tenantId")
-    public Long getTenantId() {
+    public Integer getTenantId() {
         return tenantId;
     }
 
     @JsonProperty("tenantId")
-    public void setTenantId(Long tenantId) {
+    public void setTenantId(Integer tenantId) {
         this.tenantId = tenantId;
     }
 
-    public ModelRepresentation withTenantId(Long tenantId) {
+    public ModelRepresentation withTenantId(Integer tenantId) {
         this.tenantId = tenantId;
         return this;
     }

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

@@ -91,7 +91,7 @@ public class Task extends Datum {
     @JsonProperty("parentTaskName")
     private String parentTaskName;
     @JsonProperty("priority")
-    private Integer priority;
+    private Long priority;
     @JsonProperty("processDefinitionCategory")
     private String processDefinitionCategory;
     @JsonProperty("processDefinitionDeploymentId")
@@ -105,7 +105,7 @@ public class Task extends Datum {
     @JsonProperty("processDefinitionName")
     private String processDefinitionName;
     @JsonProperty("processDefinitionVersion")
-    private Integer processDefinitionVersion;
+    private Long processDefinitionVersion;
     @JsonProperty("processInstanceId")
     private String processInstanceId;
     @JsonProperty("processInstanceName")
@@ -370,15 +370,15 @@ public class Task extends Datum {
         return this;
     }
 
-    public Integer getPriority() {
+    public Long getPriority() {
         return priority;
     }
 
-    public void setPriority(Integer priority) {
+    public void setPriority(Long priority) {
         this.priority = priority;
     }
 
-    public Task withPriority(Integer priority) {
+    public Task withPriority(Long priority) {
         this.priority = priority;
         return this;
     }
@@ -461,15 +461,15 @@ public class Task extends Datum {
         return this;
     }
 
-    public Integer getProcessDefinitionVersion() {
+    public Long getProcessDefinitionVersion() {
         return processDefinitionVersion;
     }
 
-    public void setProcessDefinitionVersion(Integer processDefinitionVersion) {
+    public void setProcessDefinitionVersion(Long processDefinitionVersion) {
         this.processDefinitionVersion = processDefinitionVersion;
     }
 
-    public Task withProcessDefinitionVersion(Integer processDefinitionVersion) {
+    public Task withProcessDefinitionVersion(Long processDefinitionVersion) {
         this.processDefinitionVersion = processDefinitionVersion;
         return this;
     }

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

@@ -1,9 +1,25 @@
 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)
-public class Variable extends com.inteligr8.activiti.model.Variable {
+@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;
 
     /**
      * No args constructor for use in serialization
@@ -12,7 +28,62 @@ public class Variable extends com.inteligr8.activiti.model.Variable {
     }
 
     public Variable(String name, String scope, String type, Object value) {
-        super(name, scope, type, 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;
     }
     
 }