Merge branch 'develop-cxf' into stable-cxf

pom.xml

@@ -5,8 +5,8 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-client</artifactId>
-	<version>2.0.5-cxf</version>
-	
+	<version>3.0.2-cxf</version>
+
 	<name>Alfresco Process Services ReST API Client for Java</name>
 	<description>An APS Client library for building CXF-based REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
@@ -38,25 +38,26 @@
 
 	<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>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.3.6</spring.version>
-		<cxf.version>3.5.6</cxf.version>
+		<junit.version>5.10.0</junit.version>
+		<spring.version>6.0.19</spring.version>
+		<cxf.version>4.0.2</cxf.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.8-cxf</version>
+			<version>3.0.0-cxf</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>aps-public-rest-api</artifactId>
-			<version>2.0.8</version>
+			<version>3.0.5</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -80,7 +81,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.19.0</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 		

src/main/cxf/com/inteligr8/alfresco/activiti/ApsProtectedRestApiCxfImpl.java

@@ -0,0 +1,39 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the Apache CXF client to the JAX-RS API for the Activiti
+ * & APS public ReST APIs and some non-public APS ReST APIs.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("aps.protected-api.cxf")
+@Lazy
+public class ApsProtectedRestApiCxfImpl extends ApsProtectedRestApiImpl implements ApsProtectedRestCxfApi {
+
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public ApsProtectedRestApiCxfImpl(ApsClientCxfImpl client) {
+		super(client);
+	}
+
+}

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApiImpl.java

@@ -0,0 +1,41 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.rs.Client;
+
+/**
+ * This class serves as the entrypoint to the JAX-RS API for the APS Public
+ * ReST API.
+ * 
+ * @author brian@inteligr8.com
+ */
+public class ApsProtectedRestApiImpl implements ApsProtectedRestApi {
+	
+	private Client client;
+	
+	public ApsProtectedRestApiImpl(Client client) {
+		this.client = client;
+	}
+	
+	public Client getClient() {
+		return this.client;
+	}
+	
+	public final <T> T getApi(Class<T> apiClass) {
+		return this.client.getApi(apiClass);
+	}
+
+}