From a057ae518c487795bf2d3aa180d76f5c4ccc63f6 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Sat, 28 Oct 2023 08:44:46 +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/wiki/portal-configuration.xml | 68 ------------------- .../conf/wiki/portal/global/navigation.xml | 33 --------- .../WEB-INF/conf/wiki/portal/global/pages.xml | 47 ------------- 4 files changed, 149 deletions(-) delete mode 100644 notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal-configuration.xml delete mode 100644 notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/navigation.xml delete mode 100644 notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/pages.xml diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml index 2ce4fc9564..df16f48dde 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml @@ -24,7 +24,6 @@ xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> war:/conf/wiki/application-registry-configuration.xml - war:/conf/wiki/portal-configuration.xml war:/conf/wiki/cache-configuration.xml war:/conf/wiki/webui-configuration.xml war:/conf/wiki/wiki-configuration.xml diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal-configuration.xml deleted file mode 100644 index a423c0a314..0000000000 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal-configuration.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - org.exoplatform.portal.config.UserPortalConfigService - - - new.portal.config.user.listener - - initListener - - org.exoplatform.portal.config.NewPortalConfigListener - this listener init the portal configuration - - - portal.configuration - description - - - - - global - - - - - portal - - - war:/conf/wiki - - - ${exo.wiki.portalConfig.metadata.override:true} - - - ${exo.wiki.portalConfig.metadata.importmode:merge} - - - - - - - diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/navigation.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/navigation.xml deleted file mode 100644 index ccd2525ac3..0000000000 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/navigation.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 2 - - - notes-editor - - SYSTEM - portal::global::notes-editor - - - diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/pages.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/pages.xml deleted file mode 100644 index 8b6dfdeb69..0000000000 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/portal/global/pages.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - notes-editor - Notes Editor - *:/platform/users;*:/platform/externals - *:/platform/administrators - true - true - - top-notes-editor-container - *:/platform/users;*:/platform/externals - addonContainer - - - notes-editor-container - *:/platform/users;*:/platform/externals - addonContainer - - - bottom-notes-editor-container - *:/platform/users;*:/platform/externals - addonContainer - - -