From b12e70b1a999926014a8f61530527658c142dd22 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Sat, 28 Oct 2023 08:45:11 +0100 Subject: [PATCH] feat: Move sites definition into common extension - MEED-2811 - Meeds-io/MIPs#100 This change will move sites pages definition into sites.war extension to centralize the configuration of sites which will improve the maintainability and evolutivity. --- .../webapp/WEB-INF/conf/configuration.xml | 1 - .../conf/perk-store/portal-configuration.xml | 81 ------------------- .../group/platform/rewarding/navigation.xml | 38 --------- .../portal/group/platform/rewarding/pages.xml | 42 ---------- .../portal/portal/global/navigation.xml | 34 -------- .../perk-store/portal/portal/global/pages.xml | 47 ----------- 6 files changed, 243 deletions(-) delete mode 100644 perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal-configuration.xml delete mode 100644 perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/navigation.xml delete mode 100644 perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/pages.xml delete mode 100644 perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/navigation.xml delete mode 100644 perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/pages.xml diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/configuration.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/configuration.xml index 20fb91176..96e8df327 100644 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/perk-store-webapps/src/main/webapp/WEB-INF/conf/configuration.xml @@ -20,7 +20,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd"> war:/conf/perk-store/bundle-configuration.xml - war:/conf/perk-store/portal-configuration.xml war:/conf/perk-store/cache-configuration.xml war:/conf/perk-store/notification-configuration.xml war:/conf/perk-store/websocket-configuration.xml diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal-configuration.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal-configuration.xml deleted file mode 100644 index 17660a9a5..000000000 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal-configuration.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - org.exoplatform.portal.config.UserPortalConfigService - - new.portal.config.user.listener - initListener - org.exoplatform.portal.config.NewPortalConfigListener - This listener creates Perk Store Administration Page - - - portal.configuration - description - - - portal - - - - - global - - - - - war:/conf/perk-store/portal - - - ${exo.perkstore.portalConfig.metadata.override:true} - - - ${exo.perkstore.portalConfig.metadata.importmode:merge} - - - - - group.configuration - description - - - group - - - ${exo.perkstore.portalConfig.metadata.override:true} - - - - - /platform/rewarding - - - - - war:/conf/perk-store/portal - - - ${exo.perkstore.portalConfig.metadata.importmode:merge} - - - - - - - \ No newline at end of file diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/navigation.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/navigation.xml deleted file mode 100644 index 5faab25f2..000000000 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/navigation.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - 3 - - - - rewardAdministration - - - perkStoreAdministration - - group::/platform/rewarding::perkStoreAdministration - - - - diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/pages.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/pages.xml deleted file mode 100644 index bc02e5132..000000000 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/group/platform/rewarding/pages.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - perkStoreAdministration - perk store administration - *:/platform/rewarding - manager:/platform/rewarding - - *:/platform/users - - - perk-store - PerkStoreAdmin - - perk store administration - *:/platform/rewarding - false - - - - diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/navigation.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/navigation.xml deleted file mode 100644 index db2cf3997..000000000 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/navigation.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - 3 - - - - perkstore - - SYSTEM - portal::global::perkstore - - - diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/pages.xml b/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/pages.xml deleted file mode 100644 index 4167de034..000000000 --- a/perk-store-webapps/src/main/webapp/WEB-INF/conf/perk-store/portal/portal/global/pages.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - perkstore - Perk Store - *:/platform/users;*:/platform/externals - *:/platform/administrators - - *:/platform/users;*:/platform/externals - - top-perk-store-container - *:/platform/users;*:/platform/externals - addonContainer - - - perk-store-container - *:/platform/users;*:/platform/externals - addonContainer - - - bottom-perk-store-container - *:/platform/users;*:/platform/externals - addonContainer - - - -