From 32a27e4f53924cc8a8572bd04412f06ebdf0ac33 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Wed, 19 Dec 2018 17:38:59 +0100 Subject: [PATCH 1/4] Archetypes - disable CSRF filter ACS Disable the CSRF filter in ACS containers. --- .../src/main/docker/alfresco-global.properties | 4 +++- .../src/main/docker/alfresco-global.properties | 4 +++- .../resources/archetype-resources/docker/docker-compose.yml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties index 4cc31846..323465e7 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties @@ -74,4 +74,6 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco # File servers related properties # For local runs we disable CIFS and FTP cifs.enabled=false -ftp.enabled=false \ No newline at end of file +ftp.enabled=false + +csrf.filter.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties index 4cc31846..323465e7 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties @@ -74,4 +74,6 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco # File servers related properties # For local runs we disable CIFS and FTP cifs.enabled=false -ftp.enabled=false \ No newline at end of file +ftp.enabled=false + +csrf.filter.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 9c9d4961..d6ab8935 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -26,6 +26,7 @@ services: -Dsolr.secureComms=none -Dsolr.base.url=/solr -Dindex.subsystem.name=solr6 + -Dcsrf.filter.enabled=false " ports: - "${symbol_dollar}{acs.port}:8080" From 2c9fc00ea4b873c2f347ba5de68dfc272f93ef02 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Wed, 19 Dec 2018 17:54:34 +0100 Subject: [PATCH 2/4] Archetypes - Properly align community versions Change the share version to be properly aligned with the platform version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68301c15..8606b3bc 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ acs-community-packaging 6.0.7-ga - 6.0.c + 6.0.b alfresco/alfresco-content-repository-community alfresco/alfresco-share From 0d158017e43a20e590324e9d621510d2a9d74279 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Thu, 20 Dec 2018 08:20:51 +0100 Subject: [PATCH 3/4] Archetypes - Fix integration tests Fix the integration tests for the archetypes and update the version to ACS 6. The integration tests must be enhanced to enable more checks and not only the packaging of the created project without any test execution. --- .../src/test/resources/projects/basic/goal.txt | 2 +- .../src/test/resources/projects/run-enterprise/goal.txt | 1 - .../resources/projects/run-enterprise42/archetype.properties | 4 ---- .../src/test/resources/projects/run-enterprise42/goal.txt | 1 - .../resources/projects/run-enterprise50/archetype.properties | 4 ---- .../src/test/resources/projects/run-enterprise50/goal.txt | 1 - .../src/test/resources/projects/run-enterprise51/goal.txt | 1 - .../src/test/resources/projects/run/goal.txt | 2 +- .../resources/projects/runenterprise60}/archetype.properties | 2 +- .../src/test/resources/projects/runenterprise60/goal.txt | 1 + .../src/test/resources/projects/basic/goal.txt | 2 +- .../resources/projects/run-enterprise/archetype.properties | 4 ---- .../src/test/resources/projects/run-enterprise/goal.txt | 1 - .../resources/projects/runenterprise60}/archetype.properties | 2 +- .../src/test/resources/projects/runenterprise60/goal.txt | 1 + .../src/test/resources/projects/basic/goal.txt | 2 +- .../src/test/resources/projects/run-enterprise/goal.txt | 1 - .../resources/projects/runenterprise60}/archetype.properties | 2 +- .../src/test/resources/projects/runenterprise60/goal.txt | 1 + 19 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/archetype.properties delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/archetype.properties delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt delete mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt rename archetypes/{alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise => alfresco-allinone-archetype/src/test/resources/projects/runenterprise60}/archetype.properties (56%) create mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/goal.txt delete mode 100644 archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties delete mode 100644 archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt rename archetypes/{alfresco-allinone-archetype/src/test/resources/projects/run-enterprise => alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60}/archetype.properties (57%) create mode 100644 archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt delete mode 100644 archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt rename archetypes/{alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51 => alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60}/archetype.properties (56%) create mode 100644 archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/basic/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/basic/goal.txt index b0b258dc..4e83e94e 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/basic/goal.txt +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/basic/goal.txt @@ -1 +1 @@ -verify -Dmaven.test.skip=true +verify -DskipTests=true diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt deleted file mode 100644 index ac141d4f..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dalfresco.share.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=enterprise \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/archetype.properties deleted file mode 100644 index efcf71d5..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=1.0 -groupId=archetype.it -artifactId=allInOneTestRunEnterpriseFourTwo -package=it.pkg diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt deleted file mode 100644 index b6ba3863..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=4.2.7 -Dalfresco.share.version=4.2.7 -Dmaven.alfresco.edition=enterprise \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/archetype.properties deleted file mode 100644 index 4f00851b..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=allInOneTestRunEnterpriseFiveZero -package=it.pkg diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt deleted file mode 100644 index 5658ca18..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=5.0 -Dalfresco.share.version=5.0 -Dmaven.alfresco.edition=enterprise \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt deleted file mode 100644 index 88c3140b..00000000 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=5.1 -Dalfresco.share.version=5.1 -Dmaven.alfresco.edition=enterprise \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt index 7c32f559..2207ef2e 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt @@ -1 +1 @@ -install +install -DskipTests diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/archetype.properties similarity index 56% rename from archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties rename to archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/archetype.properties index 8ea0dbb4..fb04fb2c 100644 --- a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/archetype.properties @@ -1,4 +1,4 @@ version=0.1-SNAPSHOT groupId=archetype.it -artifactId=shareJarTestRunEnterprise +artifactId=allInOneTestRunEnterpriseSixZero package=it.pkg diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/goal.txt new file mode 100644 index 00000000..5885d5ae --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/goal.txt @@ -0,0 +1 @@ +install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share" diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/goal.txt b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/goal.txt index b0b258dc..4e83e94e 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/goal.txt +++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/goal.txt @@ -1 +1 @@ -verify -Dmaven.test.skip=true +verify -DskipTests=true diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties deleted file mode 100644 index c614b155..00000000 --- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties +++ /dev/null @@ -1,4 +0,0 @@ -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=repoJarTestRunEnterprise -package=it.pkg \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt deleted file mode 100644 index 1874e9c0..00000000 --- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@ \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties similarity index 57% rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties rename to archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties index b3d65051..e81124d9 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties +++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties @@ -1,4 +1,4 @@ version=0.1-SNAPSHOT groupId=archetype.it -artifactId=allInOneTestRunEnterprise +artifactId=repoJarTestRunEnterpriseSixZero package=it.pkg diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt new file mode 100644 index 00000000..5885d5ae --- /dev/null +++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt @@ -0,0 +1 @@ +install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share" diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/basic/goal.txt b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/basic/goal.txt index b0b258dc..4e83e94e 100644 --- a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/basic/goal.txt +++ b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/basic/goal.txt @@ -1 +1 @@ -verify -Dmaven.test.skip=true +verify -DskipTests=true diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt deleted file mode 100644 index 1874e9c0..00000000 --- a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@ \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/archetype.properties b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties similarity index 56% rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/archetype.properties rename to archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties index e5992e5d..9db88c53 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/archetype.properties +++ b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties @@ -1,4 +1,4 @@ version=0.1-SNAPSHOT groupId=archetype.it -artifactId=allInOneTestRunEnterpriseFiveOne +artifactId=shareJarTestRunEnterpriseSixZero package=it.pkg diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt new file mode 100644 index 00000000..5885d5ae --- /dev/null +++ b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt @@ -0,0 +1 @@ +install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share" From 8dd1ba923ad58706b79ac987f8f0f3d6e5cd0e7b Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Thu, 20 Dec 2018 08:55:15 +0100 Subject: [PATCH 4/4] Archetypes - Change docker volume names Modify the docker volume names to be dependant of the name of the project. This way, we can avoid issues with docker volume name clashes with other projects that were generated with the SDK. --- .../archetype-resources/docker/docker-compose.yml | 14 +++++++------- .../src/main/resources/archetype-resources/run.bat | 12 ++++++------ .../src/main/resources/archetype-resources/run.sh | 12 ++++++------ .../archetype-resources/docker/docker-compose.yml | 14 +++++++------- .../src/main/resources/archetype-resources/run.bat | 12 ++++++------ .../src/main/resources/archetype-resources/run.sh | 12 ++++++------ .../archetype-resources/docker/docker-compose.yml | 14 +++++++------- .../src/main/resources/archetype-resources/run.bat | 12 ++++++------ .../src/main/resources/archetype-resources/run.sh | 12 ++++++------ 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 1cce4be7..d96e0cbd 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -24,7 +24,7 @@ services: - "${symbol_dollar}{acs.port}:8080" - "${symbol_dollar}{acs.debug.port}:8888" volumes: - - alf-acs-volume:/usr/local/tomcat/alf_data + - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data depends_on: - ${rootArtifactId}-postgres ${rootArtifactId}-postgres: @@ -36,7 +36,7 @@ services: ports: - "${symbol_dollar}{postgres.port}:5432" volumes: - - alf-db-volume:/var/lib/postgresql/data + - ${rootArtifactId}-db-volume:/var/lib/postgresql/data ${rootArtifactId}-ass: image: alfresco/alfresco-search-services:1.2.0 environment: @@ -48,12 +48,12 @@ services: ports: - "8983:8983" volumes: - - alf-ass-volume:/opt/alfresco-search-services/contentstore - - alf-ass-volume:/opt/alfresco-search-services/data + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data volumes: - alf-acs-volume: + ${rootArtifactId}-acs-volume: external: true - alf-db-volume: + ${rootArtifactId}-db-volume: external: true - alf-ass-volume: + ${rootArtifactId}-ass-volume: external: true \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat index 83244366..582c521d 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat @@ -62,9 +62,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|reload_acs|build EXIT /B %ERRORLEVEL% :start - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :start_share @@ -100,7 +100,7 @@ EXIT /B 0 call mvn verify -pl integration-tests EXIT /B 0 :purge - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh index c8888bc0..7659621f 100755 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh @@ -4,9 +4,9 @@ export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml start() { - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d } @@ -23,9 +23,9 @@ down() { } purge() { - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume } build() { diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 59df56eb..7359d985 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -20,7 +20,7 @@ services: - "${symbol_dollar}{acs.port}:8080" - "${symbol_dollar}{acs.debug.port}:8888" volumes: - - alf-acs-volume:/usr/local/tomcat/alf_data + - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data depends_on: - ${rootArtifactId}-postgres ${rootArtifactId}-postgres: @@ -32,7 +32,7 @@ services: ports: - "${symbol_dollar}{postgres.port}:5432" volumes: - - alf-db-volume:/var/lib/postgresql/data + - ${rootArtifactId}-db-volume:/var/lib/postgresql/data ${rootArtifactId}-ass: image: alfresco/alfresco-search-services:1.2.0 environment: @@ -44,12 +44,12 @@ services: ports: - "8983:8983" volumes: - - alf-ass-volume:/opt/alfresco-search-services/contentstore - - alf-ass-volume:/opt/alfresco-search-services/data + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data volumes: - alf-acs-volume: + ${rootArtifactId}-acs-volume: external: true - alf-db-volume: + ${rootArtifactId}-db-volume: external: true - alf-ass-volume: + ${rootArtifactId}-ass-volume: external: true \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat index 454ccdd8..0c1ee408 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -50,9 +50,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|build_test|test}" EXIT /B %ERRORLEVEL% :start - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :down @@ -69,7 +69,7 @@ EXIT /B 0 call mvn verify EXIT /B 0 :purge - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh index f92f8db4..3789d951 100755 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -4,9 +4,9 @@ export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml start() { - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d } @@ -15,9 +15,9 @@ down() { } purge() { - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume } build() { diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index d6ab8935..ed3910ab 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -31,7 +31,7 @@ services: ports: - "${symbol_dollar}{acs.port}:8080" volumes: - - alf-acs-volume:/usr/local/tomcat/alf_data + - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data depends_on: - ${rootArtifactId}-postgres ${rootArtifactId}-postgres: @@ -43,7 +43,7 @@ services: ports: - "${symbol_dollar}{postgres.port}:5432" volumes: - - alf-db-volume:/var/lib/postgresql/data + - ${rootArtifactId}-db-volume:/var/lib/postgresql/data ${rootArtifactId}-ass: image: alfresco/alfresco-search-services:1.2.0 environment: @@ -55,12 +55,12 @@ services: ports: - "8983:8983" volumes: - - alf-ass-volume:/opt/alfresco-search-services/contentstore - - alf-ass-volume:/opt/alfresco-search-services/data + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore + - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data volumes: - alf-acs-volume: + ${rootArtifactId}-acs-volume: external: true - alf-db-volume: + ${rootArtifactId}-db-volume: external: true - alf-ass-volume: + ${rootArtifactId}-ass-volume: external: true \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat index fa672748..eb8c4fc8 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -56,9 +56,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|build_test|test} EXIT /B %ERRORLEVEL% :start - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :start_share @@ -85,7 +85,7 @@ EXIT /B 0 call mvn verify -pl EXIT /B 0 :purge - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh index 1ee67489..0c7474c7 100755 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -4,9 +4,9 @@ export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml start() { - docker volume create alf-acs-volume - docker volume create alf-db-volume - docker volume create alf-ass-volume + docker volume create ${rootArtifactId}-acs-volume + docker volume create ${rootArtifactId}-db-volume + docker volume create ${rootArtifactId}-ass-volume docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d } @@ -19,9 +19,9 @@ down() { } purge() { - docker volume rm alf-acs-volume - docker volume rm alf-db-volume - docker volume rm alf-ass-volume + docker volume rm ${rootArtifactId}-acs-volume + docker volume rm ${rootArtifactId}-db-volume + docker volume rm ${rootArtifactId}-ass-volume } build() {