Commit 29baa2a5 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-acs6' into stable-acs6

parents 3aed4d2e 41379c39

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<modelVersion>4.0.0</modelVersion>

	<groupId>com.inteligr8.alfresco</groupId>

	<artifactId>acs-public-rest-api</artifactId>

	<version>1.0.6-v1-acs6</version>

	<version>1.1.0-v1-acs6</version>

	<name>Alfresco Content Services ReST API Client for Java</name>



	<properties>
@@ -29,7 +29,7 @@ 
		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-api</artifactId>

			<version>1.0.2</version>

			<version>1.1.0</version>

		</dependency>

		<dependency>

			<groupId>io.swagger</groupId>

src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java

+17 −2
Original line number Diff line number Diff line
@@ -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 AcsClientConfiguration extends ClientConfiguration {

public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {



	@Value("${content.service.baseUrl:http://localhost:8080/alfresco}")

	private String baseUrl;
@@ -43,6 +44,12 @@ public class AcsClientConfiguration extends ClientConfiguration { 
	@Value("${content.service.security.oauth.grantPassword:#{null}}")

	private String oAuthPassword;

	

	@Value("${content.service.cxf.defaultBusEnabled:true}")

	private boolean defaultBusEnabled;

	

	@Value("${content.service.jersey.putBodyRequired:true}")

	private boolean putBodyRequired;

	

	public String getBaseUrl() {

		return this.baseUrl;

	}
@@ -87,4 +94,12 @@ public class AcsClientConfiguration extends ClientConfiguration { 
		return this.oAuthPassword;

	}

	

	public boolean isDefaultBusEnabled() {

		return this.defaultBusEnabled;

	}

	

	public boolean isPutBodyRequired() {

		return this.putBodyRequired;

	}



}

src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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 AcsClientCxfImpl extends ClientCxfImpl { 
	private AcsClientConfiguration config;

	

	@Override

	protected ClientConfiguration getConfig() {

	protected ClientCxfConfiguration getConfig() {

		return this.config;

	}

src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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 AcsClientJerseyImpl extends ClientJerseyImpl { 
	private AcsClientConfiguration config;

	

	@Override

	protected ClientConfiguration getConfig() {

	protected ClientJerseyConfiguration getConfig() {

		return this.config;

	}