downgrade to acs7.4/tomcat9; fix runtime issues

2024-08-07 14:32:48 -04:00 · 2024-08-07 14:32:48 -04:00 · 3f73c51c9d
commit 3f73c51c9d
parent 2acc4dc634
14 changed files with 91 additions and 29 deletions
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@ -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>
--- a/beedk-acs-platform-it-tile/tile.xml
+++ b/beedk-acs-platform-it-tile/tile.xml
@ -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>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/metadata.keystore
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/metadata.keystore
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml
@ -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>
--- a/beedk-acs-platform-rad-tile/README.md
+++ b/beedk-acs-platform-rad-tile/README.md
@ -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

--- a/beedk-acs-platform-rad-tile/tile.xml
+++ b/beedk-acs-platform-rad-tile/tile.xml
@ -99,9 +99,16 @@
 											</run>
 										</image>
 										<image>
-											<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>
+											<name>apache/activemq-classic:${acs-activemq.version}</name>
 											<alias>acs-mq</alias>
 											<run>
+												<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>
@ -120,14 +127,35 @@
 													<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 \
+													<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.rad.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.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 \
+														-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.rad.platform.index} \
+														-Dsolr.host=${project.artifactId}-acs-search \
+														-Dsolr.secureComms=secret \
+														-Dsolr.sharedSecret=alfresco-secret \
 														${acs-platform.tomcat.opts}</CATALINA_OPTS>
 												</env>
 												<ports>
@ -151,6 +179,7 @@
 														<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
 														<volume>${beedk.deploy.platform.webDirectory}:/var/lib/tomcat/dev/web:ro</volume>
 														<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
+														<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
 													</bind>
 												</volumes>
 												<wait>
@ -266,7 +295,7 @@
 				<acs-platform.debugger.port>8000</acs-platform.debugger.port>
 				
 				<!-- versions -->
-				<acs-api-explorer.version>23.2.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
+				<acs-api-explorer.version>7.4.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
 				<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
 				<acs-postgres.version>12</acs-postgres.version>
 				<acs-activemq.version>5.18.4</acs-activemq.version>
--- a/beedk-acs-platform-self-it-tile/tile.xml
+++ b/beedk-acs-platform-self-it-tile/tile.xml
@ -99,6 +99,7 @@

 				<!-- versions -->
 				<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
+				<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
 				
 				<!-- configuring beedk-acs-platform-it-tile -->
 				<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
@ -106,7 +107,7 @@
 				<beedk.deploy.platform.extDirectory>${project.build.extDirectory}</beedk.deploy.platform.extDirectory>

 				<!-- configuring beedk-acs-webapp-artifact-tile -->
-				<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
+				<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-platform-self-rad-tile/tile.xml
+++ b/beedk-acs-platform-self-rad-tile/tile.xml
@ -103,6 +103,7 @@
 			<properties>
 				<!-- versions -->
 				<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
+				<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
 				
 				<!-- configuring beedk-acs-platform-rad-tile -->
 				<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
@ -115,7 +116,7 @@
 				<beedk.deploy.platform.webDirectory>${project.build.directory}/web-resources</beedk.deploy.platform.webDirectory>

 				<!-- configuring beedk-acs-webapp-artifact-tile -->
-				<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
+				<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-platform-webapp-tile/tile.xml
+++ b/beedk-acs-platform-webapp-tile/tile.xml
@ -95,7 +95,8 @@
 			</activation>
 			<properties>
 				<!-- configuring beedk-acs-webapp-artifact-tile -->
-				<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
+				<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
+				<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-search-it-tile/tile.xml
+++ b/beedk-acs-search-it-tile/tile.xml
@ -42,7 +42,8 @@
 											<SOLR_SOLR_HOST>${project.artifactId}-acs-search</SOLR_SOLR_HOST>
 											<SOLR_SOLR_PORT>8983</SOLR_SOLR_PORT>
 											<SOLR_CREATE_ALFRESCO_DEFAULTS>alfresco</SOLR_CREATE_ALFRESCO_DEFAULTS>
-											<ALFRESCO_SECURE_COMMS>none</ALFRESCO_SECURE_COMMS>
+											<ALFRESCO_SECURE_COMMS>secret</ALFRESCO_SECURE_COMMS>
+											<JAVA_TOOL_OPTIONS>-Dalfresco.secureComms.secret=alfresco-secret</JAVA_TOOL_OPTIONS>
 										</env>
 										<network>
 											<mode>custom</mode>
--- a/beedk-acs-search-rad-tile/tile.xml
+++ b/beedk-acs-search-rad-tile/tile.xml
@ -49,7 +49,8 @@
 													<SOLR_SOLR_HOST>${project.artifactId}-acs-search</SOLR_SOLR_HOST>
 													<SOLR_SOLR_PORT>8983</SOLR_SOLR_PORT>
 													<SOLR_CREATE_ALFRESCO_DEFAULTS>alfresco</SOLR_CREATE_ALFRESCO_DEFAULTS>
-													<ALFRESCO_SECURE_COMMS>none</ALFRESCO_SECURE_COMMS>
+													<ALFRESCO_SECURE_COMMS>secret</ALFRESCO_SECURE_COMMS>
+													<JAVA_TOOL_OPTIONS>-Dalfresco.secureComms.secret=alfresco-secret</JAVA_TOOL_OPTIONS>
 												</env>
 												<ports>
 													<port>${acs-search.port}:8983</port>
--- a/beedk-acs-search-test-tile/tile.xml
+++ b/beedk-acs-search-test-tile/tile.xml
@ -28,7 +28,7 @@
 			</activation>
 			<properties>
 				<!-- versions -->
-				<acs-search.version>2.0.8.1</acs-search.version>
+				<acs-search.version>2.0.11</acs-search.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml
@ -16,8 +16,8 @@
 		<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.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>
 	</properties>

 	<dependencyManagement>
--- a/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-springboot-api-archetype/src/main/resources/archetype-resources/pom.xml
@ -17,7 +17,7 @@

 		<!-- for RAD environment -->
 		<edition>community</edition>
-		<alfresco.platform.version>23.2.0</alfresco.platform.version>
+		<alfresco.platform.version>7.4.2</alfresco.platform.version>
 		
 		<!-- for Docker deployment -->
 		<docker.image.registry>${dockerRegistryHost}</docker.image.registry>