From 3f344b3864349d58fca71af0e612897f3daac262 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 27 Oct 2021 13:27:48 -0400 Subject: [PATCH 1/2] extensibility fix --- .../java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java | 2 +- .../com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java | 2 +- .../inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java | 2 +- .../inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java index aa82f4d..76774d2 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java @@ -25,7 +25,7 @@ public class ApsClientCxfImpl extends ClientCxfImpl { /** * This constructor is for Spring use */ - ApsClientCxfImpl() { + protected ApsClientCxfImpl() { } /** diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java index fed0eeb..f78d94f 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java @@ -25,7 +25,7 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl { /** * This constructor is for Spring use */ - ApsClientJerseyImpl() { + protected ApsClientJerseyImpl() { } /** diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java index 68e3049..3638e25 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java @@ -23,7 +23,7 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi { /** * This constructor is for Spring use */ - ApsPublicRestApiCxfImpl() { + protected ApsPublicRestApiCxfImpl() { } /** diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java index 7f8c364..15ca401 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java @@ -23,7 +23,7 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi { /** * This constructor is for Spring use */ - ApsPublicRestApiJerseyImpl() { + protected ApsPublicRestApiJerseyImpl() { } /** From 709c23042353f37eadbd37f3850b880b6be2cb7a Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 27 Oct 2021 14:40:18 -0400 Subject: [PATCH 2/2] using oauth props --- .../alfresco/activiti/ConnectionCxfClientIT.java | 9 ++++++++- src/test/resources/local-oauth.properties | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java index 9e3b053..6fe5178 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java @@ -1,13 +1,20 @@ 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 { diff --git a/src/test/resources/local-oauth.properties b/src/test/resources/local-oauth.properties index 6310347..5bf8df3 100644 --- a/src/test/resources/local-oauth.properties +++ b/src/test/resources/local-oauth.properties @@ -1,5 +1,5 @@ process.service.baseUrl=http://localhost:8080/activiti-app process.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token -process.service.security.oauth.clientId=alfresco +process.service.security.oauth.clientId=api process.service.security.oauth.grantUsername=admin process.service.security.oauth.grantPassword=admin