Commit 827e693e authored by Brian Long's avatar Brian Long
Browse files

added license loading

parent 46ba0521
Loading
Loading
Loading
Loading
+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. |

+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>
+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,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. |
+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,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>
@@ -239,6 +240,8 @@
				<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>
+2 −0
Original line number Diff line number Diff line
@@ -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. |

Loading