Compare commits
No commits in common. "develop-cxf" and "develop" have entirely different histories.
develop-cx
...
develop
40
pom.xml
40
pom.xml
@ -5,10 +5,10 @@
|
|||||||
|
|
||||||
<groupId>com.inteligr8.alfresco</groupId>
|
<groupId>com.inteligr8.alfresco</groupId>
|
||||||
<artifactId>aps-public-rest-client</artifactId>
|
<artifactId>aps-public-rest-client</artifactId>
|
||||||
<version>3.0-SNAPSHOT-cxf</version>
|
<version>3.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<name>Alfresco Process Services ReST API Client for Java</name>
|
<name>Alfresco Process Services ReST API Client for Java</name>
|
||||||
<description>An APS Client library for building CXF-based REST API clients</description>
|
<description>An APS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
|
||||||
<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
|
<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
@ -45,14 +45,13 @@
|
|||||||
|
|
||||||
<junit.version>5.10.0</junit.version>
|
<junit.version>5.10.0</junit.version>
|
||||||
<spring.version>6.0.19</spring.version>
|
<spring.version>6.0.19</spring.version>
|
||||||
<cxf.version>4.0.2</cxf.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.inteligr8</groupId>
|
<groupId>com.inteligr8</groupId>
|
||||||
<artifactId>common-rest-client</artifactId>
|
<artifactId>common-rest-client</artifactId>
|
||||||
<version>3.0.0-cxf</version>
|
<version>3.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.inteligr8.alfresco</groupId>
|
<groupId>com.inteligr8.alfresco</groupId>
|
||||||
@ -84,43 +83,10 @@
|
|||||||
<version>2.20.0</version>
|
<version>2.20.0</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Apache CXF libraries -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.cxf</groupId>
|
|
||||||
<artifactId>cxf-rt-rs-client</artifactId>
|
|
||||||
<version>${cxf.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<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>
|
|
||||||
<goals><goal>add-source</goal></goals>
|
|
||||||
<configuration>
|
|
||||||
<sources>
|
|
||||||
<source>src/main/cxf</source>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>add-test-src</id>
|
|
||||||
<goals><goal>add-test-source</goal></goals>
|
|
||||||
<configuration>
|
|
||||||
<sources>
|
|
||||||
<source>src/test/cxf</source>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.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 ApsClientCxfConfiguration extends ApsClientConfiguration implements ClientCxfConfiguration {
|
|
||||||
|
|
||||||
@Value("${process.service.cxf.defaultBusEnabled:true}")
|
|
||||||
private boolean defaultBusEnabled;
|
|
||||||
|
|
||||||
public boolean isDefaultBusEnabled() {
|
|
||||||
return this.defaultBusEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDefaultBusEnabled(boolean defaultBusEnabled) {
|
|
||||||
this.defaultBusEnabled = defaultBusEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
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("aps.client.cxf")
|
|
||||||
@Lazy
|
|
||||||
public class ApsClientCxfImpl extends ClientCxfImpl {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This constructor is for Spring or POJO use
|
|
||||||
*/
|
|
||||||
@Autowired
|
|
||||||
public ApsClientCxfImpl(ApsClientCxfConfiguration config) {
|
|
||||||
super(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 APS
|
|
||||||
* Public ReST API.
|
|
||||||
*
|
|
||||||
* @author brian@inteligr8.com
|
|
||||||
*/
|
|
||||||
@Component("aps.api.cxf")
|
|
||||||
@Lazy
|
|
||||||
public class ApsPublicRestApiCxfImpl extends ApsPublicRestApiImpl implements ApsPublicRestCxfApi {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This constructor is for Spring or POJO use
|
|
||||||
*/
|
|
||||||
@Autowired
|
|
||||||
public ApsPublicRestApiCxfImpl(ApsClientCxfImpl client) {
|
|
||||||
super(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.junit.jupiter.api.BeforeAll;
|
|
||||||
|
|
||||||
import com.inteligr8.rs.ClientConfiguration;
|
|
||||||
|
|
||||||
public class ConnectionCxfClientPojoIT extends ConnectionClientIT {
|
|
||||||
|
|
||||||
private static ApsPublicRestApiImpl api;
|
|
||||||
|
|
||||||
@BeforeAll
|
|
||||||
public static void initClient() {
|
|
||||||
ApsClientCxfConfiguration config = new ApsClientCxfConfiguration();
|
|
||||||
config.setBaseUrl("http://localhost:8080/activiti-app");
|
|
||||||
config.setBasicAuthUsername("admin");
|
|
||||||
config.setBasicAuthPassword("admin");
|
|
||||||
|
|
||||||
api = new ApsPublicRestApiCxfImpl(
|
|
||||||
new ApsClientCxfImpl(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ApsPublicRestApiImpl getApi() {
|
|
||||||
return api;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ClientConfiguration getConfiguration() {
|
|
||||||
return api.getClient().getConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.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-oauth.properties"})
|
|
||||||
@SpringJUnitConfig(classes = {ApsClientCxfConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientCxfImpl.class})
|
|
||||||
public class ConnectionCxfClientSpringIT extends ConnectionClientIT {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
@Qualifier("aps.api.cxf")
|
|
||||||
private ApsPublicRestApiImpl api;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ApsPublicRestApiImpl getApi() {
|
|
||||||
return this.api;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ClientConfiguration getConfiguration() {
|
|
||||||
return this.api.getClient().getConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user