Merge branch 'develop' into stable

pom.xml

@@ -4,136 +4,70 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>1.0.1-v1</version>
-	<name>Alfresco Process Services ReST API Client for Java</name>
+	<version>2.0.0</version>
+	<name>Alfresco Process Services ReST API for Java</name>
 
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<maven.compiler.source>8</maven.compiler.source>
 		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 
 		<!-- If you want to build for your specific version, point to your own 
 			installation -->
-		<aps.baseUrl>https://activiti.alfresco.com</aps.baseUrl>
+		<aps.app.tag>aps1</aps.app.tag>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.2.14.RELEASE</spring.version>
-		<jersey.version>2.34</jersey.version>
-		<cxf.version>3.3.2</cxf.version>
+		<jersey.version>2.35</jersey.version>
+		<cxf.version>3.4.7</cxf.version>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.12.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.12.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.29</version>
-		</dependency>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
 			<version>2.1.6</version>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.ext</groupId>
-			<artifactId>jersey-proxy-client</artifactId>
-			<version>${jersey.version}</version>
-			<scope>provided</scope>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.12.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
 			<version>${cxf.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-json-jackson</artifactId>
+			<artifactId>jersey-media-multipart</artifactId>
 			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.9</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
 	
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.0.0-M5</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>io.repaint.maven</groupId>
-				<artifactId>tiles-maven-plugin</artifactId>
-				<version>2.21</version>
-				<extensions>true</extensions>
+				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-					<filtering>true</filtering>
-					<tiles>
-						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
-					</tiles>
+					<classifier>${aps.app.tag}</classifier>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.3.2</version>
+				<executions>
+					<execution>
+						<id>javadoc</id>
+						<phase>package</phase>
+						<goals><goal>jar</goal></goals>
+						<configuration>
+							<show>public</show>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -147,6 +81,7 @@
 			<id>raml-codegen</id>
 			<properties>
 				<aps.ramlUrl>${aps.baseUrl}/activiti-app/raml/activiti.raml</aps.ramlUrl>
+				<basePackage>com.inteligr8.alfresco.activiti</basePackage>
 			</properties>
 			<build>
 				<plugins>
@@ -156,31 +91,13 @@
 						<configuration>
 							<filesets>
 								<fileset>
-									<directory>src/main/java</directory>
+									<directory>src/gen/java</directory>
 									<includes>
-										<include>com/inteligr8/alfresco/activiti/raml/**/*</include>
+										<include>**/*</include>
 									</includes>
 								</fileset>
 							</filesets>
 						</configuration>
-						<executions>
-							<execution>
-								<id>delete-extras</id>
-								<phase>process-sources</phase>
-								<goals><goal>clean</goal></goals>
-								<configuration>
-									<excludeDefaultDirectories>true</excludeDefaultDirectories>
-									<filesets>
-										<fileset>
-											<directory>${project.build.directory}/ramlgen/java</directory>
-											<includes>
-												<include>com/inteligr8/alfresco/activiti/raml/**/*__*.java</include>
-											</includes>
-										</fileset>
-									</filesets>
-								</configuration>
-							</execution>
-						</executions>
 					</plugin>
 					<plugin>
 						<groupId>com.googlecode.maven-download-plugin</groupId>
@@ -260,22 +177,23 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.mule.raml.codegen</groupId>
-						<artifactId>raml-client-generator-maven-plugin</artifactId>
-						<version>0.11</version>
+						<groupId>org.raml.jaxrs</groupId>
+						<artifactId>raml-to-jaxrs-maven-plugin</artifactId>
+						<version>3.0.7</version>
 						<executions>
 							<execution>
-								<id>raml-aps-codegen</id>
+								<id>raml-codegen</id>
 								<phase>generate-sources</phase>
 								<goals>
-									<goal>generate-client</goal>
+									<goal>generate</goal>
 								</goals>
 								<configuration>
-									<basePackage>com.inteligr8.alfresco.activiti.raml</basePackage>
+									<resourcePackage>${basePackage}.resource</resourcePackage>
+									<modelPackage>${basePackage}.model</modelPackage>
+									<supportPackage>${basePackage}.support</supportPackage>
+									<generateTypesWith>jackson</generateTypesWith>
 									<ramlFile>${project.build.directory}/regexed/activiti.raml</ramlFile>
-									<includeAdditionalProperties>false</includeAdditionalProperties>
-									<outputDir>${project.build.directory}/ramlgen/java</outputDir>
-									<outputVersion>v2</outputVersion>
+									<outputDirectory>${basedir}/src/gen/java</outputDirectory>
 								</configuration>
 							</execution>
 						</executions>
@@ -285,14 +203,30 @@
 		</profile>
 	</profiles>
 	
+	<repositories>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+			<releases><enabled>true</enabled></releases>
+			<snapshots><enabled>false</enabled></snapshots>
+		</repository>
+	</repositories>
+	
 	<pluginRepositories>
 		<pluginRepository>
 			<id>mulesoft-releases</id>
 			<url>https://repository.mulesoft.org/releases</url>
 		</pluginRepository>
 		<pluginRepository>
-			<id>inteligr8-releases</id>
-			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+			<id>inteligr8-public</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
+	
+	<distributionManagement>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+	</distributionManagement>
+</project>

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

@@ -1,20 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.HttpHeaders;
-
-public class AccessTokenRequestFilter implements ClientRequestFilter {
-	
-	private final String token;
-	
-	public AccessTokenRequestFilter(String token) {
-		this.token = token;
-	}
-	
-	@Override
-	public void filter(ClientRequestContext requestContext) {
-		requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
-	}
-
-}

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

@@ -1,71 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.WebTarget;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-import com.inteligr8.alfresco.activiti.api.AdminApi;
-import com.inteligr8.alfresco.activiti.api.AppVersionApi;
-import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi;
-import com.inteligr8.alfresco.activiti.api.ProfileApi;
-import com.inteligr8.alfresco.activiti.api.TasksApi;
-
-/**
- * Alfresco Process Services Spring Client
- */
-@Component("apsClient")
-public class ApsClient {
-	
-	@Autowired
-	private ApsClientConfiguration config;
-	
-	protected ApsClientConfiguration getConfig() {
-		return this.config;
-	}
-	
-	public Client getClient() {
-		ClientRequestFilter authFilter = this.config.getAuthorizationFilter();
-		
-		ClientBuilder clientBuilder = ClientBuilder.newBuilder()
-				.register(new JacksonJaxbJsonProvider());
-		if (authFilter != null)
-			clientBuilder.register(authFilter);
-		
-		return clientBuilder.build();
-	}
-
-	public WebTarget getTarget() {
-		return this.getClient()
-				.target(this.config.getBaseUrl());
-	}
-	
-	protected <T> T getApi(Class<T> apiClass) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public AdminApi getAdminApi() {
-		return this.getApi(AdminApi.class);
-	}
-	
-	public AppVersionApi getAppVersionApi() {
-		return this.getApi(AppVersionApi.class);
-	}
-	
-	public ProcessInstancesApi getProcessInstancesApi() {
-		return this.getApi(ProcessInstancesApi.class);
-	}
-	
-	public ProfileApi getProfileApi() {
-		return this.getApi(ProfileApi.class);
-	}
-	
-	public TasksApi getTasksApi() {
-		return this.getApi(TasksApi.class);
-	}
-
-}

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

@@ -1,39 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import javax.ws.rs.client.ClientRequestFilter;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class ApsClientConfiguration {
-
-	@Value("${process.service.baseUrl:http://localhost:8080/activiti-app}")
-	private String baseUrl;
-
-	@Value("${process.service.security.basicAuth.username:admin@app.activiti.com}")
-	private String basicAuthUsername;
-
-	@Value("${process.service.security.basicAuth.password:admin}")
-	private String basicAuthPassword;
-
-	@Value("${process.service.security.accessToken:#{null}}")
-	private String accessToken;
-	
-	public String getBaseUrl() {
-		return this.baseUrl;
-	}
-
-	public ClientRequestFilter getAuthorizationFilter() {
-		if (this.accessToken != null) {
-			return new AccessTokenRequestFilter(this.accessToken);
-		} else if (this.basicAuthUsername != null) {
-			return new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword);
-		} else {
-			return null;
-		}
-	}
-
-}

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

@@ -1,58 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-
-/**
- * Alfresco Process Services Spring Client for CXF
- */
-@Component("apsClient.cxf")
-@Lazy
-public class ApsClientCxfImpl extends ApsClient implements InitializingBean {
-	
-	private final Logger logger = LoggerFactory.getLogger(ApsClientCxfImpl.class);
-	
-	@Override
-	public void afterPropertiesSet() {
-		if (RuntimeDelegate.getInstance() == null) {
-			this.logger.info("Setting JAX-RS runtime delegate to the CXF library");
-			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
-		} else if (RuntimeDelegate.getInstance() instanceof RuntimeDelegateImpl) {
-			this.logger.info("JAX-RS runtime delegate already the CXF library");
-		} else {
-			this.logger.warn("Setting JAX-RS runtime delegate to the CXF library; was: " + RuntimeDelegate.getInstance().getClass().getName());
-			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
-		}
-	}
-	
-	public WebClient getCxfClient() {
-		List<Object> providersAndFilters = new LinkedList<Object>();
-		providersAndFilters.add(new JacksonJaxbJsonProvider());
-		
-		ClientRequestFilter authFilter = this.getConfig().getAuthorizationFilter();
-		if (authFilter != null)
-			providersAndFilters.add(authFilter);
-		
-		return WebClient.create(this.getConfig().getBaseUrl(), providersAndFilters);
-	}
-	
-	@Override
-	protected <T> T getApi(Class<T> apiClass) {
-		return JAXRSClientFactory.fromClient(this.getCxfClient(), apiClass);
-	}
-
-}

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

@@ -1,40 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import javax.ws.rs.ext.RuntimeDelegate;
-
-import org.glassfish.jersey.client.proxy.WebResourceFactory;
-import org.glassfish.jersey.internal.RuntimeDelegateImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-/**
- * Alfresco Process Services Spring Client for Jersey
- */
-@Component("apsClient.jersey")
-@Lazy
-public class ApsClientJerseyImpl extends ApsClient implements InitializingBean {
-	
-	private final Logger logger = LoggerFactory.getLogger(ApsClientJerseyImpl.class);
-	
-	@Override
-	public void afterPropertiesSet() {
-		if (RuntimeDelegate.getInstance() == null) {
-			this.logger.info("Setting JAX-RS runtime delegate to the Jersey library");
-			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
-		} else if (RuntimeDelegate.getInstance() instanceof RuntimeDelegateImpl) {
-			this.logger.info("JAX-RS runtime delegate already the Jersey library");
-		} else {
-			this.logger.warn("Setting JAX-RS runtime delegate to the Jersey library; was: " + RuntimeDelegate.getInstance().getClass().getName());
-			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
-		}
-	}
-	
-	@Override
-	protected <T> T getApi(Class<T> apiClass) {
-		return WebResourceFactory.newResource(apiClass, this.getTarget());
-	}
-
-}

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

@@ -0,0 +1,33 @@
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.AdminApi;
+import com.inteligr8.alfresco.activiti.api.AppDefinitionsApi;
+import com.inteligr8.alfresco.activiti.api.AppVersionApi;
+import com.inteligr8.alfresco.activiti.api.ModelsApi;
+import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi;
+import com.inteligr8.alfresco.activiti.api.ProfileApi;
+import com.inteligr8.alfresco.activiti.api.TasksApi;
+
+/**
+ * This interface consolidates the JAX-RS APIs available in the APS Public
+ * ReST API.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsPublicRestApi {
+	
+	AdminApi getAdminApi();
+	
+	AppDefinitionsApi getAppDefinitionsApi();
+	
+	AppVersionApi getAppVersionApi();
+	
+	ModelsApi getModelsApi();
+	
+	ProcessInstancesApi getProcessInstancesApi();
+	
+	ProfileApi getProfileApi();
+	
+	TasksApi getTasksApi();
+
+}

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

@@ -0,0 +1,16 @@
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
+
+/**
+ * This interface appends Apache CXF implementation specific methods to the
+ * JAX-RS API of the APS Public ReST API.  This is due to a lack of multi-part
+ * in the JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsPublicRestCxfApi extends ApsPublicRestApi {
+	
+	AppDefinitionsCxfApi getAppDefinitionsCxfApi();
+
+}

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

@@ -0,0 +1,16 @@
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
+
+/**
+ * This interface appends Jersey implementation specific methods to the JAX-RS
+ * API of the APS Public ReST API.  This is due to a lack of multi-part in the
+ * JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {
+	
+	AppDefinitionsJerseyApi getAppDefinitionsJerseyApi();
+
+}

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

@@ -1,28 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Base64;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.HttpHeaders;
-
-public class BasicAuthRequestFilter implements ClientRequestFilter {
-	
-	private final String username;
-	private final String password;
-	
-	public BasicAuthRequestFilter(String username, String password) {
-		this.username = username;
-		this.password = password;
-	}
-	
-	@Override
-	public void filter(ClientRequestContext requestContext) throws UnsupportedEncodingException {
-		String userAndPass = this.username + ":" + this.password;
-		String userAndPassEncoded = Base64.getEncoder().encodeToString(userAndPass.getBytes("utf-8"));
-		
-		requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Basic " + userAndPassEncoded);
-	}
-
-}

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

@@ -4,19 +4,80 @@ package com.inteligr8.alfresco.activiti.api;
 import java.util.List;
 
 import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
 
+import com.inteligr8.alfresco.activiti.model.Group;
+import com.inteligr8.alfresco.activiti.model.GroupLight;
+import com.inteligr8.alfresco.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.Tenant;
+import com.inteligr8.alfresco.activiti.model.UserLight;
 
 @Path("/api/enterprise/admin")
 public interface AdminApi {
 
     @GET
     @Path("/tenants")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Produces({ MediaType.APPLICATION_JSON })
     public List<Tenant> getTenants();
+    
+    @GET
+    @Path("/groups")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public List<GroupLight> getGroups(
+    		@QueryParam("tenantId") Long tenantId,
+    		@QueryParam("functional") Boolean functional,
+    		@QueryParam("summary") Boolean summary);
+    
+    @POST
+    @Path("/groups")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public GroupLight createGroup(
+    		Group group);
+    
+    @GET
+    @Path("/groups/{groupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public Group getGroup(
+    		@PathParam("groupId") long groupId,
+    		@QueryParam("includeAllUsers") Boolean includeAllUsers,
+    		@QueryParam("summary") Boolean summary);
+    
+    @GET
+    @Path("/groups/${groupId}/related-groups")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public List<GroupLight> getRelatedGroups(
+    		@PathParam("groupId") long groupId);
+    
+    @POST
+    @Path("/groups/${groupId}/related-groups/${relatedGroupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public void addRelatedGroup(
+    		@PathParam("groupId") long groupId,
+    		@PathParam("relatedGroupId") long relatedGroupId,
+    		@PathParam("type") String type);
+    
+    @DELETE
+    @Path("/groups/${groupId}/related-groups/${relatedGroupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public void deleteRelatedGroup(
+    		@PathParam("groupId") long groupId,
+    		@PathParam("relatedGroupId") long relatedGroupId);
+
+    @GET
+    @Path("groups/{groupId}/users")
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultList<UserLight> getMembers(
+    		@PathParam("groupId") long groupId,
+    		@QueryParam("filter") String filter,
+    		@QueryParam("page") Integer page,
+    		@QueryParam("pageSize") Integer pageSize);
 
 }

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

@@ -0,0 +1,57 @@
+
+package com.inteligr8.alfresco.activiti.api;
+
+import java.io.File;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import 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;
+
+@Path("/api/enterprise/app-definitions")
+public interface AppDefinitionsApi {
+
+    @GET
+    @Path("{modelId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionRepresentation get(
+    		@PathParam("modelId") Long appId);
+
+    @PUT
+    @Path("{modelId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation update(
+    		@PathParam("modelId") Long appId,
+    		AppDefinitionSaveRepresentation updatedModel);
+
+    @DELETE
+    @Path("{appDefinitionId}")
+    void delete(
+    		@PathParam("appDefinitionId") Long appId);
+
+    @GET
+    @Path("{modelId}/export")
+    @Produces({ MediaType.APPLICATION_JSON, "application/zip" })
+    File export(
+    		@PathParam("modelId") Long appId);
+
+    @POST
+    @Path("{modelId}/publish")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation publish(
+    		@PathParam("modelId") Long appId,
+    		AppDefinitionPublishRepresentation publishModel);
+
+}

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

@@ -0,0 +1,51 @@
+
+package com.inteligr8.alfresco.activiti.api;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
+import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
+import com.inteligr8.alfresco.activiti.model.FileMultipartCxf;
+
+@Path("/api/enterprise/app-definitions")
+public interface AppDefinitionsCxfApi {
+
+    @POST
+    @Path("import")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionRepresentation import_(
+    		FileMultipartCxf body,
+    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
+
+    @POST
+    @Path("{modelId}/import")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionRepresentation import_(
+    		@PathParam("modelId") Long appId,
+    		FileMultipartCxf body,
+    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
+
+    @POST
+    @Path("publish-app")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation publishApp(
+    		FileMultipartCxf body);
+
+    @POST
+    @Path("{modelId}/publish-app")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation publishApp(
+    		@PathParam("modelId") Long appId,
+    		FileMultipartCxf body);
+
+}

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

@@ -0,0 +1,51 @@
+
+package com.inteligr8.alfresco.activiti.api;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
+import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
+import com.inteligr8.alfresco.activiti.model.FileMultipartJersey;
+
+@Path("/api/enterprise/app-definitions")
+public interface AppDefinitionsJerseyApi {
+
+    @POST
+    @Path("import")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionRepresentation importApp(
+    		FileMultipartJersey file,
+    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
+
+    @POST
+    @Path("{modelId}/import")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionRepresentation importApp(
+    		@PathParam("modelId") Long appId,
+    		FileMultipartJersey file,
+    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
+
+    @POST
+    @Path("publish-app")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation publishApp(
+    		FileMultipartJersey file);
+
+    @POST
+    @Path("{modelId}/publish-app")
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    AppDefinitionUpdateResultRepresentation publishApp(
+    		@PathParam("modelId") Long appId,
+    		FileMultipartJersey file);
+
+}

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

@@ -0,0 +1,32 @@
+
+package com.inteligr8.alfresco.activiti.api;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import com.inteligr8.alfresco.activiti.model.GroupLight;
+import com.inteligr8.alfresco.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.UserLight;
+
+@Path("/api/enterprise/groups")
+public interface GroupsApi {
+
+    @GET
+    @Produces({ "application/json" })
+    ResultList<GroupLight> query(
+    		@QueryParam("filter") String filter,
+    		@QueryParam("groupId") Long groupId,
+    		@QueryParam("externalId") String externalId,
+    		@QueryParam("externalIdCaseInsensitive") String externalIdCaseInsensitve,
+    		@QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("{groupId}/users")
+    @Produces({ "application/json" })
+    ResultList<UserLight> queryMembers(
+    		@PathParam("groupId") long groupId);
+
+}

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

@@ -0,0 +1,37 @@
+
+package com.inteligr8.alfresco.activiti.api;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
+
+@Path("/api/enterprise/models")
+public interface ModelsApi {
+	
+	enum ModelType {
+		Process(0),
+		Form(2),
+		App(3);
+		
+		private int id;
+		private ModelType(int id) {
+			this.id = id;
+		}
+		
+		public int getId() {
+			return this.id;
+		}
+	}
+
+    @GET
+    @Produces({ "application/json" })
+    public ResultListDataRepresentation get(
+    		@QueryParam("filter") String filter,
+    		@QueryParam("sort") String sort,
+    		@QueryParam("modelType") Integer modelType,
+    		@QueryParam("referenceId") Long referenceId);
+
+}

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

@@ -0,0 +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>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "defaultAppId",
+    "deploymentId",
+    "description",
+    "icon",
+    "id",
+    "modelId",
+    "name",
+    "tenantId",
+    "theme"
+})
+public class AppDefinition {
+
+    @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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,79 @@
+
+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;
+
+
+/**
+ * AppDefinitionPublishRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "comment",
+    "force"
+})
+public class AppDefinitionPublishRepresentation {
+
+    @JsonProperty("comment")
+    private String comment;
+    @JsonProperty("force")
+    private Boolean force;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonProperty("comment")
+    public String getComment() {
+        return comment;
+    }
+
+    @JsonProperty("comment")
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public AppDefinitionPublishRepresentation withComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    @JsonProperty("force")
+    public Boolean getForce() {
+        return force;
+    }
+
+    @JsonProperty("force")
+    public void setForce(Boolean force) {
+        this.force = force;
+    }
+
+    public AppDefinitionPublishRepresentation withForce(Boolean force) {
+        this.force = force;
+        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 AppDefinitionPublishRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

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

@@ -0,0 +1,115 @@
+
+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;
+
+
+/**
+ * AppDefinitionSaveRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "appDefinition",
+    "force",
+    "publish"
+})
+public class AppDefinitionSaveRepresentation {
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    private AppDefinition appDefinition;
+    @JsonProperty("force")
+    private Boolean force;
+    @JsonProperty("publish")
+    private Boolean publish;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    public AppDefinition getAppDefinition() {
+        return appDefinition;
+    }
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    public void setAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+    }
+
+    public AppDefinitionSaveRepresentation withAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+        return this;
+    }
+
+    @JsonProperty("force")
+    public Boolean getForce() {
+        return force;
+    }
+
+    @JsonProperty("force")
+    public void setForce(Boolean force) {
+        this.force = force;
+    }
+
+    public AppDefinitionSaveRepresentation withForce(Boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    @JsonProperty("publish")
+    public Boolean getPublish() {
+        return publish;
+    }
+
+    @JsonProperty("publish")
+    public void setPublish(Boolean publish) {
+        this.publish = publish;
+    }
+
+    public AppDefinitionSaveRepresentation withPublish(Boolean publish) {
+        this.publish = publish;
+        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 AppDefinitionSaveRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,187 @@
+
+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;
+
+
+/**
+ * AppDefinitionUpdateResultRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "appDefinition",
+    "customData",
+    "error",
+    "errorDescription",
+    "errorType",
+    "message",
+    "messageKey"
+})
+public class AppDefinitionUpdateResultRepresentation {
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    private AppDefinition appDefinition;
+    @JsonProperty("customData")
+    private CustomData customData;
+    @JsonProperty("error")
+    private Boolean error;
+    @JsonProperty("errorDescription")
+    private String errorDescription;
+    @JsonProperty("errorType")
+    private Integer errorType;
+    @JsonProperty("message")
+    private String message;
+    @JsonProperty("messageKey")
+    private String messageKey;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    public AppDefinition getAppDefinition() {
+        return appDefinition;
+    }
+
+    /**
+     * AppDefinitionRepresentation
+     * <p>
+     * 
+     * 
+     */
+    @JsonProperty("appDefinition")
+    public void setAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withAppDefinition(AppDefinition appDefinition) {
+        this.appDefinition = appDefinition;
+        return this;
+    }
+
+    @JsonProperty("customData")
+    public CustomData getCustomData() {
+        return customData;
+    }
+
+    @JsonProperty("customData")
+    public void setCustomData(CustomData customData) {
+        this.customData = customData;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withCustomData(CustomData customData) {
+        this.customData = customData;
+        return this;
+    }
+
+    @JsonProperty("error")
+    public Boolean getError() {
+        return error;
+    }
+
+    @JsonProperty("error")
+    public void setError(Boolean error) {
+        this.error = error;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withError(Boolean error) {
+        this.error = error;
+        return this;
+    }
+
+    @JsonProperty("errorDescription")
+    public String getErrorDescription() {
+        return errorDescription;
+    }
+
+    @JsonProperty("errorDescription")
+    public void setErrorDescription(String errorDescription) {
+        this.errorDescription = errorDescription;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withErrorDescription(String errorDescription) {
+        this.errorDescription = errorDescription;
+        return this;
+    }
+
+    @JsonProperty("errorType")
+    public Integer getErrorType() {
+        return errorType;
+    }
+
+    @JsonProperty("errorType")
+    public void setErrorType(Integer errorType) {
+        this.errorType = errorType;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withErrorType(Integer errorType) {
+        this.errorType = errorType;
+        return this;
+    }
+
+    @JsonProperty("message")
+    public String getMessage() {
+        return message;
+    }
+
+    @JsonProperty("message")
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    @JsonProperty("messageKey")
+    public String getMessageKey() {
+        return messageKey;
+    }
+
+    @JsonProperty("messageKey")
+    public void setMessageKey(String messageKey) {
+        this.messageKey = messageKey;
+    }
+
+    public AppDefinitionUpdateResultRepresentation withMessageKey(String messageKey) {
+        this.messageKey = messageKey;
+        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 AppDefinitionUpdateResultRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,36 @@
+
+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.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+public class CustomData {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public CustomData withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,36 @@
+
+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.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+public class Datum {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Datum withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,38 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
+import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
+
+public class FileMultipartCxf extends MultipartBody {
+	
+	public static FileMultipartCxf from(String filename, InputStream istream) throws IOException {
+		return new FileMultipartCxf(Arrays.asList(toAttachment(filename, istream)));
+	}
+ 	
+	public FileMultipartCxf(List<Attachment> atts) throws IOException {
+		super(atts);
+	}
+ 	
+	public FileMultipartCxf(List<Attachment> atts, boolean outbound) {
+		super(atts, outbound);
+	}
+	
+	public Attachment getFileAttachment() {
+		return this.getAttachment("file");
+	}
+
+	private static Attachment toAttachment(String filename, InputStream istream) {
+		if (filename == null) {
+			return new Attachment("file", istream, new ContentDisposition("form-data; name=\"file\""));
+		} else {
+			return new Attachment("file", istream, new ContentDisposition("form-data; name=\"file\"; filename=\"" + filename + "\""));
+		}
+	}
+
+}

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

@@ -0,0 +1,38 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.io.InputStream;
+import java.text.ParseException;
+
+import org.glassfish.jersey.media.multipart.BodyPart;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+
+public class FileMultipartJersey extends FormDataMultiPart {
+	
+	public static FileMultipartJersey from(String filename, InputStream istream) throws ParseException {
+		FileMultipartJersey multipart = new FileMultipartJersey();
+		multipart.bodyPart(toBodyPart(filename, istream));
+		return multipart;
+	}
+	
+	private FileMultipartJersey() {
+	}
+	
+	public FormDataBodyPart getFileAttachment() {
+		return this.getField("file");
+	}
+
+	private static BodyPart toBodyPart(String filename, InputStream istream) throws ParseException {
+		if (filename == null) {
+			return new FormDataBodyPart()
+					.contentDisposition(new FormDataContentDisposition("form-data; name=\"file\""))
+					.entity(istream);
+		} else {
+			return new FormDataBodyPart()
+					.contentDisposition(new FormDataContentDisposition("form-data; name=\"file\"; filename=\"" + filename + "\""))
+					.entity(istream);
+		}
+	}
+
+}

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

@@ -1,4 +1,3 @@
-
 package com.inteligr8.alfresco.activiti.model;
 
 import java.util.ArrayList;
@@ -31,7 +30,7 @@ public class Group {
     @JsonProperty("externalId")
     private String externalId;
     @JsonProperty("groups")
-    private List<Group> groups = new ArrayList<Group>();
+    private List<GroupLight> groups = new ArrayList<GroupLight>();
     @JsonProperty("id")
     private Long id;
     @JsonProperty("lastSyncTimeStamp")
@@ -85,15 +84,15 @@ public class Group {
         return this;
     }
 
-    public List<Group> getGroups() {
+    public List<GroupLight> getGroups() {
         return groups;
     }
 
-    public void setGroups(List<Group> groups) {
+    public void setGroups(List<GroupLight> groups) {
         this.groups = groups;
     }
 
-    public Group withGroups(List<Group> groups) {
+    public Group withGroups(List<GroupLight> groups) {
         this.groups = groups;
         return this;
     }
@@ -229,3 +228,7 @@ public class Group {
 	}
 
 }
+
+
+
+

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

@@ -0,0 +1,94 @@
+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 GroupLight {
+
+    @JsonProperty("id")
+    private Long id;
+    @JsonProperty("externalId")
+    private String externalId;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("parentGroupId")
+    private Long parentGroupId;
+    @JsonProperty("status")
+    private String status;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public GroupLight() {
+    }
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	public GroupLight withId(Long id) {
+		this.setId(id);
+		return this;
+	}
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
+	
+	public GroupLight withExternalId(String externalId) {
+		this.setExternalId(externalId);
+		return this;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public GroupLight withName(String name) {
+		this.setName(name);
+		return this;
+	}
+
+	public Long getParentGroupId() {
+		return parentGroupId;
+	}
+
+	public void setParentGroupId(Long parentGroupId) {
+		this.parentGroupId = parentGroupId;
+	}
+	
+	public GroupLight withParentGroupId(Long parentGroupId) {
+		this.setParentGroupId(parentGroupId);
+		return this;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+	public GroupLight withStatus(String status) {
+		this.setStatus(status);
+		return this;
+	}
+    
+}
+

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

@@ -0,0 +1,349 @@
+
+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;
+
+
+/**
+ * ModelRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "comment",
+    "createdBy",
+    "createdByFullName",
+    "description",
+    "favorite",
+    "id",
+    "lastUpdated",
+    "lastUpdatedBy",
+    "lastUpdatedByFullName",
+    "latestVersion",
+    "modelType",
+    "name",
+    "permission",
+    "referenceId",
+    "stencilSet",
+    "tenantId",
+    "version"
+})
+public class ModelRepresentation {
+
+    @JsonProperty("comment")
+    private String comment;
+    @JsonProperty("createdBy")
+    private Integer createdBy;
+    @JsonProperty("createdByFullName")
+    private String createdByFullName;
+    @JsonProperty("description")
+    private String description;
+    @JsonProperty("favorite")
+    private Boolean favorite;
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("lastUpdated")
+    private String lastUpdated;
+    @JsonProperty("lastUpdatedBy")
+    private Integer lastUpdatedBy;
+    @JsonProperty("lastUpdatedByFullName")
+    private String lastUpdatedByFullName;
+    @JsonProperty("latestVersion")
+    private Boolean latestVersion;
+    @JsonProperty("modelType")
+    private Integer modelType;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("permission")
+    private String permission;
+    @JsonProperty("referenceId")
+    private Integer referenceId;
+    @JsonProperty("stencilSet")
+    private Integer stencilSet;
+    @JsonProperty("tenantId")
+    private Integer tenantId;
+    @JsonProperty("version")
+    private Integer version;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonProperty("comment")
+    public String getComment() {
+        return comment;
+    }
+
+    @JsonProperty("comment")
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public ModelRepresentation withComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    @JsonProperty("createdBy")
+    public Integer getCreatedBy() {
+        return createdBy;
+    }
+
+    @JsonProperty("createdBy")
+    public void setCreatedBy(Integer createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public ModelRepresentation withCreatedBy(Integer createdBy) {
+        this.createdBy = createdBy;
+        return this;
+    }
+
+    @JsonProperty("createdByFullName")
+    public String getCreatedByFullName() {
+        return createdByFullName;
+    }
+
+    @JsonProperty("createdByFullName")
+    public void setCreatedByFullName(String createdByFullName) {
+        this.createdByFullName = createdByFullName;
+    }
+
+    public ModelRepresentation withCreatedByFullName(String createdByFullName) {
+        this.createdByFullName = createdByFullName;
+        return this;
+    }
+
+    @JsonProperty("description")
+    public String getDescription() {
+        return description;
+    }
+
+    @JsonProperty("description")
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public ModelRepresentation withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    @JsonProperty("favorite")
+    public Boolean getFavorite() {
+        return favorite;
+    }
+
+    @JsonProperty("favorite")
+    public void setFavorite(Boolean favorite) {
+        this.favorite = favorite;
+    }
+
+    public ModelRepresentation withFavorite(Boolean favorite) {
+        this.favorite = favorite;
+        return this;
+    }
+
+    @JsonProperty("id")
+    public Integer getId() {
+        return id;
+    }
+
+    @JsonProperty("id")
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public ModelRepresentation withId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    @JsonProperty("lastUpdated")
+    public String getLastUpdated() {
+        return lastUpdated;
+    }
+
+    @JsonProperty("lastUpdated")
+    public void setLastUpdated(String lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public ModelRepresentation withLastUpdated(String lastUpdated) {
+        this.lastUpdated = lastUpdated;
+        return this;
+    }
+
+    @JsonProperty("lastUpdatedBy")
+    public Integer getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    @JsonProperty("lastUpdatedBy")
+    public void setLastUpdatedBy(Integer lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+
+    public ModelRepresentation withLastUpdatedBy(Integer lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+        return this;
+    }
+
+    @JsonProperty("lastUpdatedByFullName")
+    public String getLastUpdatedByFullName() {
+        return lastUpdatedByFullName;
+    }
+
+    @JsonProperty("lastUpdatedByFullName")
+    public void setLastUpdatedByFullName(String lastUpdatedByFullName) {
+        this.lastUpdatedByFullName = lastUpdatedByFullName;
+    }
+
+    public ModelRepresentation withLastUpdatedByFullName(String lastUpdatedByFullName) {
+        this.lastUpdatedByFullName = lastUpdatedByFullName;
+        return this;
+    }
+
+    @JsonProperty("latestVersion")
+    public Boolean getLatestVersion() {
+        return latestVersion;
+    }
+
+    @JsonProperty("latestVersion")
+    public void setLatestVersion(Boolean latestVersion) {
+        this.latestVersion = latestVersion;
+    }
+
+    public ModelRepresentation withLatestVersion(Boolean latestVersion) {
+        this.latestVersion = latestVersion;
+        return this;
+    }
+
+    @JsonProperty("modelType")
+    public Integer getModelType() {
+        return modelType;
+    }
+
+    @JsonProperty("modelType")
+    public void setModelType(Integer modelType) {
+        this.modelType = modelType;
+    }
+
+    public ModelRepresentation withModelType(Integer modelType) {
+        this.modelType = modelType;
+        return this;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ModelRepresentation withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @JsonProperty("permission")
+    public String getPermission() {
+        return permission;
+    }
+
+    @JsonProperty("permission")
+    public void setPermission(String permission) {
+        this.permission = permission;
+    }
+
+    public ModelRepresentation withPermission(String permission) {
+        this.permission = permission;
+        return this;
+    }
+
+    @JsonProperty("referenceId")
+    public Integer getReferenceId() {
+        return referenceId;
+    }
+
+    @JsonProperty("referenceId")
+    public void setReferenceId(Integer referenceId) {
+        this.referenceId = referenceId;
+    }
+
+    public ModelRepresentation withReferenceId(Integer referenceId) {
+        this.referenceId = referenceId;
+        return this;
+    }
+
+    @JsonProperty("stencilSet")
+    public Integer getStencilSet() {
+        return stencilSet;
+    }
+
+    @JsonProperty("stencilSet")
+    public void setStencilSet(Integer stencilSet) {
+        this.stencilSet = stencilSet;
+    }
+
+    public ModelRepresentation withStencilSet(Integer stencilSet) {
+        this.stencilSet = stencilSet;
+        return this;
+    }
+
+    @JsonProperty("tenantId")
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    @JsonProperty("tenantId")
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public ModelRepresentation withTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    @JsonProperty("version")
+    public Integer getVersion() {
+        return version;
+    }
+
+    @JsonProperty("version")
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public ModelRepresentation withVersion(Integer version) {
+        this.version = version;
+        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 ModelRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,54 @@
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResultList<T> {
+    
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("total")
+    private Integer total;
+    @JsonProperty("start")
+    private Integer start;
+    @JsonProperty("data")
+    private List<T> data = new LinkedList<T>();
+    
+    public Integer getSize() {
+		return size;
+	}
+    
+    public void setSize(Integer size) {
+		this.size = size;
+	}
+    
+    public Integer getTotal() {
+		return total;
+	}
+    
+    public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+    public Integer getStart() {
+		return start;
+	}
+    
+    public void setStart(Integer start) {
+		this.start = start;
+	}
+    
+    public List<T> getData() {
+		return data;
+	}
+    
+    public void setData(List<T> data) {
+		this.data = data;
+	}
+
+}

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

@@ -0,0 +1,117 @@
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+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;
+
+
+/**
+ * ResultListDataRepresentation
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "data",
+    "size",
+    "start",
+    "total"
+})
+public class ResultListDataRepresentation {
+
+    @JsonProperty("data")
+    private List<Datum> data = new ArrayList<Datum>();
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("start")
+    private Integer start;
+    @JsonProperty("total")
+    private Integer total;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonProperty("data")
+    public List<Datum> getData() {
+        return data;
+    }
+
+    @JsonProperty("data")
+    public void setData(List<Datum> data) {
+        this.data = data;
+    }
+
+    public ResultListDataRepresentation withData(List<Datum> data) {
+        this.data = data;
+        return this;
+    }
+
+    @JsonProperty("size")
+    public Integer getSize() {
+        return size;
+    }
+
+    @JsonProperty("size")
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public ResultListDataRepresentation withSize(Integer size) {
+        this.size = size;
+        return this;
+    }
+
+    @JsonProperty("start")
+    public Integer getStart() {
+        return start;
+    }
+
+    @JsonProperty("start")
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public ResultListDataRepresentation withStart(Integer start) {
+        this.start = start;
+        return this;
+    }
+
+    @JsonProperty("total")
+    public Integer getTotal() {
+        return total;
+    }
+
+    @JsonProperty("total")
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public ResultListDataRepresentation withTotal(Integer total) {
+        this.total = total;
+        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 ResultListDataRepresentation withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java

@@ -1,25 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.inteligr8.alfresco.activiti.model.Tenant;
-
-public class ArrayResponseUnitTest extends ConditionalIT {
-	
-	@Autowired
-	private ApsClient client;
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testTenants() {
-		List<Tenant> objs = this.client.getAdminApi().getTenants();
-		
-		Assertions.assertNotNull(objs);
-	}
-
-}

src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java

@@ -1,39 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-
-@TestPropertySource(locations = {"/local.properties"})
-@ContextConfiguration(classes = {ApsClientConfiguration.class, ApsClient.class})
-public class ConditionalIT {
-	
-	@Autowired
-	private ApsClient client;
-	
-	public boolean hostExists() {
-		String uri = this.client.getConfig().getBaseUrl();
-		
-		HttpUriRequest request = RequestBuilder.get()
-				.setUri(uri)
-				.build();
-		
-		HttpClient client = HttpClientBuilder.create()
-				.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
-				.build();
-		
-		try {
-			HttpResponse response = client.execute(request);
-			return response.getStatusLine().getStatusCode() < 300;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-}

src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java

@@ -1,40 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.alfresco.activiti.model.AppVersion;
-import com.inteligr8.alfresco.activiti.model.User;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientCxfImpl.class})
-public class ConnectionCxfClientIT {
-	
-	@Autowired
-	@Qualifier("apsClient.cxf")
-	private ApsClient client;
-	
-	@Test
-	//@EnabledIf("hostExists")
-	public void testAppVersion() {
-		AppVersion obj = this.client.getAppVersionApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("1", obj.getMajorVersion());
-		Assertions.assertEquals("bpmSuite", obj.getType());
-	}
-	
-	@Test
-	//@EnabledIf("hostExists")
-	public void testProfile() {
-		User obj = this.client.getProfileApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
-	}
-
-}

src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java

@@ -1,40 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.alfresco.activiti.model.AppVersion;
-import com.inteligr8.alfresco.activiti.model.User;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})
-public class ConnectionJerseyClientIT {
-	
-	@Autowired
-	@Qualifier("apsClient.jersey")
-	private ApsClient client;
-	
-	@Test
-	//@EnabledIf("hostExists")
-	public void testAppVersion() {
-		AppVersion obj = this.client.getAppVersionApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("1", obj.getMajorVersion());
-		Assertions.assertEquals("bpmSuite", obj.getType());
-	}
-	
-	@Test
-	//@EnabledIf("hostExists")
-	public void testProfile() {
-		User obj = this.client.getProfileApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
-	}
-
-}

src/test/resources/local.properties

@@ -1,3 +0,0 @@
-process.service.baseUrl=http://localhost:8080/activiti-app
-process.service.security.basicAuth.username=admin@app.activiti.com
-process.service.security.basicAuth.password=admin