Commit 732f802e authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-aps20' into develop-acs21

parents 60c89853 3710aca8

pom.xml

+52 −2
Original line number Diff line number Diff line
@@ -8,7 +8,34 @@ 
	<version>1.1-SNAPSHOT-aps21</version>

	<packaging>jar</packaging>

	

	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS v2.1.x</name>

	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>

	<description>An Alfresco Process Service App v2.1.x extension providing the missing components for JAX-RS-based client libraries.</description>

	<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>



	<licenses>

		<license>

			<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>

			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>

		</license>

	</licenses>



	<scm>

		<connection>scm:git:https://bitbucket.org/inteligr8/cxf-activiti-ext.git</connection>

		<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-activiti-ext.git</developerConnection>

		<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>

	</scm>

	<organization>

		<name>Inteligr8</name>

		<url>https://www.inteligr8.com</url>

	</organization>

	<developers>

		<developer>

			<id>brian.long</id>

			<name>Brian Long</name>

			<email>brian@inteligr8.com</email>

			<url>https://twitter.com/brianmlong</url>

		</developer>

	</developers>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -129,7 +156,7 @@ 
			</dependency>

			

			<!-- ******************** -->

			<!-- APS v2.1.x specific -->

			<!-- APS v2.x specific -->



			<!-- APS provided libraries -->

			<dependency>
@@ -331,6 +358,29 @@ 
			</properties>

			<build>

				<plugins>

					<plugin>

						<artifactId>maven-source-plugin</artifactId>

						<executions>

							<execution>

								<id>source</id>

								<phase>package</phase>

								<goals><goal>jar-no-fork</goal></goals>

							</execution>

						</executions>

					</plugin>

					<plugin>

						<artifactId>maven-javadoc-plugin</artifactId>

						<executions>

							<execution>

								<id>javadoc</id>

								<phase>package</phase>

								<goals><goal>jar</goal></goals>

								<configuration>

									<show>public</show>

								</configuration>

							</execution>

						</executions>

					</plugin>

					<plugin>

						<artifactId>maven-gpg-plugin</artifactId>

						<executions>

src/main/java/com/activiti/extension/conf/CxfActivitiExtSpringComponentScanner.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ package com.activiti.extension.conf; 
import org.springframework.context.annotation.ComponentScan;

import org.springframework.context.annotation.Configuration;



/**

 * A means for injecting packages to scan for the Spring context.

 * 

 * @author brian@inteligr8.com

 */

@Configuration

@ComponentScan(basePackages = "${activiti-ext.scan.packages}")

public class CxfActivitiExtSpringComponentScanner {