Commit 7d1c7f92 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into develop-cxf

parents d11f2fc1 4d34b9c9

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>2.0.4-cxf</version>

			<version>2.0.8-cxf</version>

		</dependency>

		<dependency>

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

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

+24 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ public abstract class AcsClientConfiguration implements ClientConfiguration { 
	@Value("${content.service.security.oauth.grantPassword:#{null}}")

	private String oAuthPassword;



    @Value("${content.service.http.connectTimeout:#{null}}")

    private Integer connectTimeoutInMillis;



    @Value("${content.service.http.responseTimeout:#{null}}")

    private Integer responseTimeoutInMillis;



	public String getBaseUrl() {

		return this.baseUrl;

	}
@@ -149,4 +155,22 @@ public abstract class AcsClientConfiguration implements ClientConfiguration { 
		this.oAuthPassword = oAuthPassword;

	}

	

	@Override

	public Integer getConnectTimeoutInMillis() {

	    return this.connectTimeoutInMillis;

	}

	

	public void setConnectTimeoutInMillis(Integer connectTimeoutInMillis) {

        this.connectTimeoutInMillis = connectTimeoutInMillis;

    }

	

	@Override

	public Integer getResponseTimeoutInMillis() {

	    return this.responseTimeoutInMillis;

	}

	

	public void setResponseTimeoutInMillis(Integer responseTimeoutInMillis) {

        this.responseTimeoutInMillis = responseTimeoutInMillis;

    }



}