inteligr8/ootbee-beedk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix APS RAD tiles

Browse Source
This commit is contained in:
Brian Long 2024-03-14 17:06:45 -04:00
parent 439e45e2a5
commit cfcfe64167
2 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
beedk-aps-ext-rad-tile/tile.xml
View File

@ -33,10 +33,21 @@
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version> <version>3.6.1</version>
<executions> <executions>
<!-- This execution downloads the dependency JARs, including JAR modules -->
<execution>
<id>download-jars</id>
<phase>generate-test-resources</phase>
<goals><goal>copy-dependencies</goal></goals>
<configuration>
<excludeScope>provided</excludeScope>
<includeTypes>jar</includeTypes>
<outputDirectory>${beedk.deploy.aps.extDirectory}</outputDirectory>
</configuration>
</execution>
<!-- This execution downloads the parameterized WAR --> <!-- This execution downloads the parameterized WAR -->
<execution> <execution>
<id>download-webapp</id> <id>download-webapp</id>
<phase>process-test-classes</phase> <phase>generate-test-resources</phase>
<goals><goal>copy</goal></goals> <goals><goal>copy</goal></goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
@ -47,7 +58,7 @@
<type>war</type> <type>war</type>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.warDirectory}</outputDirectory> <outputDirectory>${beedk.deploy.aps.warDirectory}</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -56,7 +67,6 @@
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${beedk.plugins.fabric8.docker.version}</version>
<executions> <executions>
<execution> <execution>
<id>run-aps</id> <id>run-aps</id>
@ -66,11 +76,11 @@
<images> <images>
<image> <image>
<name>postgres:${aps-postgres.version}</name> <name>postgres:${aps-postgres.version}</name>
<alias>acs-db</alias> <alias>aps-db</alias>
<run> <run>
<env> <env>
<POSTGRES_PASSWORD>activiti</POSTGRES_PASSWORD> <POSTGRES_PASSWORD>alfresco</POSTGRES_PASSWORD>
<POSTGRES_USER>activiti</POSTGRES_USER> <POSTGRES_USER>alfresco</POSTGRES_USER>
<POSTGRES_DB>activiti</POSTGRES_DB> <POSTGRES_DB>activiti</POSTGRES_DB>
</env> </env>
<ports> <ports>
@ -90,12 +100,16 @@
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX> <JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP> <ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP> <ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>${aps.tomcat.opts}</CATALINA_OPTS> <CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
${aps.tomcat.opts}</CATALINA_OPTS>
</env> </env>
<ports> <ports>
<port>${aps.port}:8080</port> <port>${aps.port}:8080</port>
<port>${aps.debugger.port}:8000</port> <port>${aps.debugger.port}:8000</port>
</ports> </ports>
<dependsOn>
<container>aps-db</container>
</dependsOn>
<network> <network>
<mode>custom</mode> <mode>custom</mode>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@ -103,20 +117,20 @@
<volumes> <volumes>
<bind> <bind>
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume> <volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
<volume>${beedk.deploy.aps.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume> <volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume> <volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume> <volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume> <volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
</bind> </bind>
</volumes><!-- </volumes>
<wait> <wait>
<http> <http>
<url>http://localhost:${aps.port}/activiti-app/service/api/server</url> <url>http://admin%40app.activiti.com:admin@localhost:${aps.port}/activiti-app/api/management/engine</url>
<method>GET</method> <method>GET</method>
<status>200..399</status> <status>200</status>
</http> </http>
<time>${aps.timeout}</time> <time>${aps.timeout}</time>
</wait>--> </wait>
</run> </run>
</image> </image>
</images> </images>
@ -148,12 +162,13 @@
</activation> </activation>
<properties> <properties>
<!-- configurable --> <!-- configurable -->
<aps.war.groupId>org.alfresco</aps.war.groupId> <aps.war.groupId>com.activiti</aps.war.groupId>
<aps.war.artifactId>activiti-app</aps.war.artifactId> <aps.war.artifactId>activiti-app</aps.war.artifactId>
<aps.war.version>${aps.version}</aps.war.version>
<project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory> <project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory>
<beedk.deploy.aps.classesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.classesDirectory> <beedk.deploy.aps.classesDirectory>${project.build.outputDirectory}</beedk.deploy.aps.classesDirectory>
<beedk.deploy.aps.testClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.testClassesDirectory> <beedk.deploy.aps.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.aps.testClassesDirectory>
<beedk.deploy.aps.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.aps.extDirectory> <beedk.deploy.aps.extDirectory>${project.build.directory}/ext</beedk.deploy.aps.extDirectory>
<beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory> <beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory>
<aps.timeout>60000</aps.timeout> <aps.timeout>60000</aps.timeout>
<aps.memory>512m</aps.memory> <aps.memory>512m</aps.memory>
@ -163,13 +178,14 @@
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory> <aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
<!-- ports --> <!-- ports -->
<aps-postgres.port>5432</aps-postgres.port> <aps-postgres.port>5433</aps-postgres.port>
<aps.port>8080</aps.port> <aps.port>8080</aps.port>
<aps.debugger.port>8000</aps.debugger.port> <aps.debugger.port>8000</aps.debugger.port>
<!-- versions --> <!-- versions -->
<aps.version>1.11.1.1</aps.version> <aps-postgres.version>9.6</aps-postgres.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version> <aps.version>1.11.5</aps.version>
<tomcat-rad.version>9-2.1</tomcat-rad.version>
<!-- results --> <!-- results -->
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile> <project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

26
beedk-aps-rad-tile/tile.xml
View File

@ -48,6 +48,9 @@
<POSTGRES_USER>alfresco</POSTGRES_USER> <POSTGRES_USER>alfresco</POSTGRES_USER>
<POSTGRES_DB>activiti</POSTGRES_DB> <POSTGRES_DB>activiti</POSTGRES_DB>
</env> </env>
<ports>
<port>${aps-postgres.port}:5432</port>
</ports>
<network> <network>
<mode>custom</mode> <mode>custom</mode>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@ -68,11 +71,6 @@
<ports> <ports>
<port>${aps.port}:8080</port> <port>${aps.port}:8080</port>
</ports> </ports>
<volumes>
<bind>
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
</bind>
</volumes>
<dependsOn> <dependsOn>
<container>aps-db</container> <container>aps-db</container>
</dependsOn> </dependsOn>
@ -80,6 +78,11 @@
<mode>custom</mode> <mode>custom</mode>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
</network> </network>
<volumes>
<bind>
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
</bind>
</volumes>
</run> </run>
</image> </image>
</images> </images>
@ -90,18 +93,6 @@
</plugins> </plugins>
</build> </build>
</profile> </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> <profile>
<id>default-props</id> <id>default-props</id>
<activation> <activation>
@ -115,6 +106,7 @@
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory> <aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
<!-- ports --> <!-- ports -->
<aps-postgres.port>5433</aps-postgres.port>
<aps.port>8080</aps.port> <aps.port>8080</aps.port>
<!-- versions --> <!-- versions -->