Commit 0db79d05 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-acs7' into stable-acs7

parents 6ab29b64 e8040116

pom.xml

+13 −3
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 


	<groupId>com.inteligr8.alfresco</groupId>

	<artifactId>acs-public-rest-api</artifactId>

	<version>2.0.1-acs62</version>

	<version>2.0.1-acs7</version>



	<name>Alfresco Content Services ReST API for Java</name>

	<description>A library for building ACS v6.2.x JAX-RS REST API clients</description>

	<description>A library for building ACS v7.x JAX-RS REST API clients</description>

	<url>https://bitbucket.org/inteligr8/acs-public-rest-api</url>



	<licenses>
@@ -44,7 +44,7 @@ 


		<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>

		

		<alfresco.platform.version>6.2.0</alfresco.platform.version>

		<alfresco.platform.version>7.0.0</alfresco.platform.version>



		<jersey.version>2.35</jersey.version>

		<cxf.version>3.4.7</cxf.version>
@@ -174,6 +174,16 @@ 
							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-discovery.yaml</inputSpec>

						</configuration>

					</execution>

					<execution>

						<id>swagger-model-codegen</id>

						<phase>generate-sources</phase>

						<goals>

							<goal>generate</goal>

						</goals>

						<configuration>

							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-model.yaml</inputSpec>

						</configuration>

					</execution>

				</executions>

			</plugin>

			<plugin>

src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package com.inteligr8.alfresco.acs; 


import com.inteligr8.alfresco.acs.api.ActionsApi;

import com.inteligr8.alfresco.acs.api.ActivitiesApi;

import com.inteligr8.alfresco.acs.api.AspectsApi;

import com.inteligr8.alfresco.acs.api.AuditApi;

import com.inteligr8.alfresco.acs.api.AuthenticationApi;

import com.inteligr8.alfresco.acs.api.CommentsApi;
@@ -36,6 +37,7 @@ import com.inteligr8.alfresco.acs.api.SharedLinksApi; 
import com.inteligr8.alfresco.acs.api.SitesApi;

import com.inteligr8.alfresco.acs.api.TagsApi;

import com.inteligr8.alfresco.acs.api.TrashcanApi;

import com.inteligr8.alfresco.acs.api.TypesApi;

import com.inteligr8.alfresco.acs.api.V0Api;

import com.inteligr8.alfresco.acs.api.VersionsApi;
@@ -57,6 +59,10 @@ public interface AcsPublicRestApi { 
		return this.getApi(ActivitiesApi.class);

	}

	

	default AspectsApi getAspectsApi() {

		return this.getApi(AspectsApi.class);

	}



	default AuditApi getAuditApi() {

		return this.getApi(AuditApi.class);

	}
@@ -137,6 +143,10 @@ public interface AcsPublicRestApi { 
		return this.getApi(TrashcanApi.class);

	}

	

	default TypesApi getTypesApi() {

		return this.getApi(TypesApi.class);

	}

	

	default VersionsApi getVersionsApi() {

		return this.getApi(VersionsApi.class);

	}