From f8a1697e34c17339ba4dcbca01ef309727f729d2 Mon Sep 17 00:00:00 2001 From: Rashmi Itagi Date: Tue, 24 Jul 2018 17:03:45 +0100 Subject: [PATCH 1/6] RM-6269 alfresco-ags to alfresco-governance-services and alfresco.rm.artifactId to ags.artifactId --- pom.xml | 8 +++--- rm-automation/pom.xml | 26 +++++++++---------- .../rm-automation-community-rest-api/pom.xml | 10 +++---- rm-community/pom.xml | 6 ++--- .../org_alfresco_module_rm/module.properties | 4 +-- rm-community/rm-community-repo/pom.xml | 16 ++++++------ .../rm-community-rest-api-explorer/pom.xml | 6 ++--- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index f3c2e61eec..02fa1a4065 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.alfresco - alfresco-rm + alfresco-governance-services pom 3.0.0-SNAPSHOT - Alfresco Records Management + Alfresco Governance Services http://www.alfresco.org/ 2005 @@ -587,14 +587,14 @@ - rm.module.repo.version.min + ags.module.repo.version.min ${alfresco.version} (\d+)\.(\d+).* $1.$2 false - rm.module.version + ags.module.version ${project.version} ([0-9\.]*[0-9]).* $1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1033c353a4..665e9668bf 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation + alfresco-governance-services-automation + Alfresco Governance Services Automation pom org.alfresco - alfresco-rm + alfresco-governance-services 3.0.0-SNAPSHOT @@ -131,7 +131,7 @@ - apply-rm-community + apply-alfresco-governance-services-community @@ -147,13 +147,13 @@ org.alfresco - alfresco-rm-community-share + alfresco-governance-services-community-share ${project.version} amp org.alfresco - alfresco-rm-community-repo + alfresco-governance-services-community-repo ${project.version} amp @@ -178,7 +178,7 @@ true - ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp + ${project.build.directory}/amps/alfresco-governance-services-community-repo-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war @@ -193,7 +193,7 @@ true - ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp + ${project.build.directory}/amps/alfresco-governance-services-community-share-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/share.war @@ -205,7 +205,7 @@ - apply-rm-enterprise + apply-alfresco-governance-services-enterprise @@ -221,13 +221,13 @@ org.alfresco - ${alfresco.rm.share} + ${ags.share} ${project.version} amp org.alfresco - ${alfresco.rm.repo} + ${ags.repo} ${project.version} amp @@ -251,7 +251,7 @@ process-test-resources true - ${project.build.directory}/amps/${alfresco.rm.repo}-${project.version}.amp + ${project.build.directory}/amps/${ags.repo}-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war @@ -263,7 +263,7 @@ process-test-resources true - ${project.build.directory}/amps/${alfresco.rm.share}-${project.version}.amp + ${project.build.directory}/amps/${ags.share}-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/share.war diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 36080c3d8e..27eb1e4ae9 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -2,19 +2,19 @@ 4.0.0 - alfresco-rm-automation-community-rest-api - Alfresco Records Management Automation Community REST API + alfresco-governance-services-automation-community-rest-api + Alfresco Governance Services Automation Community REST API org.alfresco - alfresco-rm-automation + alfresco-governance-services-automation 3.0.0-SNAPSHOT 1.8 - alfresco-rm-community-share - alfresco-rm-community-repo + alfresco-governance-services-community-share + alfresco-governance-services-community-repo 5.2.0-10 2.0.0 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d20b147c15..679fcbc3e4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - alfresco-rm-community - Alfresco Records Management Community + alfresco-governance-services-community + Alfresco Governance Services Community pom org.alfresco - alfresco-rm + alfresco-governance-services 3.0.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties index d315370d7b..3be43760fb 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,5 +6,5 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=${rm.module.version} -module.repo.version.min=${rm.module.repo.version.min} \ No newline at end of file +module.version=${ags.module.version} +module.repo.version.min=${ags.module.repo.version.min} \ No newline at end of file diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 68d5a5f3ad..781f57bcd0 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - alfresco-rm-community-repo - Alfresco Records Management Community Repo - Alfresco Record Management Community Repository Extension + alfresco-governance-services-community-repo + Alfresco Governance Services Community Repo + Alfresco Governance Services Community Repository Extension amp org.alfresco - alfresco-rm-community + alfresco-governance-services-community 3.0.0-SNAPSHOT @@ -23,7 +23,7 @@ alfresco-test alfresco-platform 9.1-901.jdbc4 - alfresco-rm-community-repo + alfresco-governance-services-community-repo true @@ -223,7 +223,7 @@ org.alfresco - alfresco-rm-community-rest-api-explorer + alfresco-governance-services-community-rest-api-explorer ${project.version} war gs-api-explorer-${project.version}.war @@ -257,7 +257,7 @@ alfresco-maven-plugin - attach-rm-jar + attach-governance-services-jar amp @@ -585,7 +585,7 @@ org.alfresco - alfresco-rm-community-rest-api-explorer + alfresco-governance-services-community-rest-api-explorer ${project.version} /gs-api-explorer war diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 3dad123d3c..764fda6b2b 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - alfresco-rm-community-rest-api-explorer - Alfresco Records Management Community REST API Explorer + alfresco-governance-services-community-rest-api-explorer + Alfresco Governance Services Community REST API Explorer war org.alfresco - alfresco-rm-community + alfresco-governance-services-community 3.0.0-SNAPSHOT From 2ff92641dcac02270e71f20bb99aad2b28763490 Mon Sep 17 00:00:00 2001 From: Rashmi Itagi Date: Tue, 24 Jul 2018 17:09:07 +0100 Subject: [PATCH 2/6] RM-6269 attach-rm-jar to attach-alfresco-governance-services-jar --- rm-community/rm-community-repo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 781f57bcd0..e3b65954cd 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -257,7 +257,7 @@ alfresco-maven-plugin - attach-governance-services-jar + attach-alfresco-governance-services-jar amp From b83b3e76311263fe25c34f53176f1bfdfab7835f Mon Sep 17 00:00:00 2001 From: Rashmi Itagi Date: Mon, 20 Aug 2018 11:55:03 +0100 Subject: [PATCH 3/6] RM-6269 Changed the rm to governance-services in the names of the amp files in Dockerfiles --- rm-community/rm-community-repo/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile index a3b7b72169..aca25a856e 100644 --- a/rm-community/rm-community-repo/Dockerfile +++ b/rm-community/rm-community-repo/Dockerfile @@ -1,9 +1,9 @@ FROM alfresco/alfresco-content-repository-community:6.0.7-ga -COPY target/alfresco-rm-community-repo-*.amp /usr/local/tomcat/amps/ +COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/ RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \ - /usr/local/tomcat/amps/alfresco-rm-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup + /usr/local/tomcat/amps/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup ### Copy gs-api-explorer war into webapps folder COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/ From 6c52e5891dee86b2a2671735e020ea3b2c03bece Mon Sep 17 00:00:00 2001 From: Rashmi Itagi Date: Mon, 20 Aug 2018 16:38:11 +0100 Subject: [PATCH 4/6] RM-6269 Changed the module folder names on enterprise --- README.md | 2 +- .../bootstrap/ModuleCompatibilityComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ce5ab2ae7..456746f679 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Please refer to our [How to contribute](/CONTRIBUTING.md) guide and our [Contrib rm-community/rm-community-share/ or rm-enterprise/rm-enterprise-share/ ) ## Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL) -* Create a file called _local.properties_ under src/main/resources in alfresco-rm-enterprise-repo +* Create a file called _local.properties_ under src/main/resources in alfresco-governance-services-enterprise-repo * Add the following properties in this new file ``` diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java index b30dc0269d..85f07c0ceb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java @@ -53,7 +53,7 @@ public class ModuleCompatibilityComponent implements ApplicationListener Date: Mon, 20 Aug 2018 20:13:03 +0300 Subject: [PATCH 5/6] Revert "RM-6269 Changed the module folder names on enterprise" This reverts commit 6c52e58 --- README.md | 2 +- .../bootstrap/ModuleCompatibilityComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 456746f679..2ce5ab2ae7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Please refer to our [How to contribute](/CONTRIBUTING.md) guide and our [Contrib rm-community/rm-community-share/ or rm-enterprise/rm-enterprise-share/ ) ## Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL) -* Create a file called _local.properties_ under src/main/resources in alfresco-governance-services-enterprise-repo +* Create a file called _local.properties_ under src/main/resources in alfresco-rm-enterprise-repo * Add the following properties in this new file ``` diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java index 85f07c0ceb..b30dc0269d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java @@ -53,7 +53,7 @@ public class ModuleCompatibilityComponent implements ApplicationListener Date: Tue, 21 Aug 2018 10:59:23 +0300 Subject: [PATCH 6/6] changed profile ids --- rm-automation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 8984ae2b6f..508456a569 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -131,7 +131,7 @@ - apply-alfresco-governance-services-community + apply-ags-community @@ -205,7 +205,7 @@ - apply-alfresco-governance-services-enterprise + apply-ags-enterprise