Merge branch 'develop' into stable
This commit is contained in:
commit
bca4ea6db0
@ -25,7 +25,7 @@ public class ApsClientCxfImpl extends ClientCxfImpl {
|
||||
/**
|
||||
* This constructor is for Spring use
|
||||
*/
|
||||
ApsClientCxfImpl() {
|
||||
protected ApsClientCxfImpl() {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -25,7 +25,7 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl {
|
||||
/**
|
||||
* This constructor is for Spring use
|
||||
*/
|
||||
ApsClientJerseyImpl() {
|
||||
protected ApsClientJerseyImpl() {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi {
|
||||
/**
|
||||
* This constructor is for Spring use
|
||||
*/
|
||||
ApsPublicRestApiCxfImpl() {
|
||||
protected ApsPublicRestApiCxfImpl() {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi {
|
||||
/**
|
||||
* This constructor is for Spring use
|
||||
*/
|
||||
ApsPublicRestApiJerseyImpl() {
|
||||
protected ApsPublicRestApiJerseyImpl() {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user