Commit 3f73c51c authored by Brian Long's avatar Brian Long
Browse files

downgrade to acs7.4/tomcat9; fix runtime issues

parent 2acc4dc6

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
	<properties>

		<alfresco.sdk.version>4.8.0</alfresco.sdk.version>

		<edition>community</edition>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

		<alfresco.share.version>23.2.0.72</alfresco.share.version>

		<alfresco.platform.version>7.4.2</alfresco.platform.version>

		<alfresco.share.version>22.17</alfresco.share.version>

		

    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<maven.compiler.source>8</maven.compiler.source>

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

+36 −8
Original line number Diff line number Diff line
@@ -52,10 +52,17 @@ 
									</run>

								</image>

								<image>

									<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>

									<name>apache/activemq-classic:${acs-activemq.version}</name>

									<alias>acs-mq</alias>

									<run>

										<skip>${skipTests}</skip>

										<env>

											<ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>false</ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>

											<ACTIVEMQ_USERNAME>alfresco</ACTIVEMQ_USERNAME>

											<ACTIVEMQ_PASSWORD>alfresco</ACTIVEMQ_PASSWORD>

											<ACTIVEMQ_WEBADMIN_USERNAME>admin</ACTIVEMQ_WEBADMIN_USERNAME>

											<ACTIVEMQ_WEBADMIN_PASSWORD>admin</ACTIVEMQ_WEBADMIN_PASSWORD>

										</env>

										<ports>

											<port>${acs-activemq.port}:8161</port>

										</ports>
@@ -74,14 +81,35 @@ 
											<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 \

											<CATALINA_OPTS>--add-opens=java.base/java.net=ALL-UNNAMED \

												-Dencryption.keystore.location=/tmp/metadata.keystore \

												-Dmetadata-keystore.password=alfresco \

												-Dmetadata-keystore.aliases=metadata \

												-Dmetadata-keystore.metadata.password=alfresco \

												-Dmetadata-keystore.metadata.algorithm=AES \

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

												-Dmessaging.broker.username=alfresco \

												-Dmessaging.broker.password=alfresco \

												-Dtransform.service.enabled=${beedk.deploy.ats.enabled} \

												-Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \

												-Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \

												-Dlocal.transform.service.enabled=${beedk.deploy.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.deploy.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \

												-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=false \

												-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.deploy.platform.index} \

												-Dsolr.host=${project.artifactId}-acs-search \

												-Dsolr.secureComms=secret \

												-Dsolr.sharedSecret=alfresco-secret \

												${acs-platform.tomcat.opts}</CATALINA_OPTS>

										</env>

										<ports>
@@ -124,7 +152,7 @@ 
									<alias>acs-db</alias>

								</image>

								<image>

									<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>

									<name>apache/activemq-classic:${acs-activemq.version}</name>

									<alias>acs-mq</alias>

								</image>

								<image>

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
		<maven.compiler.target>8</maven.compiler.target>



		<alfresco.sdk.version>4.8.0</alfresco.sdk.version>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

		<alfresco.platform.version>7.4.2</alfresco.platform.version>

	</properties>



	<dependencyManagement>

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ The following properties are only intended to be defined by BeeDK components. 
| `beedk.rad.acs-search.enabled`       |          | false              | **Do not** set explicitly; just include the [`beedk-acs-search-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) tile **AFTER** this tile. |

| `beedk.rad.alts.enabled`             |          | false              | **Do not** set explicitly; just include the [`beedk-acs-lts-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) tile **AFTER** this tile. |

| `beedk.rad.ats.enabled`              |          | false              | **Do not** set explicitly; just include the [`beedk-ats-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) tile **AFTER** this tile. |

| `acs-api-explorer.version`           |          | `23.2.0`           | The API Explorer version.  You could use `${alfresco.platform.version}` in ACS Enterprise.  This will eventually parse the ACS Platform version for the right value. |

| `acs-api-explorer.version`           |          | `7.4.2`           | The API Explorer version.  You could use `${alfresco.platform.version}` in ACS Enterprise.  This will eventually parse the ACS Platform version for the right value. |



### Other APIs