14 Commits

4 changed files with 69 additions and 50 deletions

85
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-client</artifactId>
<version>2.0-SNAPSHOT-cxf</version>
<version>3.0-SNAPSHOT-cxf</version>
<name>Alfresco Content Services ReST API Client for Java</name>
<description>An ACS Client library for building CXF-based REST API clients</description>
@@ -39,33 +39,34 @@
<properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<acs.platform.tag>acs7</acs.platform.tag>
<junit.version>5.7.2</junit.version>
<spring.version>5.3.6</spring.version>
<cxf.version>3.5.6</cxf.version>
<acs.platform.tag>acs26</acs.platform.tag>
<!-- for testing only -->
<spring.version>6.2.18</spring.version>
</properties>
<dependencies>
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId>
<version>2.0.1-cxf</version>
<version>3.0.4-cxf</version>
</dependency>
<dependency>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId>
<version>2.0.1-${acs.platform.tag}</version>
<version>3.0.2-${acs.platform.tag}</version>
<scope>provided</scope> <!-- explicitly, bring your own version -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<version>5.14.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,17 +84,33 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.19.0</version>
<version>2.25.4</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.5</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>add-jaxrs-src</id>
@@ -115,34 +132,12 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ossrh-release</id>
<id>central-publish</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -160,7 +155,6 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<executions>
<execution>
<id>javadoc</id>
@@ -184,19 +178,20 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
<!-- for some reason this is required... -->
<executions>
<execution>
<id>ossrh-deploy</id>
<id>deploy</id>
<phase>deploy</phase>
<goals><goal>deploy</goal></goals>
<goals><goal>publish</goal></goals>
</execution>
</executions>
</plugin>

View File

@@ -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;
}
}

View File

@@ -17,7 +17,7 @@ package com.inteligr8.alfresco.acs;
import java.util.List;
import java.util.UUID;
import javax.ws.rs.NotFoundException;
import jakarta.ws.rs.NotFoundException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -1,17 +1,17 @@
rootLogger.level=trace
rootLogger.level=info
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.common-rest-api.level=info
logger.this.name=com.inteligr8.alfresco.acs
logger.this.level=trace
logger.this.level=info
logger.jaxrslog.name=jaxrs.request
logger.jaxrslog.level=trace
logger.jaxrslog.level=info
appender.stdout.type=Console
appender.stdout.name=STDOUT