From feb91c70926b2222ce2505a63adfed72e88a14c2 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Tue, 9 Jul 2024 19:30:51 +0100 Subject: [PATCH 1/3] feat: Upgrade resources XSD - MEED-7237 - Meeds-io/MIPs#134 --- notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml index 01c4b885be..263abdc559 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -10,11 +10,7 @@ with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - - + Enterprise From aec9c6cd8173ba3a62b69c43fb24c6bfb28a5085 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 11 Jul 2024 09:05:21 +0100 Subject: [PATCH 2/3] feat: Review Extension priority and cleanup - MEED-7237 - Meeds-io/MIPs#134 This change will cleanup duplications made in web.xml and useless Plugin declaration. at the same time, the extension priority has been reviewed so that notes addon is loaded after other base addons. --- .../resources/conf/portal/configuration.xml | 15 ------------ .../META-INF/exo-conf}/configuration.xml | 2 +- notes-webapp/src/main/webapp/WEB-INF/web.xml | 23 ------------------- 3 files changed, 1 insertion(+), 39 deletions(-) rename {notes-social-integration/src/main/resources/conf => notes-webapp/src/main/webapp/META-INF/exo-conf}/configuration.xml (97%) diff --git a/notes-social-integration/src/main/resources/conf/portal/configuration.xml b/notes-social-integration/src/main/resources/conf/portal/configuration.xml index 28e7068c43..ead8a0fbf5 100644 --- a/notes-social-integration/src/main/resources/conf/portal/configuration.xml +++ b/notes-social-integration/src/main/resources/conf/portal/configuration.xml @@ -18,23 +18,8 @@ - - org.exoplatform.social.core.space.spi.SpaceService - - portlets.prefs.required - setPortletsPrefsRequired - org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin - - - portletsPrefsRequired - WikiPortlet - - - - - org.exoplatform.services.resources.ResourceBundleService diff --git a/notes-social-integration/src/main/resources/conf/configuration.xml b/notes-webapp/src/main/webapp/META-INF/exo-conf/configuration.xml similarity index 97% rename from notes-social-integration/src/main/resources/conf/configuration.xml rename to notes-webapp/src/main/webapp/META-INF/exo-conf/configuration.xml index 04e483189c..e61df4d781 100644 --- a/notes-social-integration/src/main/resources/conf/configuration.xml +++ b/notes-webapp/src/main/webapp/META-INF/exo-conf/configuration.xml @@ -8,7 +8,7 @@ Change PortalContainer Definitions registerChangePlugin org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin - 25 + 130 apply.default diff --git a/notes-webapp/src/main/webapp/WEB-INF/web.xml b/notes-webapp/src/main/webapp/WEB-INF/web.xml index 678e713f13..ab2e6d9f93 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/web.xml +++ b/notes-webapp/src/main/webapp/WEB-INF/web.xml @@ -10,13 +10,6 @@ notes - - - http://java.sun.com/portlet_2_0 - /tld/portlet_2_0.tld - - - org.exoplatform.container.web.PortalContainerConfigOwner @@ -34,20 +27,4 @@ /images/* - - - org.exoplatform.container.web.PortalContainerConfigOwner - - - - GateInServlet - org.gatein.wci.api.GateInServlet - 0 - - - - GateInServlet - /gateinservlet - - \ No newline at end of file From 2ab63eb4860de617884e5cd2edf108b462f91fd8 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 11 Jul 2024 15:01:25 +0100 Subject: [PATCH 3/3] feat: Retrieve Resource Bundle from extension context instead of Monolith - MEED-7237 - Meeds-io/MIPs#134 This change will allow to request the resource bundle from extension context using declared as a filter in the file. --- notes-webapp/src/main/webapp/WEB-INF/web.xml | 1 + notes-webapp/src/main/webapp/vue-app/note-page-view/main.js | 2 +- notes-webapp/src/main/webapp/vue-app/notes-editor/main.js | 2 +- notes-webapp/src/main/webapp/vue-app/notes/main.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/notes-webapp/src/main/webapp/WEB-INF/web.xml b/notes-webapp/src/main/webapp/WEB-INF/web.xml index ab2e6d9f93..79d1ffff1a 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/web.xml +++ b/notes-webapp/src/main/webapp/WEB-INF/web.xml @@ -24,6 +24,7 @@ *.css *.js *.html + /i18n/* /images/* diff --git a/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js b/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js index ebaffab7cb..33854de403 100644 --- a/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js +++ b/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js @@ -30,7 +30,7 @@ if (extensionRegistry) { } const lang = eXo.env.portal.language; -const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.NotePageView-${lang}.json`; +const url = `/notes/i18n/locale.portlet.NotePageView?lang=${lang}`; export function init(appId, name, canEdit) { exoi18n.loadLanguageAsync(lang, url) diff --git a/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js b/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js index 63560b82fc..192bb7458b 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js +++ b/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js @@ -13,7 +13,7 @@ if (extensionRegistry) { const appId = 'notesEditorApplication'; const lang = window.eXo?.env?.portal?.language || 'en'; -const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.notes.notesPortlet-${lang}.json`; +const url = `/notes/i18n/locale.portlet.notes.notesPortlet?lang=${lang}`; export function init() { exoi18n.loadLanguageAsync(lang, url) diff --git a/notes-webapp/src/main/webapp/vue-app/notes/main.js b/notes-webapp/src/main/webapp/vue-app/notes/main.js index 5f3350ca9b..d5ec1c3b1a 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/main.js +++ b/notes-webapp/src/main/webapp/vue-app/notes/main.js @@ -28,7 +28,7 @@ const appId = 'notesOverviewApplication'; const lang = eXo?.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.notes.notesPortlet-${lang}.json`; +const url = `/notes/i18n/locale.portlet.notes.notesPortlet?lang=${lang}`; if (!Vue.prototype.$notesService) { window.Object.defineProperty(Vue.prototype, '$notesService', {