diff --git a/beedk-acs-platform-it-tile/README.md b/beedk-acs-platform-it-tile/README.md index bdce7b1..3378316 100644 --- a/beedk-acs-platform-it-tile/README.md +++ b/beedk-acs-platform-it-tile/README.md @@ -52,6 +52,8 @@ The following properties are intended to be exposed by inheriting Public API Mav | `acs-activemq.port` | | 8161 | 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-platform.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*May be overridden by any POM parent or Maven Tile.* | | `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. | | `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. | diff --git a/beedk-acs-platform-it-tile/tile.xml b/beedk-acs-platform-it-tile/tile.xml index bdde948..7a4d770 100644 --- a/beedk-acs-platform-it-tile/tile.xml +++ b/beedk-acs-platform-it-tile/tile.xml @@ -78,6 +78,7 @@ + ${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro ${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro ${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes:ro ${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro @@ -196,6 +197,8 @@ ${project.build.directory}/alf_data 120000 1g + ${user.home}/alfresco/license + ${alfresco.license.directory}/acs 5432 diff --git a/beedk-acs-platform-rad-tile/README.md b/beedk-acs-platform-rad-tile/README.md index b903fe3..22e2456 100644 --- a/beedk-acs-platform-rad-tile/README.md +++ b/beedk-acs-platform-rad-tile/README.md @@ -50,6 +50,7 @@ The following properties are intended to be exposed by inheriting Public API Mav | Maven Property | Required | Default | Description | | -------------------------- |:--------:| --------------- | ----------- | | `acs-platform.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. | +| `acs-platform.hotswap.disablePlugins` | | Hibernate | Do not enable the HotSwap Agent with the following plugins. All plugins are documented here: https://github.com/HotswapProjects/HotswapAgent/tree/master/plugin | | `acs-platform.debugger.enabled` | | true | Enable the JDWP debugger. | | `acs-platform.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. | | `acs-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users. | @@ -57,6 +58,8 @@ The following properties are intended to be exposed by inheriting Public API Mav | `acs-platform.debugger.port` | | 8000 | The port to expose on `localhost` for the developer; not for other applications or users. | | `acs-platform.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*May be overridden by any POM parent or Maven Tile.* | | `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). | | `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. | diff --git a/beedk-acs-platform-rad-tile/tile.xml b/beedk-acs-platform-rad-tile/tile.xml index 8e376a9..5a967ae 100644 --- a/beedk-acs-platform-rad-tile/tile.xml +++ b/beedk-acs-platform-rad-tile/tile.xml @@ -105,6 +105,7 @@ ${acs-platform.memory} ${acs-platform.debugger.enabled} ${acs-platform.hotswap.enabled} + ${acs-platform.hotswap.disablePlugins} -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\&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 \ @@ -125,6 +126,7 @@ + ${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro ${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro ${beedk.deploy.api-explorer.warFile}:/var/lib/tomcat/webapps/api-explorer.war:ro ${beedk.deploy.aos.warFile}:/var/lib/tomcat/webapps/_vti_bin.war:ro @@ -234,11 +236,14 @@ 1g true true + Hibernate org.alfresco api-explorer ${acs-api-explorer.version} ${beedk.deploy.platform.warDirectory}/${acs-api-explorer.war.artifactId}-${acs-api-explorer.war.version}.war ${beedk.deploy.platform.warDirectory}/alfresco-vti-bin-${acs-aos.war.version}.war + ${user.home}/alfresco/license + ${alfresco.license.directory}/acs 5432 diff --git a/beedk-acs-platform-self-rad-tile/README.md b/beedk-acs-platform-self-rad-tile/README.md index ed04654..72cd82a 100644 --- a/beedk-acs-platform-self-rad-tile/README.md +++ b/beedk-acs-platform-self-rad-tile/README.md @@ -60,11 +60,10 @@ The following properties are intended to be exposed by inheriting Public API Mav | Maven Property | Required | Default | Description | | ---------------------------------- |:--------:| ------------------ | ----------- | -| `alfresco.sdk.version` | **YES** | | For a list of versions and more details, see the [Alfresco SDK](https://github.com/Alfresco/alfresco-sdk).
*Inherited from [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-aritfact-rad-tile)* | +| `alfresco.sdk.version` | **YES** | | For a list of versions and more details, see the [Alfresco SDK](https://github.com/Alfresco/alfresco-sdk).
*Inherited from [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-rad-tile)* | | `alfresco.platform.version` | *Maybe* | | The Alfresco Platform version to use for RAD. See below for more details. | | `edition` | | `community` | The Alfresco Platform edition used for RAD. `community` or `enterprise`. See below for more details. | | `alfresco.war.version` | *Maybe* | *See Below* | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.
*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* | -| `project.build.extDirectory` | | `${project.build.directory}/ext/platform` | An additional directory of JARs to add to the ACS Platform at runtime. | | `acs-platform.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users.
*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* | | `acs-platform.debugger.port` | | 8000 | The port to expose on `localhost` for the developer; not for other applications or users.
*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* | | `acs-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users.
*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* | diff --git a/beedk-acs-share-artifact-rad-tile/.gitignore b/beedk-acs-share-artifact-rad-tile/.gitignore new file mode 100644 index 0000000..8c37f05 --- /dev/null +++ b/beedk-acs-share-artifact-rad-tile/.gitignore @@ -0,0 +1,9 @@ +# Eclipse +.project +.classpath +.settings + +# Maven +pom.xml.versionsBackup +target + diff --git a/beedk-acs-share-artifact-rad-tile/README.md b/beedk-acs-share-artifact-rad-tile/README.md new file mode 100644 index 0000000..5c860e5 --- /dev/null +++ b/beedk-acs-share-artifact-rad-tile/README.md @@ -0,0 +1,82 @@ +# BeeDK ACS Share RAD Maven Tile for non-Share-accessible Projects + +This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk). It is considered to be part of the **Public API** of the BeeDK. + +## Purpose + +This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for rapid application development any Maven project against the ACS Platform. + +## Usage + +To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet. Do not forget the `extensions` element in the *plugin* configuration. + +```xml + + ... + + ... + + + io.repaint.maven + tiles-maven-plugin + [2.0,3.0) + true + + + ... + + com.inteligr8.ootbee:beedk-acs-share-artifact-rad-tile:[1.0.0,2.0.0) + + + + ... + + ... + + ... + +``` + +There are 2 other alternative tiles that serve a similar purpose, but are for other use cases. Make sure you are using the right one. Follow the logic below. + +Is your Maven project an ACS Share module or ACS Share web application? +: You will be declaring the `beedk-acs-share-module-tile` or `beedk-acs-share-webapp-tile` Maven Tile. You will need to explicitly declare and configure the [`beedk-acs-share-self-rad-tile` Maven Tile](../beedk-acs-share-self-rad-tile). + +Is your Maven project just one within a set of other Maven projects AND one of those other Maven projects is an ACS Share web application (not a module)? +: You will need to explicitly declare and configure the [`beedk-acs-share-sibling-rad-tile` Maven Tile](../beedk-acs-share-sibling-rad-tile). + +Otherwise +: You will need to explicitly declare and configure the `beedk-acs-share-artifact-rad-tile` Maven Tile. + +See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities. + +## Configuration + +In your Maven project, set the following properties to define the behavior of this Maven Tile. Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile. + +### Public API + +The following properties are intended to be exposed by inheriting Public API Maven Tiles. + +| Maven Property | Required | Default | Description | +| ---------------------------------- |:--------:| ------------------ | ----------- | +| `alfresco.share.version` | Maybe | | The Alfresco Share version to use for RAD. See below for more details. | +| `alfresco.share.war.groupId` | | `org.alfresco` | The Maven `groupId` of a Maven `war` Type Project defined in a Maven Repository. | +| `alfresco.share.war.artifactId` | | `share` | The Maven `artifactId` of a Maven `war` Type Project defined in a Maven Repository. | +| `alfresco.share.war.version` | Maybe | *See Below* | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository. | +| `acs-share.port` | | 8180 | The port to expose on `localhost` for the developer; not for other applications or users.
*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* | +| `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users.
*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* | +| `acs-share.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*May be overridden by any POM parent or Maven Tile.*
*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* | + +* The `alfresco.share.version` is used to default the `alfresco.share.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. + + +### Other APIs + +Additional less important configurations are inherited from the following Maven Tiles. + +* [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile) + +## Results + +The ACS Share component will be started during the `process-classes` Maven phase. diff --git a/beedk-acs-share-artifact-rad-tile/pom.xml b/beedk-acs-share-artifact-rad-tile/pom.xml new file mode 100644 index 0000000..e1cc799 --- /dev/null +++ b/beedk-acs-share-artifact-rad-tile/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + com.inteligr8.ootbee + beedk-acs-share-artifact-rad-tile + 1.0-SNAPSHOT + tile + + Order of the Bee Development Kit: RAD for ACS Share by Maven Artifact + + https://bitbucket.org/inteligr8/ootbee-beedk + + + Order of the Bee + https://orderofthebee.net + + + + Brian Long + brian@inteligr8.com + Inteligr8 + https://www.inteligr8.com + https://twitter.com/brianmlong + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.20 + true + + true + + com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0) + + + + + + + diff --git a/beedk-acs-share-artifact-rad-tile/tile.xml b/beedk-acs-share-artifact-rad-tile/tile.xml new file mode 100644 index 0000000..260571a --- /dev/null +++ b/beedk-acs-share-artifact-rad-tile/tile.xml @@ -0,0 +1,69 @@ + + + + + + rad-acs-share-artifact + + + rad + + + + + + + maven-dependency-plugin + 3.1.2 + + + + download-platform-webapp + generate-resources + copy + + + + ${alfresco.share.war.groupId} + ${alfresco.share.war.artifactId} + ${alfresco.share.war.version} + war + + + ${beedk.deploy.share.warDirectory} + + + + + + + + + default-props + + + !some-prop-that-never-exists + + + + + ${project.build.directory}/war + org.alfresco + share + ${alfresco.share.version} + + + ${project.build.warDirectory}/${alfresco.share.war.artifactId}-${alfresco.share.war.version}.war + ${project.build.directory}/ext/share + + + + + + + @project.groupId@:beedk-acs-share-rad-tile:@project.version@ + + + diff --git a/beedk-acs-share-rad-tile/.gitignore b/beedk-acs-share-rad-tile/.gitignore new file mode 100644 index 0000000..8c37f05 --- /dev/null +++ b/beedk-acs-share-rad-tile/.gitignore @@ -0,0 +1,9 @@ +# Eclipse +.project +.classpath +.settings + +# Maven +pom.xml.versionsBackup +target + diff --git a/beedk-acs-share-rad-tile/README.md b/beedk-acs-share-rad-tile/README.md new file mode 100644 index 0000000..21a88b6 --- /dev/null +++ b/beedk-acs-share-rad-tile/README.md @@ -0,0 +1,82 @@ +# BeeDK Abstract ACS Share Maven Tile for RAD + +This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk). It is considered to be part of the **Private API** of the BeeDK. + +## Purpose + +This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for rapid application development of any ACS Share module, extension, service, or web application. It is intended to be used by other BeeDK components and not directly by any development project. + +## Usage + +To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet. Do not forget the `extensions` element in the *plugin* configuration. + +```xml + + ... + + ... + + + io.repaint.maven + tiles-maven-plugin + [2.0,3.0) + true + + + ... + + com.inteligr8.ootbee:beedk-acs-share-rad-tile:[1.0.0,2.0.0) + + + + ... + + ... + + ... + +``` + +See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities. + +## Configuration + +In your Maven project, set the following properties to define the behavior of this Maven Tile. Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile. + +### Public API + +The following properties are intended to be exposed by inheriting Public API Maven Tiles. + +| Maven Property | Required | Default | Description | +| -------------------------- |:--------:| --------------- | ----------- | +| `acs-share.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. | +| `acs-share.hotswap.disablePlugins` | | | Do not enable the HotSwap Agent with the following plugins. All plugins are documented here: https://github.com/HotswapProjects/HotswapAgent/tree/master/plugin | +| `acs-share.debugger.enabled` | | true | Enable the JDWP debugger. | +| `acs-share.port` | | 8180 | The port to expose on `localhost` for the developer; not for other applications or users. | +| `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. | +| `acs-share.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*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). | + +### Private API + +The following properties are only intended to be defined by BeeDK components. + +| Maven Property | Required | Default | Description | +| ------------------------------------ |:--------:| ------------------ | ----------- | +| `beedk.deploy.share.warFile` | **Yes** | | The WAR file to deploy in the Apache Tomcat instance. | +| `beedk.deploy.share.classesDirectory` | | | An additional classpath directory to sideload into the web application. | +| `beedk.deploy.share.testClassesDirectory` | | | An additional test classpath directory to sideload into the web application. | +| `beedk.deploy.share.extDirectory` | | | An additional directory of JARs to sideload into the web application. | +| `beedk.deploy.share.webDirectory` | | | An additional directory of web resources to sideload in the web application. | +| `beedk.deploy.share.warDirectory` | | `${project.build.warDirectory}` | A build directory for WAR files. | + +### Other APIs + +Additional less important configurations are inherited from the following Maven Tiles. + +* [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile) + +## Results + +The ACS Share will be started during the `process-classes` Maven phase. diff --git a/beedk-acs-share-rad-tile/pom.xml b/beedk-acs-share-rad-tile/pom.xml new file mode 100644 index 0000000..483e17e --- /dev/null +++ b/beedk-acs-share-rad-tile/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + com.inteligr8.ootbee + beedk-acs-share-rad-tile + 1.0-SNAPSHOT + tile + + Order of the Bee Development Kit: RAD for ACS Share + + https://bitbucket.org/inteligr8/ootbee-beedk + + + Order of the Bee + https://orderofthebee.net + + + + Brian Long + brian@inteligr8.com + Inteligr8 + https://www.inteligr8.com + https://twitter.com/brianmlong + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.20 + true + + true + + com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0) + + + + + + + diff --git a/beedk-acs-share-rad-tile/tile.xml b/beedk-acs-share-rad-tile/tile.xml new file mode 100644 index 0000000..62c0eed --- /dev/null +++ b/beedk-acs-share-rad-tile/tile.xml @@ -0,0 +1,126 @@ + + + + + + rad-acs-share + + + rad + + + + + + + io.fabric8 + docker-maven-plugin + ${beedk.plugins.fabric8.docker.version} + + + run-acs-share + process-classes + start + + + + docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version} + acs-share + + + ${acs-share.debugger.enabled} + ${acs-share.hotswap.enabled} + ${acs-share.hotswap.disablePlugins} + ${acs-share.tomcat.opts} + + + ${acs-share.port}:8080 + ${acs-share.debugger.port}:8000 + + + custom + ${project.artifactId} + + + + ${beedk.deploy.share.warFile}:/var/lib/tomcat/webapps/share.war:ro + ${beedk.deploy.share.classesDirectory}:/var/lib/tomcat/dev/classes:ro + ${beedk.deploy.share.modClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro + ${beedk.deploy.share.extClassesDirectory}:/var/lib/tomcat/dev/classes-extra2:ro + ${beedk.deploy.share.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra3:ro + ${beedk.deploy.share.extDirectory}:/var/lib/tomcat/dev/lib:ro + ${beedk.deploy.share.webDirectory}:/var/lib/tomcat/dev/web:ro + + + + + http://localhost:${acs-share.port}/share + GET + 200..399 + + + + + + + + + + + + + + + + tomcat-opts-unspecified + + + !acs-share.tomcat.opts + + + + + + + + default-props + + + !some-prop-that-never-exists + + + + + ${project.build.directory}/doesnotexist + ${project.build.directory}/doesnotexist + ${project.build.directory}/doesnotexist + ${project.build.directory}/doesnotexist + ${project.build.directory}/doesnotexist + ${project.build.directory}/doesnotexist + ${project.build.warDirectory} + 150000 + true + true + + + + 8180 + 8100 + + + 9-1.4 + + + share + + + + + + + @project.groupId@:beedk-run-tile:@project.version@ + + + diff --git a/beedk-acs-share-self-rad-tile/README.md b/beedk-acs-share-self-rad-tile/README.md index ab8e327..61f7efd 100644 --- a/beedk-acs-share-self-rad-tile/README.md +++ b/beedk-acs-share-self-rad-tile/README.md @@ -37,6 +37,19 @@ To use this plugin, just reference it with the Maven Tiles plugin as shown in th ``` +There are 2 other alternative tiles that serve a similar purpose, but are for other use cases. Make sure you are using the right one. Follow the logic below. + +Is your Maven project an ACS Share module or ACS Share web application? +: You will be declaring the `beedk-acs-share-module-tile` or `beedk-acs-share-webapp-tile` Maven Tile. You will need to explicitly declare and configure the `beedk-acs-share-self-rad-tile` Maven Tile. + +Is your Maven project just one within a set of other Maven projects AND one of those other Maven projects is an ACS Share web application (not a module)? +: You will need to explicitly declare and configure the [`beedk-acs-share-sibling-rad-tile` Maven Tile](../beedk-acs-share-sibling-rad-tile). + +Otherwise +: You will need to explicitly declare and configure the [`beedk-acs-share-artifact-rad-tile` Maven Tile](../beedk-acs-share-artifact-rad-tile). + +See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities. + ## Configuration In your Maven project, set the following properties to define the behavior of this Maven Tile. Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile. @@ -51,14 +64,10 @@ The following properties are intended to be exposed by inheriting Public API Mav | `alfresco.share.version` | *Maybe* | | The Alfresco Share version to use for RAD. See below for more details. | | `alfresco.war.artifactId` | | `share` | The Maven `artifactId` of a Maven `war` Type Project defined in a Maven Repository.
*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* | | `alfresco.war.version` | *Maybe* | *See Below* | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.
*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* | -| `project.build.shareExtDirectory` | | `${project.build.directory}/ext/share` | An additional directory of JARs to add to the ACS Share at runtime. | | `acs-platform.url` | | *See Below* | The URL of the backend ACS Platform to be used. | -| `acs-share.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. | -| `acs-share.debugger.enabled` | | true | Enable the JDWP debugger. | | `acs-share.port` | | 8180 | The port to expose on `localhost` for the developer; not for other applications or users. | | `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. | -| `acs-share.timeout` | | 45000 | The time to wait for the startup to complete, in milliseconds. | -| `tomcat-rad.version` | | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). | +| `acs-share.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.
*May be overridden by any POM parent or Maven Tile.*
*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* | * 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-*-rad-tile` tiles. This should be overridden if you are not using those tiles and are instead using some other ACS Platform instance. @@ -67,7 +76,7 @@ The following properties are intended to be exposed by inheriting Public API Mav Additional less important configurations are inherited from the following Maven Tiles. -* [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile) +* [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile) * [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-rad-tile) ## Results diff --git a/beedk-acs-share-self-rad-tile/tile.xml b/beedk-acs-share-self-rad-tile/tile.xml index 949e1b4..51865d8 100644 --- a/beedk-acs-share-self-rad-tile/tile.xml +++ b/beedk-acs-share-self-rad-tile/tile.xml @@ -26,7 +26,7 @@ provided jar - ${project.build.shareExtDirectory} + ${beedk.deploy.share.extDirectory} @@ -76,61 +76,6 @@ - - - io.fabric8 - docker-maven-plugin - ${beedk.plugins.fabric8.docker.version} - - - run-acs-share - process-classes - start - - true - - - docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version} - acs-share - - - ${acs-share.debugger.enabled} - ${acs-share.hotswap.enabled} - - - ${acs-share.port}:8080 - ${acs-share.debugger.port}:8000 - - - custom - ${project.artifactId} - - - - ${project.build.warFile}:/var/lib/tomcat/webapps/share.war:ro - ${project.build.outputDirectory}:/var/lib/tomcat/dev/classes:ro - ${project.build.directory}/module-classes:/var/lib/tomcat/dev/classes-extra1:ro - ${project.build.directory}/extension-classes:/var/lib/tomcat/dev/classes-extra2:ro - ${project.build.testOutputDirectory}:/var/lib/tomcat/dev/classes-extra3:ro - ${project.build.shareExtDirectory}:/var/lib/tomcat/dev/lib:ro - ${project.build.directory}/web-resources:/var/lib/tomcat/dev/web:ro - - - - - http://localhost:${acs-share.port}/share - GET - 200..399 - - - - - - - - - - @@ -144,20 +89,16 @@ http://${project.artifactId}-acs-platform:8080 - true - true - 8100 - 45000 - ${project.build.directory}/ext/share - - - 8180 - - - 9-1.4 + ${project.build.warFile} + ${project.build.outputDirectory} + ${project.build.directory}/module-classes + ${project.build.directory}/extension-classes + ${project.build.testOutputDirectory} + ${project.build.directory}/ext/share + ${project.build.directory}/war + ${project.build.directory}/web-resources - share ${alfresco.share.version} @@ -165,7 +106,7 @@ - @project.groupId@:beedk-run-tile:@project.version@ + @project.groupId@:beedk-acs-share-rad-tile:@project.version@ @project.groupId@:beedk-acs-webapp-artifact-rad-tile:@project.version@ diff --git a/beedk-aps-ext-rad-tile/README.md b/beedk-aps-ext-rad-tile/README.md index 70ca726..6c3f99e 100644 --- a/beedk-aps-ext-rad-tile/README.md +++ b/beedk-aps-ext-rad-tile/README.md @@ -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.
*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. | diff --git a/beedk-aps-ext-rad-tile/tile.xml b/beedk-aps-ext-rad-tile/tile.xml index c8037b5..8ba5440 100644 --- a/beedk-aps-ext-rad-tile/tile.xml +++ b/beedk-aps-ext-rad-tile/tile.xml @@ -75,15 +75,7 @@ ${aps.memory} ${aps.hotswap.enabled} ${aps.debugger.enabled} - -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\&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} + ${aps.tomcat.opts} ${aps.port}:8080 @@ -95,6 +87,7 @@ + ${aps.license.directory}:/root/.activiti/enterprise-license:ro ${beedk.deploy.aps.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro ${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro ${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro @@ -151,6 +144,8 @@ 512m true true + ${user.home}/alfresco/license + ${alfresco.license.directory}/aps 5432 diff --git a/beedk-aps-rad-tile/README.md b/beedk-aps-rad-tile/README.md index c5654f3..c88b8dd 100644 --- a/beedk-aps-rad-tile/README.md +++ b/beedk-aps-rad-tile/README.md @@ -51,6 +51,8 @@ The following properties are intended to be exposed by inheriting Public API Mav | -------------------------- |:--------:| --------------- | ----------- | | `aps.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. | | `aps.timeout` | | 60000 | The time to wait for the startup to complete, in milliseconds. | +| `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. | | `aps.version` | | 1.11.1.1 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). | | `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. | diff --git a/beedk-aps-rad-tile/tile.xml b/beedk-aps-rad-tile/tile.xml index d736d71..b2f5fa6 100644 --- a/beedk-aps-rad-tile/tile.xml +++ b/beedk-aps-rad-tile/tile.xml @@ -56,7 +56,7 @@ - @user.home@/alfresco/license/aps:/root/.activiti/enterprise-license:ro + ${aps.license.directory}:/root/.activiti/enterprise-license:ro @@ -96,6 +96,10 @@ + + ${user.home}/alfresco/license + ${alfresco.license.directory}/aps + 8080 diff --git a/pom.xml b/pom.xml index a5decdc..fc7031b 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,9 @@ beedk-acs-platform-self-rad-tile beedk-acs-platform-sibling-rad-tile beedk-acs-platform-artifact-rad-tile + beedk-acs-share-rad-tile beedk-acs-share-self-rad-tile + beedk-acs-share-artifact-rad-tile beedk-ate-self-rad-tile beedk-ate-sibling-rad-tile beedk-aps-rad-tile