Commit be462b6d authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 42d3c38e 585b2cf7

beedk-acs-platform-it-tile/README.md

+2 −0
Original line number Diff line number Diff line
@@ -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.<br/>*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. |

beedk-acs-platform-it-tile/tile.xml

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
										</network>

										<volumes>

											<bind>

												<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>

												<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>

												<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>

												<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
@@ -196,6 +197,8 @@ 
				<beedk.deploy.platform.dataDirectory>${project.build.directory}/alf_data</beedk.deploy.platform.dataDirectory>

				<acs-platform.timeout>120000</acs-platform.timeout>

				<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>



				<!-- ports -->

				<acs-postgres.port>5432</acs-postgres.port>

beedk-acs-platform-rad-tile/README.md

+3 −0
Original line number Diff line number Diff line
@@ -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.<br/>*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. |

beedk-acs-platform-rad-tile/tile.xml

+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
													<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>

													<ENABLE_JDWP>${acs-platform.debugger.enabled}</ENABLE_JDWP>

													<ENABLE_HOTSWAP>${acs-platform.hotswap.enabled}</ENABLE_HOTSWAP>

													<DISABLE_HOTSWAP_PLUGINS>${acs-platform.hotswap.disablePlugins}</DISABLE_HOTSWAP_PLUGINS>

													<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 \
@@ -125,6 +126,7 @@ 
												</network>

												<volumes>

													<bind>

														<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license: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>
@@ -234,11 +236,14 @@ 
				<acs-platform.memory>1g</acs-platform.memory>

				<acs-platform.debugger.enabled>true</acs-platform.debugger.enabled>

				<acs-platform.hotswap.enabled>true</acs-platform.hotswap.enabled>

				<acs-platform.hotswap.disablePlugins>Hibernate</acs-platform.hotswap.disablePlugins>

				<acs-api-explorer.war.groupId>org.alfresco</acs-api-explorer.war.groupId>

				<acs-api-explorer.war.artifactId>api-explorer</acs-api-explorer.war.artifactId>

				<acs-api-explorer.war.version>${acs-api-explorer.version}</acs-api-explorer.war.version>

				<beedk.deploy.api-explorer.warFile>${beedk.deploy.platform.warDirectory}/${acs-api-explorer.war.artifactId}-${acs-api-explorer.war.version}.war</beedk.deploy.api-explorer.warFile>

				<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>



				<!-- ports -->

				<acs-postgres.port>5432</acs-postgres.port>

beedk-acs-platform-self-rad-tile/README.md

+1 −2
Original line number Diff line number Diff line
@@ -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).<br/>*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).<br/>*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.<br/>*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.<br/>*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.<br/>*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.<br/>*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* |