Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 brian.long
|
df9363c357 | ||
|
brian.long
|
651086fcbd | ||
|
brian.long
|
24ce538e5a | ||
|
brian.long
|
c2556be18f | ||
|
brian.long
|
89c8386c8e | ||
|
brian.long
|
1ccff8d7f1 | ||
|
brian.long
|
906ad41928 | ||
|
brian.long
|
c2c7918fe3 | ||
|
brian.long
|
c97c80a5b6 | ||
|
brian.long
|
3f06b1738f | ||
|
brian.long
|
2cd0276915 | ||
|
brian.long
|
23c010b981 |
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<!-- This assures the parent properties override defaults in the tiles -->
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<!-- This assures the parent properties override defaults in the tiles -->
|
||||
|
||||
@@ -12,14 +12,15 @@
|
||||
<name>${shortname} ACS All-in-one Parent Project</name>
|
||||
|
||||
<properties>
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<alfresco.sdk.version>4.15.0</alfresco.sdk.version>
|
||||
<edition>community</edition>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
<alfresco.share.version>22.17</alfresco.share.version>
|
||||
<alfresco.platform.version>26.1.0</alfresco.platform.version>
|
||||
<alfresco.share.version>26.1.0</alfresco.share.version>
|
||||
|
||||
<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>
|
||||
</properties>
|
||||
|
||||
<modules>
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<!-- This assures the parent properties override defaults in the tiles -->
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<!-- This assures the parent properties override defaults in the tiles -->
|
||||
|
||||
+3
-4
@@ -16,9 +16,8 @@
|
||||
<name>${shortname} Alfresco T-Engine A</name>
|
||||
|
||||
<properties>
|
||||
<ats.version>2.3.6</ats.version>
|
||||
<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
|
||||
<activemq.version>5.15.8</activemq.version>
|
||||
<ats.version>5.2.5</ats.version>
|
||||
<spring-boot.version>3.5.7</spring-boot.version>
|
||||
|
||||
<docker.image.registry>${dockerRegistryHost}</docker.image.registry>
|
||||
<docker.image.name>${dockerImagePrefix}/${project.artifactId}</docker.image.name>
|
||||
@@ -53,7 +52,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<!-- This assures the parent properties override defaults in the tiles -->
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-it-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war</beedk.deploy.platform.warFile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-rad-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war</beedk.deploy.platform.warFile>
|
||||
|
||||
@@ -72,7 +72,7 @@ The following properties are only intended to be defined by BeeDK components.
|
||||
| `beedk.deploy.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-acs-search-it-tile) tile **AFTER** this tile. |
|
||||
| `beedk.deploy.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-acs-lts-it-tile) tile **AFTER** this tile. |
|
||||
| `beedk.deploy.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-ats-it-tile) tile **AFTER** this tile. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
|
||||
### Other APIs
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://git.inteligr8.com/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
|
||||
|
||||
<build>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${java.cacerts.directory}</directory>
|
||||
<filtering>false</filtering>
|
||||
<targetPath>${project.build.directory}/cacerts</targetPath>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.inteligr8</groupId>
|
||||
@@ -36,6 +43,7 @@
|
||||
<path>${beedk.deploy.platform.testClassesDirectory}</path>
|
||||
<path>${beedk.deploy.platform.extDirectory}</path>
|
||||
<path>${beedk.deploy.platform.dataDirectory}</path>
|
||||
<path>${project.build.directory}/cacerts</path>
|
||||
</paths>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -152,6 +160,7 @@
|
||||
<volumes>
|
||||
<bind>
|
||||
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
|
||||
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
|
||||
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
|
||||
<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
|
||||
@@ -227,6 +236,7 @@
|
||||
<volumes>
|
||||
<bind>
|
||||
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
|
||||
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
|
||||
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
|
||||
<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
@@ -375,6 +385,7 @@
|
||||
<acs-platform.memory>1g</acs-platform.memory>
|
||||
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
|
||||
<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>
|
||||
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
|
||||
|
||||
<!-- ports -->
|
||||
<acs-postgres.port>5432</acs-postgres.port>
|
||||
@@ -383,9 +394,9 @@
|
||||
<acs-platform-ha.port>8081</acs-platform-ha.port>
|
||||
|
||||
<!-- versions -->
|
||||
<acs-postgres.version>12</acs-postgres.version>
|
||||
<acs-activemq.version>5.18.4</acs-activemq.version>
|
||||
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||
<acs-postgres.version>15</acs-postgres.version>
|
||||
<acs-activemq.version>6.1.8</acs-activemq.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
|
||||
<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>
|
||||
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
<alfresco.sdk.version>4.15.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>26.1.0</alfresco.platform.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
@@ -46,7 +47,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| `acs-platform.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. |
|
||||
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
|
||||
| `acs.license.directory` | | `${alfresco.license.directory}/acs` | The base path to search for an ACS license. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
| `acs-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
|
||||
| `acs-activemq.version` | | *not important* | The version of Alfresco ActiveMQ to use in the integration testing infrastructure. |
|
||||
| `acs-api-explorer.war.groupId` | | `org.alfresco` | The API Explorer WAR Maven Group ID. |
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -27,6 +27,13 @@
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${java.cacerts.directory}</directory>
|
||||
<filtering>false</filtering>
|
||||
<targetPath>${project.build.directory}/cacerts</targetPath>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<!-- This plugin downloads ancillary WARs -->
|
||||
<plugin>
|
||||
@@ -88,6 +95,7 @@
|
||||
<path>${beedk.deploy.platform.extDirectory}</path>
|
||||
<path>${beedk.deploy.platform.webDirectory}</path>
|
||||
<path>${beedk.deploy.platform.dataDirectory}</path>
|
||||
<path>${project.build.directory}/cacerts</path>
|
||||
</paths>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -202,6 +210,7 @@
|
||||
<volumes>
|
||||
<bind>
|
||||
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
|
||||
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
|
||||
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
|
||||
<volume>${beedk.deploy.api-explorer.warFile}:/var/lib/tomcat/webapps/api-explorer.war:ro</volume>
|
||||
<volume>${beedk.deploy.aos.warFile}:/var/lib/tomcat/webapps/_vti_bin.war:ro</volume>
|
||||
@@ -320,6 +329,7 @@
|
||||
<beedk.deploy.aos.warFile>${beedk.deploy.platform.warDirectory}/alfresco-vti-bin-${acs-aos.war.version}.war</beedk.deploy.aos.warFile>
|
||||
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
|
||||
<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>
|
||||
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
|
||||
|
||||
<!-- ports -->
|
||||
<acs-postgres.port>5432</acs-postgres.port>
|
||||
@@ -328,12 +338,12 @@
|
||||
<acs-platform.debugger.port>8000</acs-platform.debugger.port>
|
||||
|
||||
<!-- versions -->
|
||||
<acs-api-explorer.version>7.4.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
|
||||
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
|
||||
<acs-postgres.version>12</acs-postgres.version>
|
||||
<acs-activemq.version>5.18.4</acs-activemq.version>
|
||||
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<acs-api-explorer.version>26.1.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
|
||||
<acs-aos.war.version>3.4.1</acs-aos.war.version>
|
||||
<acs-postgres.version>15</acs-postgres.version>
|
||||
<acs-activemq.version>6.1.8</acs-activemq.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-it-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-rad-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
<beedk.deploy.share.extDirectory>${project.build.directory}/ext/share</beedk.deploy.share.extDirectory>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -12,12 +12,13 @@
|
||||
|
||||
<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>
|
||||
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
<alfresco.share.version>22.17</alfresco.share.version>
|
||||
<alfresco.sdk.version>4.15.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>26.1.0</alfresco.platform.version>
|
||||
<alfresco.share.version>26.1.0</alfresco.share.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
@@ -49,7 +50,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. |
|
||||
| `acs-share.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
|
||||
| `acs-share.timeout` | | 30000 | The time to wait for the startup to complete, in milliseconds. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
|
||||
### Private API
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
<acs-share.debugger.port>8100</acs-share.debugger.port>
|
||||
|
||||
<!-- versions -->
|
||||
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<download-plugin.version>1.13.0</download-plugin.version>
|
||||
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| `acs-platform.url` | | *See Below* | The URL of the backend ACS Platform to be used. |
|
||||
| `acs-share.port` | | 8180 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
|
||||
| `acs-share.timeout` | | 45000 | The time to wait for the startup to complete, in milliseconds. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
|
||||
* The `alfresco.share.version` is used to default the `alfresco.war.version`. It is expected to be used by other Maven Tiles, so it is here for convenience. You must specify either property for this tile to function.
|
||||
* The `acs-platform.url` will default to the appropriate value when using the `beedk-acs-platform-*-it-tile` tiles. This should be overridden if you are not using those tiles and are instead using some other ACS Platform instance.
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -168,8 +168,8 @@
|
||||
<acs-share.port>8180</acs-share.port>
|
||||
|
||||
<!-- versions -->
|
||||
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
<download-plugin.version>1.13.0</download-plugin.version>
|
||||
|
||||
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<alfresco.war.version>${alfresco.share.version}</alfresco.war.version>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
<project.build.ampDirectory>${project.build.directory}/amps</project.build.ampDirectory>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
<beedk.download.war.phase>pre-integration-test</beedk.download.war.phase>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
<project.build.ampDirectory>${project.build.directory}/amps</project.build.ampDirectory>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
<project.build.warFile>${project.build.warDirectory}/${alfresco.war.artifactId}-${alfresco.war.version}.war</project.build.warFile>
|
||||
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
|
||||
<!-- versions -->
|
||||
<build-helper-plugin.version>3.6.1</build-helper-plugin.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Maven
|
||||
/target
|
||||
target/
|
||||
pom.xml.versionsBackup
|
||||
|
||||
# Eclipse
|
||||
|
||||
@@ -12,26 +12,43 @@
|
||||
|
||||
<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>
|
||||
<dependency>
|
||||
<groupId>org.activiti</groupId>
|
||||
<artifactId>activiti-engine</artifactId>
|
||||
<version>${activiti.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- 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>
|
||||
<version>${activiti.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.annotation</groupId>
|
||||
<artifactId>jakarta.annotation-api</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -39,38 +56,44 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.43</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
<!-- Documentation: https://git.inteligr8.com/inteligr8/ootbee-beedk/src/branch/stable/beedk-aps-ext-rad-tile -->
|
||||
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:1.1-SNAPSHOT</tile>
|
||||
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1.0,1.2.0)</tile>
|
||||
</tiles>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<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>
|
||||
<repository>
|
||||
<id>alfresco-public</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
|
||||
</repository>
|
||||
<!-- 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>activiti-enterprise-releases</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
@@ -1,69 +1,71 @@
|
||||
$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 ]"
|
||||
|
||||
@@ -1,66 +1,69 @@
|
||||
#!/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 ]"
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.event.ActivitiEvent;
|
||||
import org.activiti.engine.delegate.event.ActivitiEventListener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti Event Listener.
|
||||
*/
|
||||
@Component
|
||||
public class ExampleEventListener implements ActivitiEventListener {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleEventListener.class);
|
||||
|
||||
@Override
|
||||
public void onEvent(ActivitiEvent event) {
|
||||
LOGGER.trace("onEvent({})", event.getType());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
}
|
||||
+7
-7
@@ -24,21 +24,21 @@ import org.springframework.stereotype.Component;
|
||||
* This class is an example of how you can implement an Activiti Execution Listener.
|
||||
* You can reference it in your BPMN with:
|
||||
* <activiti:executionListener delegateExpression="${exampleExecutionListener}" event="start" />
|
||||
* <activiti:executionListener expression="${exampleExecutionListener.exampleMethod('example parameter')}" event="end" />
|
||||
* <activiti:executionListener expression="${exampleExecutionListener.exampleMethod(execution, 'example parameter')}" event="end" />
|
||||
*/
|
||||
@Component("exampleExecutionListener")
|
||||
public class ExampleExecutionListener implements ExecutionListener {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
public void notify(DelegateExecution execution) throws Exception {
|
||||
if (this.logger.isTraceEnabled())
|
||||
this.logger.trace("execute('" + execution.getId() + "')");
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleExecutionListener.class);
|
||||
|
||||
@Override
|
||||
public void notify(DelegateExecution execution) {
|
||||
LOGGER.trace("execute({})", execution.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
public void exampleMethod(DelegateExecution execution, String param) {
|
||||
// another example
|
||||
}
|
||||
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.DelegateExecution;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti script object.
|
||||
* A scripting object can be used in any expression or Script Task.
|
||||
*
|
||||
* You can reference it in your BPMN expression with:
|
||||
* ${exampleObject.exampleMethod('example parameter')}
|
||||
*
|
||||
* You can reference it in your Script Task with:
|
||||
* exampleObject.exampleMethod('example parameter');
|
||||
*/
|
||||
@Component("exampleObject")
|
||||
public class ExampleServiceTask {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
// another example
|
||||
}
|
||||
|
||||
}
|
||||
+5
-5
@@ -24,21 +24,21 @@ import org.springframework.stereotype.Component;
|
||||
* This class is an example of how you can implement an Activiti Service Task.
|
||||
* You can reference it in your BPMN with:
|
||||
* <serviceTask id="serviceTask" activiti:delegateExpression="${exampleServiceTask}" />
|
||||
* <serviceTask id="serviceTask" activiti:expression="${exampleServiceTask.exampleMethod('example parameter')}" />
|
||||
* <serviceTask id="serviceTask" activiti:expression="${exampleServiceTask.exampleMethod(execution, 'example parameter')}" />
|
||||
*/
|
||||
@Component("exampleServiceTask")
|
||||
public class ExampleServiceTask implements JavaDelegate {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleServiceTask.class);
|
||||
|
||||
@Override
|
||||
public void execute(DelegateExecution execution) throws Exception {
|
||||
if (this.logger.isTraceEnabled())
|
||||
this.logger.trace("execute('" + execution.getId() + "')");
|
||||
LOGGER.trace("execute({})", execution.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
public void exampleMethod(DelegateExecution execution, String param) throws Exception {
|
||||
// another example
|
||||
}
|
||||
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti Task Listener.
|
||||
* You can reference it in your BPMN with:
|
||||
* <activiti:taskListener delegateExpression="${exampleTaskListener}" event="start" />
|
||||
* <activiti:taskListener expression="${exampleTaskListener.exampleMethod(task, 'example parameter')}" event="end" />
|
||||
*/
|
||||
@Component("exampleTaskListener")
|
||||
public class ExampleTaskListener implements TaskListener {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleTaskListener.class);
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask task) {
|
||||
LOGGER.trace("execute({})", task.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(DelegateTask task, String param) {
|
||||
// another example
|
||||
}
|
||||
|
||||
}
|
||||
+10
-1
@@ -16,9 +16,18 @@ package com.activiti.extension.conf;
|
||||
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
|
||||
|
||||
/**
|
||||
* A means for injecting packages to scan for the Spring context.
|
||||
*/
|
||||
@Configuration
|
||||
@ComponentScan(basePackages = {"${package}"})
|
||||
@ComponentScan(
|
||||
basePackages = {
|
||||
"${package}"
|
||||
},
|
||||
nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
|
||||
)
|
||||
public class ${shortname}SpringComponentScanner {
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- versions -->
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
<regex-plugin.version>1.0.7</regex-plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Maven
|
||||
/target
|
||||
target/
|
||||
pom.xml.versionsBackup
|
||||
|
||||
# Eclipse
|
||||
|
||||
@@ -16,7 +16,21 @@
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<maven.compiler.release>11</maven.compiler.release>
|
||||
|
||||
<aps.version>2.4.6</aps.version>
|
||||
<!-- This extension will work with all versions of APS, as long as the integration point method signatures remain the same. -->
|
||||
<aps.version>26.1.0</aps.version>
|
||||
|
||||
<!-- The following are only used for RAD and integration testing -->
|
||||
<!--
|
||||
See the following for options:
|
||||
- https://git.inteligr8.com/inteligr8/ootbee-beedk/src/branch/stable/beedk-aps-ext-rad-tile
|
||||
- https://git.inteligr8.com/inteligr8/ootbee-beedk/src/branch/stable/beedk-aps-ext-it-tile
|
||||
-->
|
||||
<!--
|
||||
<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>
|
||||
@@ -27,6 +41,7 @@
|
||||
<classifier>classes</classifier>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<!-- these are in another repository and typically unnecessary -->
|
||||
<exclusion>
|
||||
<groupId>com.activiti</groupId>
|
||||
<artifactId>aspose-transformation</artifactId>
|
||||
@@ -44,40 +59,43 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.43</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
<!-- Documentation: https://git.inteligr8.com/inteligr8/ootbee-beedk/src/branch/stable/beedk-aps-ext-rad-tile -->
|
||||
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:1.1-SNAPSHOT</tile>
|
||||
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1.0,1.2.0)</tile>
|
||||
</tiles>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>rad</id>
|
||||
<id>wsl</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>rad</name>
|
||||
</property>
|
||||
<os>
|
||||
<family>windows</family>
|
||||
</os>
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- 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>
|
||||
<repository>
|
||||
<id>alfresco-public</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
|
||||
</repository>
|
||||
<!-- Used by the Activiti dependencies -->
|
||||
<repository>
|
||||
<id>activiti-releases</id>
|
||||
<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>activiti-enterprise-releases</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
@@ -1,69 +1,71 @@
|
||||
$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 ]"
|
||||
|
||||
@@ -1,66 +1,69 @@
|
||||
#!/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 ]"
|
||||
|
||||
+3
@@ -1,5 +1,8 @@
|
||||
package ${package};
|
||||
|
||||
/**
|
||||
* An interface to bootstrap APS resources.
|
||||
*/
|
||||
public interface Bootstrappable {
|
||||
|
||||
void onBootstrap();
|
||||
+8
-2
@@ -10,10 +10,16 @@ import org.springframework.stereotype.Component;
|
||||
|
||||
import com.activiti.api.boot.BootstrapConfigurer;
|
||||
|
||||
/**
|
||||
* This service is an example. The functionality provided by this example
|
||||
* service is implemented in the `multiext-activiti-app-ext` extension.
|
||||
*
|
||||
* @link https://git.inteligr8.com/inteligr8/multiext-activiti-app-ext
|
||||
*/
|
||||
@Component
|
||||
public class BootstrappingService implements BootstrapConfigurer {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(BootstrappingService.class);
|
||||
|
||||
@Autowired(required = false)
|
||||
private List<Bootstrappable> bootstrappables;
|
||||
@@ -22,7 +28,7 @@ public class BootstrappingService implements BootstrapConfigurer {
|
||||
public void applicationContextInitialized(ApplicationContext applicationContext) {
|
||||
if (this.bootstrappables != null) {
|
||||
for (Bootstrappable bootstrappable : this.bootstrappables) {
|
||||
this.logger.debug("Bootstrapping: " + bootstrappable.getClass());
|
||||
LOGGER.debug("Bootstrapping: " + bootstrappable.getClass());
|
||||
bootstrappable.onBootstrap();
|
||||
}
|
||||
}
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.event.ActivitiEvent;
|
||||
import org.activiti.engine.delegate.event.ActivitiEventListener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti Event Listener.
|
||||
*/
|
||||
@Component
|
||||
public class ExampleEventListener implements ActivitiEventListener {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleEventListener.class);
|
||||
|
||||
@Override
|
||||
public void onEvent(ActivitiEvent event) {
|
||||
LOGGER.trace("onEvent({})", event.getType());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
}
|
||||
+7
-7
@@ -24,21 +24,21 @@ import org.springframework.stereotype.Component;
|
||||
* This class is an example of how you can implement an Activiti Execution Listener.
|
||||
* You can reference it in your BPMN with:
|
||||
* <activiti:executionListener delegateExpression="${exampleExecutionListener}" event="start" />
|
||||
* <activiti:executionListener expression="${exampleExecutionListener.exampleMethod('example parameter')}" event="end" />
|
||||
* <activiti:executionListener expression="${exampleExecutionListener.exampleMethod(execution, 'example parameter')}" event="end" />
|
||||
*/
|
||||
@Component("exampleExecutionListener")
|
||||
public class ExampleExecutionListener implements ExecutionListener {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
public void notify(DelegateExecution execution) throws Exception {
|
||||
if (this.logger.isTraceEnabled())
|
||||
this.logger.trace("execute('" + execution.getId() + "')");
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleExecutionListener.class);
|
||||
|
||||
@Override
|
||||
public void notify(DelegateExecution execution) {
|
||||
LOGGER.trace("execute({})", execution.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
public void exampleMethod(DelegateExecution execution, String param) {
|
||||
// another example
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
|
||||
@Component
|
||||
public class ExampleExtension implements Bootstrappable {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleExtension.class);
|
||||
|
||||
@Autowired
|
||||
private ProcessEngine services;
|
||||
@@ -23,11 +23,11 @@ public class ExampleExtension implements Bootstrappable {
|
||||
|
||||
@Override
|
||||
public void onBootstrap() {
|
||||
this.logger.trace("onBootstrap()");
|
||||
LOGGER.trace("onBootstrap()");
|
||||
|
||||
// TODO do some stuff
|
||||
|
||||
this.logger.info("Model Share Extension initialized");
|
||||
LOGGER.info("Model Share Extension initialized");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.DelegateExecution;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti script object.
|
||||
* A scripting object can be used in any expression or Script Task.
|
||||
*
|
||||
* You can reference it in your BPMN expression with:
|
||||
* ${exampleObject.exampleMethod('example parameter')}
|
||||
*
|
||||
* You can reference it in your Script Task with:
|
||||
* exampleObject.exampleMethod('example parameter');
|
||||
*/
|
||||
@Component("exampleObject")
|
||||
public class ExampleServiceTask {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
// another example
|
||||
}
|
||||
|
||||
}
|
||||
+5
-5
@@ -24,21 +24,21 @@ import org.springframework.stereotype.Component;
|
||||
* This class is an example of how you can implement an Activiti Service Task.
|
||||
* You can reference it in your BPMN with:
|
||||
* <serviceTask id="serviceTask" activiti:delegateExpression="${exampleServiceTask}" />
|
||||
* <serviceTask id="serviceTask" activiti:expression="${exampleServiceTask.exampleMethod('example parameter')}" />
|
||||
* <serviceTask id="serviceTask" activiti:expression="${exampleServiceTask.exampleMethod(execution, 'example parameter')}" />
|
||||
*/
|
||||
@Component("exampleServiceTask")
|
||||
public class ExampleServiceTask implements JavaDelegate {
|
||||
|
||||
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleServiceTask.class);
|
||||
|
||||
@Override
|
||||
public void execute(DelegateExecution execution) throws Exception {
|
||||
if (this.logger.isTraceEnabled())
|
||||
this.logger.trace("execute('" + execution.getId() + "')");
|
||||
LOGGER.trace("execute({})", execution.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(String param) throws Exception {
|
||||
public void exampleMethod(DelegateExecution execution, String param) throws Exception {
|
||||
// another example
|
||||
}
|
||||
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package ${package};
|
||||
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* This class is an example of how you can implement an Activiti Task Listener.
|
||||
* You can reference it in your BPMN with:
|
||||
* <activiti:taskListener delegateExpression="${exampleTaskListener}" event="start" />
|
||||
* <activiti:taskListener expression="${exampleTaskListener.exampleMethod(task, 'example parameter')}" event="end" />
|
||||
*/
|
||||
@Component("exampleTaskListener")
|
||||
public class ExampleTaskListener implements TaskListener {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExampleTaskListener.class);
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask task) {
|
||||
LOGGER.trace("execute({})", task.getId());
|
||||
|
||||
// TODO do some stuff
|
||||
}
|
||||
|
||||
public void exampleMethod(DelegateTask task, String param) {
|
||||
// another example
|
||||
}
|
||||
|
||||
}
|
||||
+10
-1
@@ -16,9 +16,18 @@ package com.activiti.extension.conf;
|
||||
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
|
||||
|
||||
/**
|
||||
* A means for injecting packages to scan for the Spring context.
|
||||
*/
|
||||
@Configuration
|
||||
@ComponentScan(basePackages = {"${package}"})
|
||||
@ComponentScan(
|
||||
basePackages = {
|
||||
"${package}"
|
||||
},
|
||||
nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
|
||||
)
|
||||
public class ${shortname}SpringComponentScanner {
|
||||
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| `aps.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. |
|
||||
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
|
||||
| `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
|
||||
|
||||
### Private API
|
||||
@@ -71,7 +71,6 @@ The following properties are only intended to be defined by BeeDK components.
|
||||
| `beedk.deploy.aps.testClassesDirectory` | | | An additional test classpath directory to sideload into the web application. |
|
||||
| `beedk.deploy.aps.extDirectory` | | | An additional directory of JARs to sideload into the web application. |
|
||||
| `beedk.deploy.aps.warDirectory` | | `${project.build.warDirectory}` | A build directory for WAR files. |
|
||||
| `beedk.deploy.aps.dataDirectory` | | `${project.build.directory}/alf_data` | The temporary binary storage location for ACS. |
|
||||
|
||||
### Other APIs
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -21,22 +21,49 @@
|
||||
<build>
|
||||
<testResources>
|
||||
<!-- need to split certain test resources to load before webapp -->
|
||||
<!-- these will load before the WAR, are accessible earlier, and could be shadowed by it -->
|
||||
<testResource>
|
||||
<directory>src/test/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<excludes>
|
||||
<exclude>activiti/**/*</exclude>
|
||||
<exclude>**/*.properties</exclude>
|
||||
<exclude>**/README*</exclude>
|
||||
</excludes>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>src/it/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<excludes>
|
||||
<exclude>activiti/**/*</exclude>
|
||||
<exclude>**/*.properties</exclude>
|
||||
<exclude>**/README*</exclude>
|
||||
</excludes>
|
||||
</testResource>
|
||||
<!-- these will load after the WAR and could shadow it -->
|
||||
<testResource>
|
||||
<directory>src/test/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>activiti/**/*</include>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>src/it/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>activiti/**/*</include>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${java.cacerts.directory}</directory>
|
||||
<filtering>false</filtering>
|
||||
<targetPath>${project.build.directory}/cacerts</targetPath>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<!-- This plugin downloads the parameterized WAR -->
|
||||
@@ -88,6 +115,7 @@
|
||||
<paths>
|
||||
<path>${project.build.directory}/rt-resources</path>
|
||||
<path>${project.build.directory}/rt-test-resources</path>
|
||||
<path>${project.build.directory}/cacerts</path>
|
||||
</paths>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -167,10 +195,16 @@
|
||||
<bind>
|
||||
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
|
||||
<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
|
||||
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
|
||||
<!-- include runtime-only resources -->
|
||||
<volume>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1:ro</volume>
|
||||
<!-- get transform.lic into the classpath -->
|
||||
<volume>${aps.license.directory}:/var/lib/tomcat/dev/classes-extra2:ro</volume>
|
||||
<!-- include classes post-rsrc to shadow WAR -->
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>
|
||||
<!-- include compile/runtime scope dependencies -->
|
||||
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
@@ -244,6 +278,7 @@
|
||||
<aps.debugger.enabled>true</aps.debugger.enabled>
|
||||
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
|
||||
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
|
||||
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
|
||||
|
||||
<!-- ports -->
|
||||
<aps-postgres.port>5433</aps-postgres.port>
|
||||
@@ -252,9 +287,9 @@
|
||||
|
||||
<!-- versions -->
|
||||
<aps-postgres.version>15</aps-postgres.version>
|
||||
<aps.version>25.1.1</aps.version>
|
||||
<tomcat-rad.version>2.3-tomcat10</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<aps.version>26.1.0</aps.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||
|
||||
<!-- results -->
|
||||
|
||||
@@ -61,7 +61,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| `aps.timeout` | | 120000 | The time to wait for the startup to complete, in milliseconds. |
|
||||
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
|
||||
| `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
|
||||
| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-image). |
|
||||
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
|
||||
|
||||
### Private API
|
||||
@@ -75,7 +75,6 @@ The following properties are only intended to be defined by BeeDK components.
|
||||
| `beedk.deploy.aps.testClassesDirectory` | | | An additional test classpath directory to sideload into the web application. |
|
||||
| `beedk.deploy.aps.extDirectory` | | | An additional directory of JARs to sideload into the web application. |
|
||||
| `beedk.deploy.aps.warDirectory` | | `${project.build.warDirectory}` | A build directory for WAR files. |
|
||||
| `beedk.deploy.aps.dataDirectory` | | `${project.build.directory}/alf_data` | The temporary binary storage location for ACS. |
|
||||
|
||||
### Other APIs
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -29,22 +29,49 @@
|
||||
<build>
|
||||
<testResources>
|
||||
<!-- need to split certain test resources to load before webapp -->
|
||||
<!-- these will load before the WAR, are accessible earlier, and could be shadowed by it -->
|
||||
<testResource>
|
||||
<directory>src/test/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<excludes>
|
||||
<exclude>activiti/**/*</exclude>
|
||||
<exclude>**/*.properties</exclude>
|
||||
<exclude>**/README*</exclude>
|
||||
</excludes>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>src/it/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<excludes>
|
||||
<exclude>activiti/**/*</exclude>
|
||||
<exclude>**/*.properties</exclude>
|
||||
<exclude>**/README*</exclude>
|
||||
</excludes>
|
||||
</testResource>
|
||||
<!-- these will load after the WAR and could shadow it -->
|
||||
<testResource>
|
||||
<directory>src/test/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>activiti/**/*</include>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>src/it/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>activiti/**/*</include>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${java.cacerts.directory}</directory>
|
||||
<filtering>false</filtering>
|
||||
<targetPath>${project.build.directory}/cacerts</targetPath>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<!-- This plugin downloads the parameterized WAR -->
|
||||
@@ -96,6 +123,7 @@
|
||||
<paths>
|
||||
<path>${project.build.directory}/rt-resources</path>
|
||||
<path>${project.build.directory}/rt-test-resources</path>
|
||||
<path>${project.build.directory}/cacerts</path>
|
||||
</paths>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -172,10 +200,16 @@
|
||||
<bind>
|
||||
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
|
||||
<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
|
||||
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
|
||||
<!-- include runtime-only resources -->
|
||||
<volume>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1:ro</volume>
|
||||
<!-- get transform.lic into the classpath -->
|
||||
<volume>${aps.license.directory}:/var/lib/tomcat/dev/classes-extra2:ro</volume>
|
||||
<!-- include classes post-rsrc to shadow WAR -->
|
||||
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
|
||||
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>
|
||||
<!-- include compile/runtime scope dependencies -->
|
||||
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
@@ -232,6 +266,7 @@
|
||||
<aps.debugger.enabled>true</aps.debugger.enabled>
|
||||
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
|
||||
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
|
||||
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
|
||||
|
||||
<!-- ports -->
|
||||
<aps-postgres.port>5433</aps-postgres.port>
|
||||
@@ -240,9 +275,9 @@
|
||||
|
||||
<!-- versions -->
|
||||
<aps-postgres.version>15</aps-postgres.version>
|
||||
<aps.version>25.1.1</aps.version>
|
||||
<tomcat-rad.version>2.3-tomcat10</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||
<aps.version>26.1.0</aps.version>
|
||||
<tomcat-rad.version>2.3-tomcat11</tomcat-rad.version>
|
||||
<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
|
||||
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||
|
||||
<!-- results -->
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -13,11 +13,12 @@
|
||||
|
||||
<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>
|
||||
|
||||
<ats.version>2.3.6</ats.version>
|
||||
<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
|
||||
<ats.version>5.2.5</ats.version>
|
||||
<spring-boot.version>3.5.7</spring-boot.version>
|
||||
|
||||
<ate.app.className>${package}.Applicatoin</ate.app.className>
|
||||
<docker.image.registry>${dockerRegistryHost}</docker.image.registry>
|
||||
@@ -53,7 +54,7 @@
|
||||
<plugin>
|
||||
<groupId>io.repaint.maven</groupId>
|
||||
<artifactId>tiles-maven-plugin</artifactId>
|
||||
<version>2.40</version>
|
||||
<version>2.44</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<tiles>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.19</version>
|
||||
<version>1.1.21</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user