From efca2ce538fbef39bbeb60fdca97d980680117e2 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 14 Oct 2024 13:33:30 +0100 Subject: [PATCH] feat: Combine Social Web Archives to one single social.war - Meeds-io/MIPs#150 This change will Modify the pages definition to use 'social' instead of 'social-portlet' to reference the Social Module portlets. See https://github.com/Meeds-io/social/pull/4114/commits/9e0766a1069cd23d6af7f094637ab17a4344dc70 for more information about this change. A dedicated configuration to upgrade the existing pages has been added to upgrade the existing pages to reference the new Webapp Module instead of deleted 'social-portlet' module. --- packaging/plf-dependencies/pom.xml | 10 +- .../resources/conf/platform/configuration.xml | 5 +- .../social/spaces-templates-configuration.xml | 6 +- .../template/navigationWebsite/pages.xml | 4 +- .../template/navigationWebsite/portal.xml | 4 +- .../portal/template/spacePublic/pages.xml | 8 +- .../portal/template/spacePublic/portal.xml | 4 +- .../template/pages/spaceHomePage/page.xml | 12 +- .../sites/portal-upgrade-configuration.xml | 1113 ++++++++++++++++- .../sites/portal/administration/pages.xml | 12 +- .../sites/portal/administration/portal.xml | 4 +- .../conf/sites/portal/contribute/pages.xml | 2 +- .../conf/sites/portal/global/pages.xml | 34 +- .../conf/sites/portal/mycraft/pages.xml | 6 +- .../conf/sites/portal/public/pages.xml | 4 +- .../conf/sites/portal/public/portal.xml | 8 +- 16 files changed, 1167 insertions(+), 69 deletions(-) diff --git a/packaging/plf-dependencies/pom.xml b/packaging/plf-dependencies/pom.xml index 243427486..933c7a969 100644 --- a/packaging/plf-dependencies/pom.xml +++ b/packaging/plf-dependencies/pom.xml @@ -94,19 +94,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. io.meeds.social - social-webapp-portlet + social-webapp war runtime io.meeds.social - social-extension-war - war - runtime - - - io.meeds.social - social-extension-war + social-webapp pom import diff --git a/services/plf-configuration/src/main/resources/conf/platform/configuration.xml b/services/plf-configuration/src/main/resources/conf/platform/configuration.xml index 507980cd7..49d4f8c98 100644 --- a/services/plf-configuration/src/main/resources/conf/platform/configuration.xml +++ b/services/plf-configuration/src/main/resources/conf/platform/configuration.xml @@ -77,10 +77,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. cometd - social-extension - - - social-portlet + social diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml index 6e27915d3..aa837b612 100644 --- a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml +++ b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml @@ -61,7 +61,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - social-portlet + social SpaceActivityStreamPortlet @@ -79,7 +79,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - social-portlet + social MembersPortlet @@ -160,7 +160,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - social-portlet + social SpaceSettingPortlet diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml index 0d3edf188..5a0f68b40 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social Image @@ -51,7 +51,7 @@ - social-portlet + social Links diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml index 8be6d29c1..a4417a43e 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml @@ -38,7 +38,7 @@ Everyone - social-portlet + social VerticalMenu Site Vertical Menu @@ -54,7 +54,7 @@ Everyone - social-portlet + social Breadcrumb Site Breadcrumb application diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml index 29d4f343b..10576d586 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social SpaceBannerPortlet @@ -43,7 +43,7 @@ - social-portlet + social SpaceWidgetDescription @@ -51,13 +51,13 @@ - social-portlet + social SpaceWidgetManagers - social-portlet + social SpaceWidgetMembers diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml index b23f98f96..c932ec729 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml @@ -33,7 +33,7 @@ Everyone - social-portlet + social TopBarLogo Space Logo @@ -61,7 +61,7 @@ Everyone - social-portlet + social TopBarLogin Login Button diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml index 6d80d33e4..022448f82 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml @@ -29,7 +29,7 @@ - social-portlet + social Image Image @@ -45,7 +45,7 @@ - social-portlet + social SpaceActivityStreamPortlet Space Activity Stream @@ -54,28 +54,28 @@ - social-portlet + social SpaceWidgetDescription Space Description - social-portlet + social SpaceWidgetManagers Space Managers - social-portlet + social SpaceWidgetMembers Space Members - social-portlet + social WhoIsOnLinePortlet Who is on Line diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml index 1d16682b5..8c435287f 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml @@ -672,7 +672,7 @@ true - ExternalSpacesList + SocialPortletExternalSpacesList remove @@ -682,6 +682,17 @@ + + SocialExternalSpacesList + + + remove + + + social/ExternalSpacesList + + + @@ -745,7 +756,24 @@ true - SpaceInfos + SocialSpaceInfos + + + remove + + + social/SpaceInfos + + + false + + + true + + + + + SocialPortletSpaceInfos remove @@ -784,7 +812,7 @@ true - SpacesOverview + SocialPortletSpacesOverview remove @@ -800,6 +828,1085 @@ + + SocialSpacesOverview + + + remove + + + social/SpacesOverview + + + false + + + true + + + + + + + SocialPortletToSocialUpgradePlugin + addUpgradePlugin + io.meeds.layout.plugin.upgrade.LayoutApplicationReferenceUpgradePlugin + + + product.group.id + The groupId of the product + org.exoplatform.social + + + plugin.execution.order + The plugin execution order + 500 + + + plugin.upgrade.execute.once + Execute only once, not each version change + true + + + SpaceAccessPortlet + + + update + + + social-portlet/SpaceAccessPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + PageNotFound + + + update + + + social-portlet/PageNotFound + + + social/SpaceAccessPortlet + + + true + + + true + + + + + IDMUsersManagement + + + update + + + social-portlet/IDMUsersManagement + + + social/SpaceAccessPortlet + + + true + + + true + + + + + IDMGroupsManagement + + + update + + + social-portlet/IDMGroupsManagement + + + social/SpaceAccessPortlet + + + true + + + true + + + + + IDMMembershipTypesManagement + + + update + + + social-portlet/IDMMembershipTypesManagement + + + social/SpaceAccessPortlet + + + true + + + true + + + + + WhoIsOnLinePortlet + + + update + + + social-portlet/WhoIsOnLinePortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceInfos + + + update + + + social-portlet/SpaceInfos + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceWidgetDescription + + + update + + + social-portlet/SpaceWidgetDescription + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceWidgetManagers + + + update + + + social-portlet/SpaceWidgetManagers + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceWidgetMembers + + + update + + + social-portlet/SpaceWidgetMembers + + + social/SpaceAccessPortlet + + + true + + + true + + + + + MembersPortlet + + + update + + + social-portlet/MembersPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceTopbarMenu + + + update + + + social-portlet/SpaceTopbarMenu + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceMenuPortlet + + + update + + + social-portlet/SpaceMenuPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceBannerPortlet + + + update + + + social-portlet/SpaceBannerPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceActivityStreamPortlet + + + update + + + social-portlet/SpaceActivityStreamPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + UserActivityStreamPortlet + + + update + + + social-portlet/UserActivityStreamPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + UserSettingLanguage + + + update + + + social-portlet/UserSettingLanguage + + + social/SpaceAccessPortlet + + + true + + + true + + + + + UserSettingNotifications + + + update + + + social-portlet/UserSettingNotifications + + + social/SpaceAccessPortlet + + + true + + + true + + + + + UserSettingSecurity + + + update + + + social-portlet/UserSettingSecurity + + + social/SpaceAccessPortlet + + + true + + + true + + + + + HamburgerMenu + + + update + + + social-portlet/HamburgerMenu + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpaceSettingPortlet + + + update + + + social-portlet/SpaceSettingPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpacesAdministration + + + update + + + social-portlet/SpacesAdministration + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarLogo + + + update + + + social-portlet/TopBarLogo + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarPreview + + + update + + + social-portlet/TopBarPreview + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarLogin + + + update + + + social-portlet/TopBarLogin + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarPublishSite + + + update + + + social-portlet/TopBarPublishSite + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ProfileHeader + + + update + + + social-portlet/ProfileHeader + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ProfileContactInformation + + + update + + + social-portlet/ProfileContactInformation + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ProfileWorkExperience + + + update + + + social-portlet/ProfileWorkExperience + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ProfileAboutMe + + + update + + + social-portlet/ProfileAboutMe + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarNotification + + + update + + + social-portlet/TopBarNotification + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarFavorites + + + update + + + social-portlet/TopBarFavorites + + + social/SpaceAccessPortlet + + + true + + + true + + + + + GettingStarted + + + update + + + social-portlet/GettingStarted + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ExternalSpacesList + + + update + + + social-portlet/ExternalSpacesList + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpacesList + + + update + + + social-portlet/SpacesList + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SpacesOverview + + + update + + + social-portlet/SpacesOverview + + + social/SpaceAccessPortlet + + + true + + + true + + + + + PeopleList + + + update + + + social-portlet/PeopleList + + + social/SpaceAccessPortlet + + + true + + + true + + + + + PeopleOverview + + + update + + + social-portlet/PeopleOverview + + + social/SpaceAccessPortlet + + + true + + + true + + + + + SuggestionsPeopleAndSpace + + + update + + + social-portlet/SuggestionsPeopleAndSpace + + + social/SpaceAccessPortlet + + + true + + + true + + + + + Search + + + update + + + social-portlet/Search + + + social/SpaceAccessPortlet + + + true + + + true + + + + + GeneralSettings + + + update + + + social-portlet/GeneralSettings + + + social/SpaceAccessPortlet + + + true + + + true + + + + + Popover + + + update + + + social-portlet/Popover + + + social/SpaceAccessPortlet + + + true + + + true + + + + + TopBarMenu + + + update + + + social-portlet/TopBarMenu + + + social/SpaceAccessPortlet + + + true + + + true + + + + + ProfileSettingsPortlet + + + update + + + social-portlet/ProfileSettingsPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + Image + + + update + + + social-portlet/Image + + + social/SpaceAccessPortlet + + + true + + + true + + + + + Links + + + update + + + social-portlet/Links + + + social/SpaceAccessPortlet + + + true + + + true + + + + + DrawersOverlay + + + update + + + social-portlet/DrawersOverlay + + + social/SpaceAccessPortlet + + + true + + + true + + + + + NotificationAdministration + + + update + + + social-portlet/NotificationAdministration + + + social/SpaceAccessPortlet + + + true + + + true + + + + + VerticalMenu + + + update + + + social-portlet/VerticalMenu + + + social/SpaceAccessPortlet + + + true + + + true + + + + + Breadcrumb + + + update + + + social-portlet/Breadcrumb + + + social/SpaceAccessPortlet + + + true + + + true + + + + + PlatformSettings + + + update + + + social-portlet/PlatformSettings + + + social/SpaceAccessPortlet + + + true + + + true + + + + + OrganizationalChart + + + update + + + social-portlet/OrganizationalChart + + + social/SpaceAccessPortlet + + + true + + + true + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml index 8d497eeb4..79f1d63a6 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social GeneralSettings General Settings Portlet @@ -53,7 +53,7 @@ - social-portlet + social NotificationAdministration Notifications Administration @@ -100,7 +100,7 @@ - social-portlet + social IDMUsersManagement Users Management @@ -120,7 +120,7 @@ - social-portlet + social IDMGroupsManagement Groups Management @@ -140,7 +140,7 @@ - social-portlet + social ProfileSettingsPortlet Profile Settings Management @@ -161,7 +161,7 @@ - social-portlet + social SpacesAdministration diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml index 4ed6f8deb..528d25e5d 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml @@ -42,7 +42,7 @@ *:/platform/users - social-portlet + social VerticalMenu Site Vertical Menu @@ -58,7 +58,7 @@ *:/platform/users - social-portlet + social Breadcrumb diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 3a798f5aa..5104655cc 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -34,7 +34,7 @@ - social-portlet + social Image diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml index 254206d4d..39a2814ae 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml @@ -37,7 +37,7 @@ - social-portlet + social PeopleList All People @@ -46,14 +46,14 @@ - social-portlet + social PeopleOverview People Overview Portlet - social-portlet + social SuggestionsPeopleAndSpace @@ -85,7 +85,7 @@ - social-portlet + social SpacesList All Spaces @@ -105,7 +105,7 @@ - social-portlet + social UserActivityStreamPortlet User Activity Stream @@ -132,7 +132,7 @@ - social-portlet + social SpaceAccessPortlet space-access @@ -152,7 +152,7 @@ - social-portlet + social PageNotFound Page Not Found @@ -172,21 +172,21 @@ - social-portlet + social UserSettingLanguage User Setting Language - social-portlet + social UserSettingNotifications User Setting Notifications - social-portlet + social UserSettingSecurity User Setting Security @@ -210,7 +210,7 @@ - social-portlet + social ProfileHeader Profile Header Portlet @@ -227,7 +227,7 @@ - social-portlet + social ProfileAboutMe Profile AboutMe Portlet @@ -242,7 +242,7 @@ - social-portlet + social ProfileContactInformation Profile contact information Portlet @@ -257,7 +257,7 @@ - social-portlet + social ProfileWorkExperience Profile Work Experience Portlet @@ -1633,7 +1633,7 @@ template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> - social-portlet + social DrawersOverlay Drawers Overlay @@ -1684,7 +1684,7 @@ template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> - social-portlet + social DrawersOverlay Drawers Overlay @@ -1751,7 +1751,7 @@ - social-portlet + social OrganizationalChart diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml index 2e1a4b1e2..e5ca96031 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml @@ -37,7 +37,7 @@ - social-portlet + social UserActivityStreamPortlet User Activity Stream @@ -46,7 +46,7 @@ - social-portlet + social WhoIsOnLinePortlet Who is on line @@ -134,7 +134,7 @@ Everyone - social-portlet + social OrganizationalChart