Commit 85318390 authored by Brian Long's avatar Brian Long
Browse files

remove CXF/Jersey from main develop

parent 2acf8114

pom.xml

+4 −42
Original line number Diff line number Diff line
@@ -43,30 +43,23 @@ 
		<maven.compiler.target>8</maven.compiler.target>

		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>



		<!-- If you want to build for your specific version, point to your own 

			installation -->

		<acs.baseUrl>http://localhost:8080/alfresco</acs.baseUrl>

		<acs.platform.tag>acs7</acs.platform.tag>

		<it.directory>src/test/none</it.directory>

		<acs.platform.tag>acs62</acs.platform.tag>



		<junit.version>5.7.2</junit.version>

		<spring.version>5.2.14.RELEASE</spring.version>

		<jersey.version>2.35</jersey.version>

		<cxf.version>3.4.7</cxf.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>2.0-SNAPSHOT</version>

			<classifier>${jaxrs.impl}</classifier>

			<version>2.0.1-cxf</version>

		</dependency>

		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>acs-public-rest-api</artifactId>

			<version>2.0-SNAPSHOT</version>

			<classifier>${acs.platform.tag}</classifier>

			<version>2.0.1-${acs.platform.tag}</version>

			<scope>provided</scope> <!-- explicitly, bring your own version -->

		</dependency>

		<dependency>

			<groupId>org.junit.jupiter</groupId>
@@ -96,37 +89,6 @@ 
	

	<build>

		<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/${jaxrs.impl}</source>

							</sources>

						</configuration>

					</execution>

					<execution>

						<id>add-test-src</id>

						<goals><goal>add-test-source</goal></goals>

						<configuration>

							<sources>

								<source>src/test/${jaxrs.impl}</source>

							</sources>

						</configuration>

					</execution>

				</executions>

			</plugin>

			<plugin>

				<artifactId>maven-jar-plugin</artifactId>

				<configuration>

					<classifier>${jaxrs.impl}</classifier>

				</configuration>

			</plugin>

			<plugin>

				<artifactId>maven-surefire-plugin</artifactId>

				<version>3.0.0-M5</version>

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
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 &amp; 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;

	}



}

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
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 &amp; 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);

	}



}

src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
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);

	}



}

src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
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 &amp; 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;

	}



}