diff --git a/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml index 09ab90d9e..7022b45e8 100755 --- a/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/acl_id/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml index a17fa6d8c..90c954edb 100755 --- a/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/date/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml index ff08c2f1e..ebf9f821b 100755 --- a/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/db_id/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml index f98acd71b..5dc7cacb1 100755 --- a/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/db_id_range/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml index 5042bce2f..1542cc03d 100755 --- a/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/explicit_id/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/lris/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/lris/docker-compose.yml index 0f64f2e57..68863217c 100755 --- a/e2e-test/release-testing/insight-engine-sharding/lris/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/lris/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml index 68adf7efd..a73660f07 100755 --- a/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/mod_acl_id/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m diff --git a/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml b/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml index 5b84df362..5855a5e20 100755 --- a/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml +++ b/e2e-test/release-testing/insight-engine-sharding/property/docker-compose.yml @@ -11,6 +11,16 @@ services: COMPRESS_CONTENT: "false" mem_limit: 1800m environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,11 +32,9 @@ services: -Dsolr.baseUrl=/solr -Dsolr.useDynamicShardRegistration=true -Dindex.subsystem.name=solr6 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -36,7 +44,6 @@ services: -Dimg.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m