Merge branch 'sdk-4.0' into sdk-4/acs-61-support (0d919027) · Commits · Inteligr8 / alfresco-sdk-deletion_scheduled-31

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat

+16 −4

Original line number	Diff line number	Diff line
		@@ -3,6 +3,14 @@

		SET COMPOSE_FILE_PATH=%CD%\target\classes\docker\docker-compose.yml

		IF [%M2_HOME%]==[] (
		SET MVN_EXEC=mvn
		)

		IF NOT [%M2_HOME%]==[] (
		SET MVN_EXEC=%M2_HOME%\bin\mvn
		)

		IF [%1]==[] (
		echo "Usage: %0 {build_start\|start\|stop\|purge\|tail\|reload_share\|reload_acs\|build_test\|test}"
		GOTO END
		@@ -50,6 +58,7 @@ IF %1==build_test (
		CALL :build
		CALL :start
		CALL :test
		CALL :tail_all
		CALL :down
		GOTO END
		)
		@@ -79,25 +88,28 @@ EXIT /B 0
		:build
		docker rmi alfresco-content-services-${rootArtifactId}:development
		docker rmi alfresco-share-${rootArtifactId}:development
		call mvn clean install -DskipTests
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:build_share
		docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
		docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
		docker rmi alfresco-share-${rootArtifactId}:development
		call mvn clean install -DskipTests -pl ${rootArtifactId}-share-jar
		call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar
		EXIT /B 0
		:build_acs
		docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
		docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
		docker rmi alfresco-content-services-${rootArtifactId}:development
		call mvn clean install -DskipTests -pl ${rootArtifactId}-platform-jar
		call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar
		EXIT /B 0
		:tail
		docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
		EXIT /B 0
		:tail_all
		docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
		EXIT /B 0
		:test
		call mvn verify -pl integration-tests
		call %MVN_EXEC% verify -pl integration-tests
		EXIT /B 0
		:purge
		docker volume rm ${rootArtifactId}-acs-volume

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh

+15 −4

Original line number	Diff line number	Diff line
		@@ -3,6 +3,12 @@

		export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml

		if [ -z "${symbol_dollar}{M2_HOME}" ]; then
		export MVN_EXEC="mvn"
		else
		export MVN_EXEC="${symbol_dollar}{M2_HOME}/bin/mvn"
		fi

		start() {
		docker volume create ${rootArtifactId}-acs-volume
		docker volume create ${rootArtifactId}-db-volume
		@@ -31,29 +37,33 @@ purge() {
		build() {
		docker rmi alfresco-content-services-${rootArtifactId}:development
		docker rmi alfresco-share-${rootArtifactId}:development
		mvn clean install -DskipTests=true
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true
		}

		build_share() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share
		yes \| docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share
		docker rmi alfresco-share-${rootArtifactId}:development
		mvn clean install -DskipTests=true -pl ${rootArtifactId}-share-jar
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar
		}

		build_acs() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs
		yes \| docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs
		docker rmi alfresco-content-services-${rootArtifactId}:development
		mvn clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar
		}

		tail() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f
		}

		tail_all() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all"
		}

		test() {
		mvn verify -pl integration-tests
		${symbol_dollar}MVN_EXEC verify -pl integration-tests
		}

		case "${symbol_dollar}1" in
		@@ -92,6 +102,7 @@ case "${symbol_dollar}1" in
		build
		start
		test
		tail_all
		down
		;;
		test)

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat

+14 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,14 @@

		SET COMPOSE_FILE_PATH=%CD%\target\classes\docker\docker-compose.yml

		IF [%M2_HOME%]==[] (
		SET MVN_EXEC=mvn
		)

		IF NOT [%M2_HOME%]==[] (
		SET MVN_EXEC=%M2_HOME%\bin\mvn
		)

		IF [%1]==[] (
		echo "Usage: %0 {build_start\|start\|stop\|purge\|tail\|build_test\|test}"
		GOTO END
		@@ -38,6 +46,7 @@ IF %1==build_test (
		CALL :build
		CALL :start
		CALL :test
		CALL :tail_all
		CALL :down
		GOTO END
		)
		@@ -60,13 +69,16 @@ EXIT /B 0
		EXIT /B 0
		:build
		docker rmi alfresco-content-services-${rootArtifactId}:development
		call mvn clean install -DskipTests
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:tail
		docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
		EXIT /B 0
		:tail_all
		docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
		EXIT /B 0
		:test
		call mvn verify
		call %MVN_EXEC% verify
		EXIT /B 0
		:purge
		docker volume rm ${rootArtifactId}-acs-volume

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh

+13 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,12 @@

		export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml

		if [ -z "${symbol_dollar}{M2_HOME}" ]; then
		export MVN_EXEC="mvn"
		else
		export MVN_EXEC="${symbol_dollar}{M2_HOME}/bin/mvn"
		fi

		start() {
		docker volume create ${rootArtifactId}-acs-volume
		docker volume create ${rootArtifactId}-db-volume
		@@ -22,15 +28,19 @@ purge() {

		build() {
		docker rmi alfresco-content-services-${rootArtifactId}:development
		mvn clean install -DskipTests=true
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true
		}

		tail() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f
		}

		tail_all() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all"
		}

		test() {
		mvn verify
		${symbol_dollar}MVN_EXEC verify
		}

		case "${symbol_dollar}1" in
		@@ -59,6 +69,7 @@ case "${symbol_dollar}1" in
		build
		start
		test
		tail_all
		down
		;;
		test)

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat

+15 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,14 @@

		SET COMPOSE_FILE_PATH=%CD%\target\classes\docker\docker-compose.yml

		IF [%M2_HOME%]==[] (
		SET MVN_EXEC=mvn
		)

		IF NOT [%M2_HOME%]==[] (
		SET MVN_EXEC=%M2_HOME%\bin\mvn
		)

		IF [%1]==[] (
		echo "Usage: %0 {build_start\|start\|stop\|purge\|tail\|reload_share\|build_test\|test}"
		GOTO END
		@@ -44,6 +52,7 @@ IF %1==build_test (
		CALL :build
		CALL :start
		CALL :test
		CALL :tail_all
		CALL :down
		GOTO END
		)
		@@ -70,19 +79,22 @@ EXIT /B 0
		:build
		docker rmi alfresco-content-services-${rootArtifactId}:development
		docker rmi alfresco-share-${rootArtifactId}:development
		call mvn clean install -DskipTests
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:build_share
		docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
		docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
		docker rmi alfresco-share-${rootArtifactId}:development
		call mvn clean install -DskipTests
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:tail
		docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
		EXIT /B 0
		:tail_all
		docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
		EXIT /B 0
		:test
		call mvn verify
		call %MVN_EXEC% verify
		EXIT /B 0
		:purge
		docker volume rm ${rootArtifactId}-acs-volume