Commit 89b616e1 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents e4438da5 eda288f6

pom.xml

+6 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	<scm>

		<connection>scm:git:https://bitbucket.org/inteligr8/model-share-activiti-app-ext.git</connection>

		<developerConnection>scm:git:git@bitbucket.org:inteligr8/model-share-activiti-app-ext.git</developerConnection>

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

		<url>https://bitbucket.org/inteligr8/model-share-activiti-app-ext</url>

	</scm>

	<organization>

		<name>Inteligr8</name>
@@ -62,6 +62,11 @@ 
					<groupId>org.alfresco.officeservices</groupId>

					<artifactId>aoservices</artifactId>

				</exclusion>

				<!-- includes an old version of spring which just causes problems and we dont' need it for the build' -->

				<exclusion>

					<groupId>org.springframework.security.oauth</groupId>

					<artifactId>spring-security-oauth2</artifactId>

				</exclusion>

			</exclusions>

		</dependency>

	</dependencies>

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

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package com.activiti.extension.conf; 


import org.springframework.context.annotation.ComponentScan;

import org.springframework.context.annotation.Configuration;

import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;



/**

 * A means for injecting packages to scan for the Spring context.
@@ -23,7 +24,10 @@ import org.springframework.context.annotation.Configuration; 
 * @author brian@inteligr8.com

 */

@Configuration

@ComponentScan(basePackages = "com.inteligr8.alfresco.activiti.share")

@ComponentScan(

    basePackages = "com.inteligr8.alfresco.activiti.share",

    nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class

)

public class ModelShareComponentScanner {



}