Commit bca4ea6d authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 5d2fb8e4 709c2304

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public class ApsClientCxfImpl extends ClientCxfImpl { 
	/**

	 * This constructor is for Spring use

	 */

	ApsClientCxfImpl() {

	protected ApsClientCxfImpl() {

	}

	

	/**

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl { 
	/**

	 * This constructor is for Spring use

	 */

	ApsClientJerseyImpl() {

	protected ApsClientJerseyImpl() {

	}

	

	/**

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi { 
	/**

	 * This constructor is for Spring use

	 */

	ApsPublicRestApiCxfImpl() {

	protected ApsPublicRestApiCxfImpl() {

	}



	/**

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi { 
	/**

	 * This constructor is for Spring use

	 */

	ApsPublicRestApiJerseyImpl() {

	protected ApsPublicRestApiJerseyImpl() {

	}



	/**

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

+8 −1
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.activiti;



import java.util.Arrays;



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.CreateProcessInstance;

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

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

import com.inteligr8.rs.ClientConfiguration;



@TestPropertySource(locations = {"/local.properties"})

@TestPropertySource(locations = {"/local-oauth.properties"})

@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientCxfImpl.class})

public class ConnectionCxfClientIT extends ConnectionClientIT {