Merge branch 'develop-jersey' into stable-jersey

pom.xml

@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.4-jersey</version>
+			<version>2.0.8-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>

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

@@ -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;
 	}
@@ -148,5 +154,23 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	public void setOAuthPassword(String oAuthPassword) {
 		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;
+    }
 
 }