Commit 417c4199 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 669f1e69 d80c6b94

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1

+9 −1
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ function start_ { 
	mvn -Drad process-classes

}



function start_log {

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

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

}



function stop_ {

	discoverArtifactId

	echo "Stopping Docker containers that supported rapid application development ..."
@@ -41,6 +46,9 @@ switch ($args[0]) { 
	"start" {

		start_

	}

	"start_log" {

		start_log

	}

	"stop" {

		stop_

	}
@@ -58,7 +66,7 @@ switch ($args[0]) { 
		list

	}

	default {

		echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]"

		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"

	}

}

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh

+10 −2
Original line number Diff line number Diff line 
#!/bin/sh



discoverArtifactId() {

	ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null`

	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`

}



rebuild() {
@@ -14,6 +14,11 @@ start() { 
	mvn -Drad process-classes

}



start_log() {

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

	mvn -Drad -Ddocker.showLogs process-classes

}



stop() {

	discoverArtifactId

	echo "Stopping Docker containers that supported rapid application development ..."
@@ -38,6 +43,9 @@ case "$1" in 
	start)

		start

		;;

	start_log)

		start_log

		;;

	stop)

		stop

		;;
@@ -55,7 +63,7 @@ case "$1" in 
		list

		;;

	*)

		echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]"

		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"

		exit 1

esac

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java→beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleEarlyComponent.java

+1 −1
Original line number Diff line number Diff line 
package ${package}.annotation;

package ${package}.spring;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java→beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleLateComponent.java

+1 −1
Original line number Diff line number Diff line 
package ${package}.annotation;

package ${package}.spring;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"

		xmlns:cm="http://www.alfresco.org/model/content/1.0"

		xmlns:bfs="http://fiscal.treasury.gov/alfresco/model/common/1.0">



	<cm:folder>

		<cm:name>Example Folder</cm:name>

	</cm:folder>

</view:view>