diff --git a/pom.xml b/pom.xml index ec4f3a6..61c4ece 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.inteligr8.alfresco aps-public-rest-api - 1.0.3-v1 + 1.1.0-v1 Alfresco Process Services ReST API Client for Java @@ -26,7 +26,7 @@ com.inteligr8 common-rest-api - 1.0.1 + 1.1.0 org.glassfish.jersey.ext @@ -275,4 +275,4 @@ http://repos.inteligr8.com/nexus/repository/inteligr8-public - \ No newline at end of file + diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java index f66136b..dd98971 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java @@ -4,11 +4,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import com.inteligr8.rs.ClientConfiguration; +import com.inteligr8.rs.ClientCxfConfiguration; +import com.inteligr8.rs.ClientJerseyConfiguration; @Configuration @ComponentScan -public class ApsClientConfiguration extends ClientConfiguration { +public class ApsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration { @Value("${process.service.baseUrl:http://localhost:8080/activiti-app}") private String baseUrl; @@ -42,6 +43,12 @@ public class ApsClientConfiguration extends ClientConfiguration { @Value("${process.service.security.oauth.grantPassword:#{null}}") private String oAuthPassword; + + @Value("${process.service.cxf.defaultBusEnabled:true}") + private boolean defaultBusEnabled; + + @Value("${process.service.jersey.putBodyRequired:true}") + private boolean putBodyRequired; public String getBaseUrl() { return this.baseUrl; @@ -86,5 +93,13 @@ public class ApsClientConfiguration extends ClientConfiguration { public String getOAuthPassword() { return this.oAuthPassword; } + + public boolean isDefaultBusEnabled() { + return this.defaultBusEnabled; + } + + public boolean isPutBodyRequired() { + return this.putBodyRequired; + } } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java index 36a613b..aee055f 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import com.inteligr8.rs.ClientConfiguration; +import com.inteligr8.rs.ClientCxfConfiguration; import com.inteligr8.rs.ClientCxfImpl; /** @@ -18,7 +18,7 @@ public class ApsClientCxfImpl extends ClientCxfImpl { private ApsClientConfiguration config; @Override - protected ClientConfiguration getConfig() { + protected ClientCxfConfiguration getConfig() { return this.config; } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java index 874d70c..8eca94f 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import com.inteligr8.rs.ClientConfiguration; +import com.inteligr8.rs.ClientJerseyConfiguration; import com.inteligr8.rs.ClientJerseyImpl; /** @@ -18,7 +18,7 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl { private ApsClientConfiguration config; @Override - protected ClientConfiguration getConfig() { + protected ClientJerseyConfiguration getConfig() { return this.config; }