Commit 3777dad5 authored by Brian Long's avatar Brian Long
Browse files

updated RAD docker image/config

parent a889607c

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

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
										<skip>${skipTests}</skip>

										<env>

											<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>

											<ENABLE_JDWP>false</ENABLE_JDWP>

											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>

											<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.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -203,7 +205,7 @@ 
				<!-- versions -->

				<acs-postgres.version>9.6</acs-postgres.version>

				<acs-activemq.version>5.15.8</acs-activemq.version>

				<tomcat-rad.version>9-1.3</tomcat-rad.version>

				<tomcat-rad.version>9-1.4</tomcat-rad.version>

			</properties>

		</profile>

	</profiles>

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

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 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.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. |

| `acs-activemq.port`        |          | 8161            | The port to expose on `localhost` for the developer; not for other applications or users. |

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

+5 −1
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
											<run>

												<env>

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

													<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 \
@@ -230,6 +232,8 @@ 
				<beedk.deploy.platform.warDirectory>${project.build.warDirectory}</beedk.deploy.platform.warDirectory>

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

				<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-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>
@@ -247,7 +251,7 @@ 
				<acs-aos.war.version>1.3.2.1</acs-aos.war.version>

				<acs-postgres.version>9.6</acs-postgres.version>

				<acs-activemq.version>5.15.8</acs-activemq.version>

				<tomcat-rad.version>9-1.3</tomcat-rad.version>

				<tomcat-rad.version>9-1.4</tomcat-rad.version>

			</properties>

		</profile>

	</profiles>

beedk-acs-share-self-it-tile/tile.xml

+5 −1
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ 
									<alias>acs-share</alias>

									<run>

										<skip>${skipTests}</skip>

										<env>

											<ENABLE_JDWP>false</ENABLE_JDWP>

											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>

										</env>

										<ports>

											<port>${acs-share.port}:8080</port>

										</ports>
@@ -148,7 +152,7 @@ 
				<acs-share.port>8180</acs-share.port>



				<!-- versions -->

				<tomcat-rad.version>9-1.3</tomcat-rad.version>

				<tomcat-rad.version>9-1.4</tomcat-rad.version>

				

				<!-- configuring beedk-acs-webapp-artifact-tile -->

				<alfresco.war.artifactId>share</alfresco.war.artifactId>

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

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav 
| `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.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. |