Merge branch 'develop' into stable

This commit is contained in:
2021-06-01 17:07:39 -04:00
15 changed files with 276 additions and 7 deletions

View File

@@ -57,6 +57,8 @@
<skip>${skipTests}</skip>
<env>
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
<ENABLE_JDWP>false</ENABLE_JDWP>
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -203,7 +205,7 @@
<!-- versions -->
<acs-postgres.version>9.6</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
</properties>
</profile>
</profiles>

View File

@@ -49,6 +49,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| Maven Property | Required | Default | Description |
| -------------------------- |:--------:| --------------- | ----------- |
| `acs-platform.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `acs-platform.debugger.enabled` | | true | Enable the JDWP debugger. |
| `acs-platform.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-activemq.port` | | 8161 | The port to expose on `localhost` for the developer; not for other applications or users. |

View File

@@ -103,6 +103,8 @@
<run>
<env>
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
<ENABLE_JDWP>${acs-platform.debugger.enabled}</ENABLE_JDWP>
<ENABLE_HOTSWAP>${acs-platform.hotswap.enabled}</ENABLE_HOTSWAP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -230,6 +232,8 @@
<beedk.deploy.platform.warDirectory>${project.build.warDirectory}</beedk.deploy.platform.warDirectory>
<acs-platform.timeout>150000</acs-platform.timeout>
<acs-platform.memory>1g</acs-platform.memory>
<acs-platform.debugger.enabled>true</acs-platform.debugger.enabled>
<acs-platform.hotswap.enabled>true</acs-platform.hotswap.enabled>
<acs-api-explorer.war.groupId>org.alfresco</acs-api-explorer.war.groupId>
<acs-api-explorer.war.artifactId>api-explorer</acs-api-explorer.war.artifactId>
<acs-api-explorer.war.version>${acs-api-explorer.version}</acs-api-explorer.war.version>
@@ -247,7 +251,7 @@
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
<acs-postgres.version>9.6</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
</properties>
</profile>
</profiles>

View File

@@ -85,6 +85,10 @@
<alias>acs-share</alias>
<run>
<skip>${skipTests}</skip>
<env>
<ENABLE_JDWP>false</ENABLE_JDWP>
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
</env>
<ports>
<port>${acs-share.port}:8080</port>
</ports>
@@ -148,7 +152,7 @@
<acs-share.port>8180</acs-share.port>
<!-- versions -->
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -53,6 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `alfresco.war.version` | *Maybe* | *See Below* | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.<br/>*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* |
| `project.build.shareExtDirectory` | | `${project.build.directory}/ext/share` | An additional directory of JARs to add to the ACS Share at runtime. |
| `acs-platform.url` | | *See Below* | The URL of the backend ACS Platform to be used. |
| `acs-share.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `acs-share.debugger.enabled` | | true | Enable the JDWP debugger. |
| `acs-share.port` | | 8180 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-share.timeout` | | 45000 | The time to wait for the startup to complete, in milliseconds. |

View File

@@ -93,6 +93,10 @@
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
<alias>acs-share</alias>
<run>
<env>
<ENABLE_JDWP>${acs-share.debugger.enabled}</ENABLE_JDWP>
<ENABLE_HOTSWAP>${acs-share.hotswap.enabled}</ENABLE_HOTSWAP>
</env>
<ports>
<port>${acs-share.port}:8080</port>
<port>${acs-share.debugger.port}:8000</port>
@@ -140,6 +144,8 @@
<properties>
<!-- configurable -->
<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>
<acs-share.hotswap.enabled>true</acs-share.hotswap.enabled>
<acs-share.debugger.enabled>true</acs-share.debugger.enabled>
<acs-share.debugger.port>8100</acs-share.debugger.port>
<acs-share.timeout>45000</acs-share.timeout>
<project.build.shareExtDirectory>${project.build.directory}/ext/share</project.build.shareExtDirectory>
@@ -148,7 +154,7 @@
<acs-share.port>8180</acs-share.port>
<!-- versions -->
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -1,4 +1,4 @@
# BeeDK Abstract ACS Platform Maven Tile for RAD
# BeeDK APS Extension Maven Tile for RAD
This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk). It is considered to be part of the **Public API** of the BeeDK.
@@ -52,6 +52,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `aps.war.groupId` | | `org.alfresco` | |
| `aps.war.artifactId` | | `activiti-app` | |
| `aps.war.version` | **Yes** | | |
| `aps.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `aps.debugger.enabled` | | true | Enable the JDWP debugger. |
| `aps.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps.debugger.port` | | 8000 | The port to expose on `localhost` for the developer; not for other applications or users. |

View File

@@ -73,6 +73,8 @@
<run>
<env>
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -147,6 +149,8 @@
<beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory>
<aps.timeout>60000</aps.timeout>
<aps.memory>512m</aps.memory>
<aps.hotswap.enabled>true</aps.hotswap.enabled>
<aps.debugger.enabled>true</aps.debugger.enabled>
<!-- ports -->
<aps-postgres.port>5432</aps-postgres.port>
@@ -155,7 +159,7 @@
<!-- versions -->
<aps.version>1.11.1.1</aps.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- results -->
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

9
beedk-aps-rad-tile/.gitignore vendored Normal file
View File

@@ -0,0 +1,9 @@
# Eclipse
.project
.classpath
.settings
# Maven
pom.xml.versionsBackup
target

View File

@@ -0,0 +1,65 @@
# BeeDK APS Application Maven Tile for RAD
This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk). It is considered to be part of the **Public API** of the BeeDK.
## Purpose
This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for rapid application development of any application integrating with APS.
## Usage
To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet. Do not forget the `extensions` element in the *plugin* configuration.
```xml
<project ...>
...
<build>
...
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>[2.0,3.0)</version>
<extensions>true</extensions>
<configuration>
<tiles>
...
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-rad-tile -->
<tile>com.inteligr8.ootbee:beedk-aps-rad-tile:[1.0.0,2.0.0)</tile>
</tiles>
</configuration>
</plugin>
...
</plugins>
...
</build>
...
</project>
```
See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities.
## Configuration
In your Maven project, set the following properties to define the behavior of this Maven Tile. Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile.
### Public API
The following properties are intended to be exposed by inheriting Public API Maven Tiles.
| Maven Property | Required | Default | Description |
| -------------------------- |:--------:| --------------- | ----------- |
| `aps.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps.timeout` | | 60000 | The time to wait for the startup to complete, in milliseconds. |
| `aps.version` | | 1.11.1.1 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
### Other APIs
Additional less important configurations are inherited from the following Maven Tiles.
* [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile)
## Results
The APS Application and database components will be started during the `process-classes` Maven phase.

View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-aps-rad-tile</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>tile</packaging>
<name>Order of the Bee Development Kit: RAD for APS</name>
<scm>
<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
</scm>
<organization>
<name>Order of the Bee</name>
<url>https://orderofthebee.net</url>
</organization>
<developers>
<developer>
<name>Brian Long</name>
<email>brian@inteligr8.com</email>
<organization>Inteligr8</organization>
<organizationUrl>https://www.inteligr8.com</organizationUrl>
<url>https://twitter.com/brianmlong</url>
</developer>
</developers>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.20</version>
<extensions>true</extensions>
<configuration>
<filtering>true</filtering>
<tiles>
<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>

114
beedk-aps-rad-tile/tile.xml Normal file
View File

@@ -0,0 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
<profiles>
<profile>
<id>rad-aps</id>
<activation>
<property>
<name>rad</name>
</property>
</activation>
<build>
<plugins>
<!-- Using Docker for ACS Search -->
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${beedk.plugins.fabric8.docker.version}</version>
<executions>
<execution>
<id>run-aps</id>
<phase>process-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>
<image>
<name>postgres:${aps-postgres.version}</name>
<alias>aps-db</alias>
<run>
<env>
<POSTGRES_PASSWORD>alfresco</POSTGRES_PASSWORD>
<POSTGRES_USER>alfresco</POSTGRES_USER>
<POSTGRES_DB>activiti</POSTGRES_DB>
</env>
<network>
<mode>custom</mode>
<name>${project.artifactId}</name>
</network>
</run>
</image>
<image>
<name>alfresco/process-services:${aps.version}</name>
<alias>aps-app</alias>
<run>
<env>
<ACTIVITI_DATASOURCE_USERNAME>alfresco</ACTIVITI_DATASOURCE_USERNAME>
<ACTIVITI_DATASOURCE_PASSWORD>alfresco</ACTIVITI_DATASOURCE_PASSWORD>
<ACTIVITI_DATASOURCE_DRIVER>org.postgresql.Driver</ACTIVITI_DATASOURCE_DRIVER>
<ACTIVITI_HIBERNATE_DIALECT>org.hibernate.dialect.PostgreSQLDialect</ACTIVITI_HIBERNATE_DIALECT>
<ACTIVITI_DATASOURCE_URL>jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti?characterEncoding=UTF-8</ACTIVITI_DATASOURCE_URL>
</env>
<ports>
<port>${aps.port}:8080</port>
</ports>
<volumes>
<bind>
<volume>@user.home@/alfresco/license/aps:/root/.activiti/enterprise-license:ro</volume>
</bind>
</volumes>
<dependsOn>
<container>aps-db</container>
</dependsOn>
<network>
<mode>custom</mode>
<name>${project.artifactId}</name>
</network>
</run>
</image>
</images>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- allow downstream tiles to default this before this tile does -->
<profile>
<id>tomcat-opts-unspecified</id>
<activation>
<property>
<name>!aps.tomcat.opts</name>
</property>
</activation>
<properties>
<aps.tomcat.opts></aps.tomcat.opts>
</properties>
</profile>
<profile>
<id>default-props</id>
<activation>
<property>
<name>!some-prop-that-never-exists</name>
</property>
</activation>
<properties>
<!-- ports -->
<aps.port>8080</aps.port>
<!-- versions -->
<aps-postgres.version>9.6</aps-postgres.version>
<aps.version>1.11.1.1</aps.version>
</properties>
</profile>
</profiles>
<tiles>
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-run-tile -->
<tile>@project.groupId@:beedk-run-tile:@project.version@</tile>
</tiles>
</project>

View File

@@ -57,6 +57,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `ate.app.className` | **Yes** | | The Java class name of the @SpringBootApplication annotated class. |
| `ate.docker.image.name` | **Yes** | | The Docker image name of the ATE, including the Docker registry host if applicable. |
| `ate.docker.image.tag` | | `latest` | The Docker image tag (version) of the ATE. |
| `ate.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `ate.debugger.enabled` | | true | Enable the JDWP debugger. |
| `ate.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications. |
| `ate.debugger.port` | | 8001 | The port to expose on `localhost` for the developer; not for other applications. |
| `ate.timeout` | | 20000 | The time to wait for the startup to complete, in milliseconds. |

View File

@@ -49,6 +49,8 @@
<run>
<env>
<JAVA_CLASS>${ate.app.className}</JAVA_CLASS>
<ENABLE_HOTSWAP>${ate.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${ate.debugger.enabled}</ENABLE_JDWP>
</env>
<ports>
<port>${ate.port}:8090</port>
@@ -94,12 +96,14 @@
<!-- configurable -->
<ate.docker.image.tag>latest</ate.docker.image.tag>
<ate.port>8090</ate.port>
<ate.hotswap.enabled>true</ate.hotswap.enabled>
<ate.debugger.enabled>true</ate.debugger.enabled>
<ate.debugger.port>8001</ate.debugger.port>
<ate.timeout>20000</ate.timeout>
<beedk.deploy.ate.extDirectory>${project.build.directory}/libs</beedk.deploy.ate.extDirectory>
<!-- versions -->
<java-dcevm-hotswap.version>11.0.10-1.4.1</java-dcevm-hotswap.version>
<java-dcevm-hotswap.version>11.0.11-1.4.1</java-dcevm-hotswap.version>
</properties>
</profile>
</profiles>

View File

@@ -49,6 +49,7 @@
<module>beedk-acs-share-self-rad-tile</module>
<module>beedk-ate-self-rad-tile</module>
<module>beedk-ate-sibling-rad-tile</module>
<module>beedk-aps-rad-tile</module>
<module>beedk-aps-ext-rad-tile</module>
<module>beedk-acs-search-it-tile</module>