added license loading

This commit is contained in:
2021-06-02 09:34:02 -04:00
parent 46ba0521f3
commit 827e693e60
8 changed files with 23 additions and 10 deletions

View File

@@ -59,6 +59,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `aps.debugger.port` | | 8000 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
| `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). |
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |

View File

@@ -75,15 +75,7 @@
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
-Dlocal.transform.service.enabled=${beedk.rad.alts.enabled} \
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
-Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
-Dindex.subsystem.name=${beedk.rad.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \
${aps.tomcat.opts}</CATALINA_OPTS>
<CATALINA_OPTS>${aps.tomcat.opts}</CATALINA_OPTS>
</env>
<ports>
<port>${aps.port}:8080</port>
@@ -95,6 +87,7 @@
</network>
<volumes>
<bind>
<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>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
@@ -151,6 +144,8 @@
<aps.memory>512m</aps.memory>
<aps.hotswap.enabled>true</aps.hotswap.enabled>
<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>
<!-- ports -->
<aps-postgres.port>5432</aps-postgres.port>