diff --git a/pom.xml b/pom.xml
index 1a0753d..bf779fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,12 @@
4.5.9
test
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.17.2
+ test
+
diff --git a/src/main/cxf/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java b/src/main/cxf/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java
index 965e351..e0b25a0 100644
--- a/src/main/cxf/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java
+++ b/src/main/cxf/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java
@@ -4,8 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
-
/**
* This class provides the Apache CXF client to the JAX-RS API for the APS
* Public ReST API.
@@ -23,9 +21,5 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApiImpl implements Aps
public ApsPublicRestApiCxfImpl(ApsClientCxfImpl client) {
super(client);
}
-
- public AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
- return this.getApi(AppDefinitionsCxfApi.class);
- }
}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiImpl.java
index 52e0922..a034baa 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiImpl.java
@@ -1,12 +1,5 @@
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;
import com.inteligr8.rs.Client;
/**
@@ -27,36 +20,8 @@ public class ApsPublicRestApiImpl implements ApsPublicRestApi {
return this.client;
}
- protected final T getApi(Class apiClass) {
+ public final T getApi(Class apiClass) {
return this.client.getApi(apiClass);
}
-
- public AdminApi getAdminApi() {
- return this.getApi(AdminApi.class);
- }
-
- public AppDefinitionsApi getAppDefinitionsApi() {
- return this.getApi(AppDefinitionsApi.class);
- }
-
- public AppVersionApi getAppVersionApi() {
- return this.getApi(AppVersionApi.class);
- }
-
- public ModelsApi getModelsApi() {
- return this.getApi(ModelsApi.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);
- }
}
diff --git a/src/main/jersey/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java b/src/main/jersey/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java
index 6c85e7c..7db09e8 100644
--- a/src/main/jersey/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java
+++ b/src/main/jersey/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java
@@ -4,8 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
-
/**
* This class provides the Jersey client to the JAX-RS API for the APS Public
* ReST API.
@@ -23,9 +21,5 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApiImpl implements
public ApsPublicRestApiJerseyImpl(ApsClientJerseyImpl client) {
super(client);
}
-
- public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
- return this.getApi(AppDefinitionsJerseyApi.class);
- }
}
diff --git a/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000..018e11f
--- /dev/null
+++ b/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
\ No newline at end of file
diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java
index 6b30469..e595ef9 100644
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java
@@ -15,7 +15,7 @@ import com.inteligr8.alfresco.activiti.model.Variable;
public abstract class ConnectionClientIT extends ConditionalIT {
- public abstract ApsPublicRestApiImpl getApi();
+ public abstract ApsPublicRestApi getApi();
@Test
@EnabledIf("hostExists")
diff --git a/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000..48b9fa5
--- /dev/null
+++ b/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file
diff --git a/src/test/resources/log4j2.properties b/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..df444d4
--- /dev/null
+++ b/src/test/resources/log4j2.properties
@@ -0,0 +1,19 @@
+rootLogger.level=trace
+rootLogger.appenderRef.stdout.ref=STDOUT
+
+logger.spring.name=org.springframework
+logger.spring.level=info
+
+logger.common-rest-api.name=com.inteligr8.rs
+logger.common-rest-api.level=trace
+
+logger.this.name=com.inteligr8.alfresco.acs
+logger.this.level=trace
+
+logger.jaxrslog.name=jaxrs.request
+logger.jaxrslog.level=trace
+
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%C [%t] %m%n