updated APS/activiti archetypes (3f06b173) · Commits · Inteligr8 / ootbee-beedk

beedk-activiti-ext-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -6,15 +6,6 @@
		<requiredProperty key="shortname">
		<validationRegex>[A-Za-z0-9]+</validationRegex>
		</requiredProperty>
		<requiredProperty key="dockerRegistryHost">
		<defaultValue>quay.io</defaultValue>
		</requiredProperty>
		<requiredProperty key="dockerImagePrefix">
		<defaultValue>local</defaultValue>
		</requiredProperty>
		<requiredProperty key="beedkVersion">
		<defaultValue>[1.0.0,2.0.0)</defaultValue>
		</requiredProperty>
		</requiredProperties>
		<fileSets>
		<fileSet filtered="true" packaged="true">

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/.gitignore

+1 −1

Original line number	Diff line number	Diff line
		# Maven
		/target
		target/
		pom.xml.versionsBackup

		# Eclipse

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/pom.xml

+45 −22

Original line number	Diff line number	Diff line
		@@ -12,14 +12,31 @@

		<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<maven.compiler.source>8</maven.compiler.source>
		<maven.compiler.target>8</maven.compiler.target>
		<maven.compiler.source>11</maven.compiler.source>
		<maven.compiler.target>11</maven.compiler.target>
		<maven.compiler.release>11</maven.compiler.release>

		<activiti.version>7.11.0</activiti.version>
		<spring.version>5.3.29</spring.version>
		<!-- This extension will work with all versions of Activiti, as long as the integration point method signatures remain the same. -->
		<!-- These versions were the latest at the time this archetype was last updated. -->
		<activiti.version>8.8.0</activiti.version>
		<spring.version>6.2.14</spring.version>

		<!-- The following are only used for RAD and integration testing -->
		<!--
		<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
		<aps.war.version>26.1.0</aps.war.version>
		<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
		-->
		</properties>

		<dependencies>
		<!-- Activiti provided libraries -->
		<dependency>
		<groupId>org.springframework</groupId>
		<artifactId>spring-context</artifactId>
		<version>${spring.version}</version>
		<scope>provided</scope>
		</dependency>
		<dependency>
		<groupId>org.activiti</groupId>
		<artifactId>activiti-engine</artifactId>
		@@ -27,9 +44,9 @@
		<scope>provided</scope>
		</dependency>
		<dependency>
		<groupId>org.springframework</groupId>
		<artifactId>spring-context</artifactId>
		<version>${spring.version}</version>
		<groupId>jakarta.annotation</groupId>
		<artifactId>jakarta.annotation-api</artifactId>
		<version>3.0.0</version>
		<scope>provided</scope>
		</dependency>
		</dependencies>
		@@ -39,7 +56,7 @@
		<plugin>
		<groupId>io.repaint.maven</groupId>
		<artifactId>tiles-maven-plugin</artifactId>
		<version>2.40</version>
		<version>2.43</version>
		<extensions>true</extensions>
		<configuration>
		<tiles>
		@@ -53,24 +70,30 @@

		<profiles>
		<profile>
		<id>rad</id>
		<id>wsl</id>
		<activation>
		<property>
		<name>rad</name>
		</property>
		<os>
		<family>windows</family>
		</os>
		</activation>
		<properties>
		<aps.version>2.4.6</aps.version>
		<!-- add properties here -->
		<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
		<!-- Using WSL is slower than native containers -->
		<!-- Adjust this timeout for slow computers, VPN, or other slow or high latency scenarios -->
		<aps.timeout>120000</aps.timeout>
		</properties>
		</profile>
		</profiles>

		<repositories>
		<!-- Used by the Activiti dependencies -->
		<repository>
		<id>activiti-public-releases</id>
		<url>https://artifacts.alfresco.com/nexus/repository/activiti-releases</url>
		</repository>
		<!-- Used when performing optional RAD and integration testing -->
		<repository>
		<id>alfresco-public</id>
		<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
		<id>activiti-enterprise-releases</id>
		<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
		</repository>
		</repositories>
		</project>
		No newline at end of file

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/rad.ps1

+25 −23

Original line number	Diff line number	Diff line
		$script:MAVEN_CMD="mvn"
		$script:CONTAINERD_CMD="docker"

		function discoverArtifactId {
		$script:ARTIFACT_ID=(mvn -q -Dexpression=project"."artifactId -DforceStdout help:evaluate)
		$script:ARTIFACT_ID=(Invoke-Expression "${MAVEN_CMD} -q -Dexpression=project"."artifactId -DforceStdout help:evaluate")
		}

		function rebuild {
		echo "Rebuilding project ..."
		mvn process-test-classes
		Invoke-Expression "${MAVEN_CMD} process-test-classes"
		}

		function start_ {
		echo "Rebuilding project and starting Docker containers to support rapid application development ..."
		mvn -Drad process-test-classes
		function start_containers {
		echo "Rebuilding project and starting containers to support rapid application development ..."
		Invoke-Expression "${MAVEN_CMD} -Drad process-test-classes"
		}

		function start_log {
		echo "Rebuilding project and starting Docker containers to support rapid application development ..."
		mvn -Drad "-Ddocker.showLogs" process-test-classes
		function start_containers_verbose {
		echo "Rebuilding project and starting containers to support rapid application development ..."
		Invoke-Expression "${MAVEN_CMD} -Drad -Ddocker'.'showLogs process-test-classes"
		}

		function stop_ {
		function stop_containers {
		discoverArtifactId
		echo "Stopping Docker containers that supported rapid application development ..."
		docker container ls --filter name="^/${ARTIFACT_ID}"
		Invoke-Expression "${CONTAINERD_CMD} container ls --filter name=${ARTIFACT_ID}-*"
		echo "Stopping containers ..."
		docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
		Invoke-Expression "${CONTAINERD_CMD} container stop (Invoke-Expression '${CONTAINERD_CMD} container ls -q --filter name=${ARTIFACT_ID}-*')"
		echo "Removing containers ..."
		docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
		Invoke-Expression "${CONTAINERD_CMD} container rm (Invoke-Expression '${CONTAINERD_CMD} container ls -aq --filter name=${ARTIFACT_ID}-*')"
		}

		function tail_logs {
		function tail_container {
		param (
		$container
		)

		discoverArtifactId
		docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
		Invoke-Expression "${CONTAINERD_CMD} container logs -f (Invoke-Expression '${CONTAINERD_CMD} container ls -q --filter name=${ARTIFACT_ID}-${container}')"
		}

		function list {
		function list_containers {
		discoverArtifactId
		docker container ls --filter name="^/${ARTIFACT_ID}"
		Invoke-Expression "${CONTAINERD_CMD} container ls --filter name=${ARTIFACT_ID}-*"
		}

		switch ($args[0]) {
		"start" {
		start_
		start_containers
		}
		"start_log" {
		start_log
		start_containers_verbose
		}
		"stop" {
		stop_
		stop_containers
		}
		"restart" {
		stop_
		start_
		stop_containers
		start_containers
		}
		"rebuild" {
		rebuild
		}
		"tail" {
		tail_logs $args[1]
		tail_container $args[1]
		}
		"containers" {
		list
		list_containers
		}
		default {
		echo "Usage: .\rad.ps1 [ start \| start_log \| stop \| restart \| rebuild \| tail {container} \| containers ]"

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/rad.sh

+26 −23

Original line number	Diff line number	Diff line
		#!/bin/sh

		MAVEN_CMD=mvn
		CONTAINERD_CMD=docker

		discoverArtifactId() {
		local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
		local ARTIFACT_ID=`${MAVEN_CMD} -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
		}

		rebuild() {
		echo "Rebuilding project ..."
		mvn process-test-classes
		${MAVEN_CMD} process-test-classes
		}

		start() {
		echo "Rebuilding project and starting Docker containers to support rapid application development ..."
		mvn -Drad process-test-classes
		start_containers() {
		echo "Rebuilding project and starting containers to support rapid application development ..."
		${MAVEN_CMD} -Drad process-test-classes
		}

		start_log() {
		echo "Rebuilding project and starting Docker containers to support rapid application development ..."
		mvn -Drad -Ddocker.showLogs process-test-classes
		start_containers_verbose() {
		echo "Rebuilding project and starting containers to support rapid application development ..."
		${MAVEN_CMD} -Drad -Ddocker.showLogs process-test-classes
		}

		stop() {
		stop_containers() {
		discoverArtifactId
		echo "Stopping Docker containers that supported rapid application development ..."
		docker container ls --filter name="^/${ARTIFACT_ID}"
		${CONTAINERD_CMD} container ls --filter name=${ARTIFACT_ID}-*
		echo "Stopping containers ..."
		docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
		${CONTAINERD_CMD} container stop `${CONTAINERD_CMD} container ls -q --filter name=${ARTIFACT_ID}-*`
		echo "Removing containers ..."
		docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
		${CONTAINERD_CMD} container rm `${CONTAINERD_CMD} container ls -aq --filter name=${ARTIFACT_ID}-*`
		}

		tail_logs() {
		tail_container() {
		discoverArtifactId
		docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
		${CONTAINERD_CMD} container logs -f `${CONTAINERD_CMD} container ls -q --filter name=${ARTIFACT_ID}-$1`
		}

		list() {
		list_containers() {
		discoverArtifactId
		docker container ls --filter name="^/${ARTIFACT_ID}"
		${CONTAINERD_CMD} container ls --filter name=${ARTIFACT_ID}-*
		}

		case "$1" in
		start)
		start
		start_containers
		;;
		start_log)
		start_log
		start_containers_verbose
		;;
		stop)
		stop
		stop_containers
		;;
		restart)
		stop
		start
		stop_containers
		start_containers
		;;
		rebuild)
		rebuild
		;;
		tail)
		tail_logs $2
		tail_container $2
		;;
		containers)
		list
		list_containers
		;;
		*)
		echo "Usage: ./rad.sh [ start \| start_log \| stop \| restart \| rebuild \| tail {container} \| containers ]"