Commit 5728b2a9 authored by Brian Long's avatar Brian Long
Browse files

split aspectj management; refactored

parent 85ff3650

pom.xml

+11 −4
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 


		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>

		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>

		<aspectj.version>1.9.4</aspectj.version>

		<acs-platform.tomcat.opts>-javaagent:/var/lib/tomcat/dev/lib/aspectjweaver-${aspectj.version}.jar</acs-platform.tomcat.opts>

	</properties>



	<dependencyManagement>
@@ -58,6 +60,11 @@ 
			<artifactId>alfresco-repository</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

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

			<artifactId>aspectj-platform-module</artifactId>

			<version>1.0-SNAPSHOT</version>

		</dependency>

	</dependencies>



	<build>
@@ -65,16 +72,16 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.26</version>

				<version>2.33</version>

				<extensions>true</extensions>

				<configuration>

					<tiles>

						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-rad-tile -->

						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-rad-tile:[1.0.0,2.0.0)</tile>

						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-rad-tile:[1.0.0,1.1.0)</tile>

						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-tile -->

						<tile>com.inteligr8.ootbee:beedk-acs-platform-module-tile:[1.0.0,2.0.0)</tile>

						<tile>com.inteligr8.ootbee:beedk-acs-platform-module-tile:[1.0.0,1.1.0)</tile>

						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile -->

						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-it-tile:[1.0.0,2.0.0)</tile>

						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-it-tile:[1.0.0,1.1.0)</tile>

					</tiles>

				</configuration>

			</plugin>

rad.sh

+3 −3
Original line number Diff line number Diff line
@@ -6,17 +6,17 @@ discoverArtifactId() { 


rebuild() {

	echo "Rebuilding project ..."

	mvn process-classes

	mvn process-test-classes

}



start() {

	echo "Rebuilding project and starting Docker containers to support rapid application development ..."

	mvn -Drad process-classes

	mvn -Drad process-test-classes

}



start_log() {

	echo "Rebuilding project and starting Docker containers to support rapid application development ..."

	mvn -Drad -Ddocker.showLogs process-classes

	mvn -Drad -Ddocker.showLogs process-test-classes

}



stop() {

src/main/java/com/inteligr8/alfresco/annotations/IfAspect.java→src/main/java/com/inteligr8/alfresco/annotations/IfNodeHasAspect.java

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import java.lang.annotation.Target; 
	ElementType.METHOD,

	ElementType.PARAMETER

})

public @interface IfAspect {

public @interface IfNodeHasAspect {

	

	String aspect() default "";

src/main/java/com/inteligr8/alfresco/annotations/IfNodeType.java→src/main/java/com/inteligr8/alfresco/annotations/IfNodeOfType.java

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import java.lang.annotation.Target; 
	ElementType.METHOD,

	ElementType.PARAMETER

})

public @interface IfNodeType {

public @interface IfNodeOfType {

	

	String type() default "";

src/main/java/com/inteligr8/alfresco/annotations/AspectConstrainable.java→src/main/java/com/inteligr8/alfresco/annotations/NodeAspectConstrainable.java

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import org.alfresco.service.namespace.QNamePattern; 
import org.alfresco.service.namespace.RegexQNamePattern;

import org.springframework.beans.factory.BeanNameAware;



public interface AspectConstrainable extends BeanNameAware {

public interface NodeAspectConstrainable extends BeanNameAware {

	

	String getBeanName();