diff --git a/pom.xml b/pom.xml
index 40628c8..5fa9a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,30 +43,23 @@
8
lines,vars,source
-
- http://localhost:8080/alfresco
- acs7
- src/test/none
+ acs62
5.7.2
5.2.14.RELEASE
- 2.35
- 3.4.7
com.inteligr8
common-rest-client
- 2.0-SNAPSHOT
- ${jaxrs.impl}
+ 2.0.1-cxf
com.inteligr8.alfresco
acs-public-rest-api
- 2.0-SNAPSHOT
- ${acs.platform.tag}
+ 2.0.1-${acs.platform.tag}
+ provided
org.junit.jupiter
@@ -96,37 +89,6 @@
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.2.0
-
-
- add-jaxrs-src
- add-source
-
-
- src/main/${jaxrs.impl}
-
-
-
-
- add-test-src
- add-test-source
-
-
- src/test/${jaxrs.impl}
-
-
-
-
-
-
- maven-jar-plugin
-
- ${jaxrs.impl}
-
-
maven-surefire-plugin
3.0.0-M5
diff --git a/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java b/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java
deleted file mode 100644
index bfd1b40..0000000
--- a/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import com.inteligr8.rs.ClientCxfConfiguration;
-
-/**
- * This class provides a POJO & Spring-based implementation of the
- * ClientCxfConfiguration interface. You can use it outside of the Spring
- * context, but you will need the spring-context and spring-beans libraries in
- * your non-Spring application.
- *
- * @author brian@inteligr8.com
- */
-@Configuration
-@ComponentScan
-public class AcsClientCxfConfiguration extends AcsClientConfiguration implements ClientCxfConfiguration {
-
- @Value("${content.service.cxf.defaultBusEnabled:true}")
- private boolean defaultBusEnabled;
-
- public boolean isDefaultBusEnabled() {
- return this.defaultBusEnabled;
- }
-
- public void setDefaultBusEnabled(boolean defaultBusEnabled) {
- this.defaultBusEnabled = defaultBusEnabled;
- }
-
-}
diff --git a/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java b/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
deleted file mode 100644
index 4931c45..0000000
--- a/src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.rs.ClientCxfImpl;
-
-/**
- * This class provides a POJO & Spring-based implementation of the Apache
- * CXF client. You can use it outside of the Spring context, but you will need
- * the spring-context and spring-beans libraries in your non-Spring
- * application.
- *
- * @author brian@inteligr8.com
- */
-@Component("acs.client.cxf")
-@Lazy
-public class AcsClientCxfImpl extends ClientCxfImpl {
-
- /**
- * This constructor is for Spring or POJO use
- */
- @Autowired
- public AcsClientCxfImpl(AcsClientCxfConfiguration config) {
- super(config);
- }
-
-}
diff --git a/src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java b/src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java
deleted file mode 100644
index 9144701..0000000
--- a/src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-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 ACS
- * Public ReST API.
- *
- * @author brian@inteligr8.com
- */
-@Component("acs.api.cxf")
-@Lazy
-public class AcsPublicRestApiCxfImpl extends AcsPublicRestApiImpl implements AcsPublicRestCxfApi {
-
- /**
- * This constructor is for Spring or POJO use
- */
- @Autowired
- public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
- super(client);
- }
-
-}
diff --git a/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java b/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java
deleted file mode 100644
index b70cbc5..0000000
--- a/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import com.inteligr8.rs.ClientJerseyConfiguration;
-
-/**
- * This class provides a POJO & Spring-based implementation of the
- * ClientJerseyConfiguration interface. You can use it outside of the Spring
- * context, but you will need the spring-context and spring-beans libraries in
- * your non-Spring application.
- *
- * @author brian@inteligr8.com
- */
-@Configuration
-@ComponentScan
-public class AcsClientJerseyConfiguration extends AcsClientConfiguration implements ClientJerseyConfiguration {
-
- @Value("${content.service.jersey.putBodyRequired:true}")
- private boolean putBodyRequired;
-
- public boolean isPutBodyRequired() {
- return this.putBodyRequired;
- }
-
- public void setPutBodyRequired(boolean putBodyRequired) {
- this.putBodyRequired = putBodyRequired;
- }
-
-}
diff --git a/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java b/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
deleted file mode 100644
index d7f31a1..0000000
--- a/src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.rs.ClientJerseyImpl;
-
-/**
- * This class provides a POJO & Spring-based implementation of the Jersey
- * client configured for APS. You can use it outside of the Spring context,
- * but you will need the spring-context and spring-beans libraries in your
- * non-Spring application.
- *
- * @author brian@inteligr8.com
- */
-@Component("acs.client.jersey")
-@Lazy
-public class AcsClientJerseyImpl extends ClientJerseyImpl {
-
- /**
- * This constructor is for Spring and POJO use
- */
- @Autowired
- public AcsClientJerseyImpl(AcsClientJerseyConfiguration config) {
- super(config);
- }
-
-}
diff --git a/src/main/jersey/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java b/src/main/jersey/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java
deleted file mode 100644
index 2ef9c15..0000000
--- a/src/main/jersey/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-/**
- * This class provides the Jersey client to the JAX-RS API for the ACS Public
- * ReST API.
- *
- * @author brian@inteligr8.com
- */
-@Component("acs.api.jersey")
-@Lazy
-public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApiImpl implements AcsPublicRestJerseyApi {
-
- /**
- * This constructor is for Spring or POJO use
- */
- @Autowired
- public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
- super(client);
- }
-
-}
diff --git a/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
deleted file mode 100644
index 018e11f..0000000
--- a/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
\ No newline at end of file
diff --git a/src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java b/src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
deleted file mode 100644
index a37ad9c..0000000
--- a/src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
-public class ConnectionCxfClientIT extends ConnectionClientIT {
-
- @Autowired
- @Qualifier("acs.api.cxf")
- private AcsPublicRestApiImpl api;
-
- @Override
- public AcsPublicRestApi getApi() {
- return this.api;
- }
-
- @Override
- public ClientConfiguration getConfiguration() {
- return this.api.getClient().getConfig();
- }
-
-}
diff --git a/src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java b/src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java
deleted file mode 100644
index f088422..0000000
--- a/src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Collections;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.alfresco.acs.model.Node;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
-public class CxfUploadIT extends UploadIT {
-
- @Autowired
- @Qualifier("acs.api.cxf")
- private AcsPublicRestApiCxfImpl api;
-
- @Override
- public AcsPublicRestApi getApi() {
- return this.api;
- }
-
- @Override
- public ClientConfiguration getConfiguration() {
- return this.api.getClient().getConfig();
- }
-
- @Test
- @EnabledIf("hostExists")
- public void uploadFile() throws IOException {
- String folderNodeId = this.getSharedFolder();
-
- NodeBodyCreate nodeBody = new NodeBodyCreate().nodeType("trx:transferReport").name("test-name1.txt")
- .properties(Collections.singletonMap("cm:author", "Brian"));
-
- ByteArrayInputStream istream = new ByteArrayInputStream("This is a test".getBytes());
- NodeBodyCreateMultipartCxf body = NodeBodyCreateMultipartCxf.from(nodeBody, "test-name2.txt", istream, true, null, null);
-
- Node newNode = this.api.getNodesExtApi().createNode(folderNodeId, body).getEntry();
- Assertions.assertNotNull(newNode);
- Assertions.assertNotNull(newNode.getId());
- Assertions.assertEquals(folderNodeId, newNode.getParentId());
- Assertions.assertEquals(nodeBody.getNodeType(), newNode.getNodeType());
- Assertions.assertTrue(newNode.getName().startsWith("test-name1"));
- }
-
-}
diff --git a/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
deleted file mode 100644
index 48b9fa5..0000000
--- a/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
+++ /dev/null
@@ -1 +0,0 @@
-org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file
diff --git a/src/test/jersey/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java b/src/test/jersey/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
deleted file mode 100644
index e282036..0000000
--- a/src/test/jersey/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
-public class ConnectionJerseyClientIT extends ConnectionClientIT {
-
- @Autowired
- @Qualifier("acs.api.jersey")
- private AcsPublicRestApiImpl api;
-
- @Override
- public AcsPublicRestApi getApi() {
- return this.api;
- }
-
- @Override
- public ClientConfiguration getConfiguration() {
- return this.api.getClient().getConfig();
- }
-
-}
diff --git a/src/test/jersey/com/inteligr8/alfresco/acs/JerseyUploadIT.java b/src/test/jersey/com/inteligr8/alfresco/acs/JerseyUploadIT.java
deleted file mode 100644
index f3a1341..0000000
--- a/src/test/jersey/com/inteligr8/alfresco/acs/JerseyUploadIT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.inteligr8.alfresco.acs;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Collections;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.alfresco.acs.model.Node;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartJersey;
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
-public class JerseyUploadIT extends UploadIT {
-
- @Autowired
- @Qualifier("acs.api.jersey")
- private AcsPublicRestApiJerseyImpl api;
-
- @Override
- public AcsPublicRestApi getApi() {
- return this.api;
- }
-
- @Override
- public ClientConfiguration getConfiguration() {
- return this.api.getClient().getConfig();
- }
-
- @Test
- @EnabledIf("hostExists")
- public void uploadFile() throws IOException, ParseException {
- String folderNodeId = this.getSharedFolder();
-
- NodeBodyCreate nodeBody = new NodeBodyCreate().nodeType("trx:transferReport").name("test-name1.txt")
- .properties(Collections.singletonMap("cm:author", "Brian"));
-
- ByteArrayInputStream istream = new ByteArrayInputStream("This is a test".getBytes());
- NodeBodyCreateMultipartJersey body = NodeBodyCreateMultipartJersey.from(nodeBody, "test-name2.txt", istream, true, null, null);
-
- Node newNode = this.api.getNodesExtApi().createNode(folderNodeId, body).getEntry();
- Assertions.assertNotNull(newNode);
- Assertions.assertNotNull(newNode.getId());
- Assertions.assertEquals(folderNodeId, newNode.getParentId());
- Assertions.assertEquals(nodeBody.getNodeType(), newNode.getNodeType());
- Assertions.assertTrue(newNode.getName().startsWith("test-name1"));
- }
-
-}